Merge branch 'v18'

EnochGao · Nov 28, 2024 · 2c49375 · 2c49375
2 parents 56f3b5b + 29b55d0
commit 2c49375
Show file tree

Hide file tree

Showing 39 changed files with 2,451 additions and 2,271 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+registry=https://registry.npmmirror.com
diff --git a/README-zh_CN.md b/README-zh_CN.md
@@ -16,7 +16,6 @@ ng-zorro-antd-extension
 功能更新以及版本详情
 
 - 请查看--->[文档地址](https://enochgao.github.io/ng-zorro-antd-extension/)
-- 国内镜像--->[文档地址](http://enochgao.gitee.io/ng-zorro-antd-extension/)
 
 ## 安装
 
@@ -65,14 +64,14 @@ export class AppModule {}
 npm install [email protected] --save
 ```
 
-| angular | ng-zorro-antd | ng-zorro-antd-extension | LTS ENDS   |
-| ------- | ------------- | ----------------------- | ---------- |
-| ^18.0.0 | ^18.0.0       | ^18.0.0                 | 2025-11-xx |
-| ^17.0.0 | ^17.0.0       | ^15.6.0                 | 2025-05-15 |
-| ^16.0.0 | ^16.0.0       | ^15.6.0                 | 2024-11-08 |
-| ^15.0.0 | ^15.0.0       | ^15.0.0                 | end        |
-| ^14.0.0 | ^14.0.0       | ^14.0.0                 | end        |
-| ^13.0.0 | ^13.0.0       | ^13.0.0                 | end        |
+| angular | ng-zorro-antd | ng-zorro-antd-extension | LTS ENDS        |
+| ------- | ------------- | ----------------------- | --------------- |
+| ^18.0.0 | ^18.0.0       | ^18.0.0                 | 2025-11-xx      |
+| ^17.0.0 | ^17.0.0       | ^15.6.0                 | 2025-05-15      |
+| ^16.0.0 | ^16.0.0       | ^15.6.0                 | 2024-11-08(end) |
+| ^15.0.0 | ^15.0.0       | ^15.0.0                 | 2024-05-18(end) |
+| ^14.0.0 | ^14.0.0       | ^14.0.0                 | end             |
+| ^13.0.0 | ^13.0.0       | ^13.0.0                 | end             |
 
 如需指定版本
 

diff --git a/README.md b/README.md
@@ -16,7 +16,6 @@ English | [简体中文](README-zh_CN.md)
 ## Docs
 
 - [Docs github](https://enochgao.github.io/ng-zorro-antd-extension/)
-- [Docs gitee](http://enochgao.gitee.io/ng-zorro-antd-extension/)
 
 ## Installation
 
@@ -59,14 +58,14 @@ const customLanguagePack = {
 export class AppModule {}
 ```
 
-| angular | ng-zorro-antd | ng-zorro-antd-extension | LTS ends   |
-| ------- | ------------- | ----------------------- | ---------- |
-| ^18.0.0 | ^18.0.0       | ^18.0.0                 | 2025-11-xx |
-| ^17.0.0 | ^17.0.0       | ^15.6.0                 | 2025-05-15 |
-| ^16.0.0 | ^16.0.0       | ^15.6.0                 | 2024-11-08 |
-| ^15.0.0 | ^15.0.0       | ^15.0.0                 | end        |
-| ^14.0.0 | ^14.0.0       | ^14.0.0                 | end        |
-| ^13.0.0 | ^13.0.0       | ^13.0.0                 | end        |
+| angular | ng-zorro-antd | ng-zorro-antd-extension | LTS ends        |
+| ------- | ------------- | ----------------------- | --------------- |
+| ^18.0.0 | ^18.0.0       | ^18.0.0                 | 2025-11-xx      |
+| ^17.0.0 | ^17.0.0       | ^15.6.0                 | 2025-05-15      |
+| ^16.0.0 | ^16.0.0       | ^15.6.0                 | 2024-11-08(end) |
+| ^15.0.0 | ^15.0.0       | ^15.0.0                 | 2024-05-18(end) |
+| ^14.0.0 | ^14.0.0       | ^14.0.0                 | end             |
+| ^13.0.0 | ^13.0.0       | ^13.0.0                 | end             |
 
 Install the specified version if required using:
 

diff --git a/components/README-zh_CN.md b/components/README-zh_CN.md
@@ -16,7 +16,6 @@ ng-zorro-antd-extension
 ## 文档
 
 - [github](https://enochgao.github.io/ng-zorro-antd-extension/)
-- [gitee](http://enochgao.gitee.io/ng-zorro-antd-extension/)
 
 ## 安装
 
@@ -59,14 +58,14 @@ const customLanguagePack = {
 export class AppModule {}
 ```
 
-| angular | ng-zorro-antd | ng-zorro-antd-extension | LTS ends   |
-| ------- | ------------- | ----------------------- | ---------- |
-| ^18.0.0 | ^18.0.0       | ^18.0.0                 | 2025-11-xx |
-| ^17.0.0 | ^17.0.0       | ^15.6.0                 | 2025-05-15 |
-| ^16.0.0 | ^16.0.0       | ^15.6.0                 | 2024-11-08 |
-| ^15.0.0 | ^15.0.0       | ^15.0.0                 | end        |
-| ^14.0.0 | ^14.0.0       | ^14.0.0                 | end        |
-| ^13.0.0 | ^13.0.0       | ^13.0.0                 | end        |
+| angular | ng-zorro-antd | ng-zorro-antd-extension | LTS ends        |
+| ------- | ------------- | ----------------------- | --------------- |
+| ^18.0.0 | ^18.0.0       | ^18.0.0                 | 2025-11-xx      |
+| ^17.0.0 | ^17.0.0       | ^15.6.0                 | 2025-05-15      |
+| ^16.0.0 | ^16.0.0       | ^15.6.0                 | 2024-11-08(end) |
+| ^15.0.0 | ^15.0.0       | ^15.0.0                 | 2024-05-18(end) |
+| ^14.0.0 | ^14.0.0       | ^14.0.0                 | end             |
+| ^13.0.0 | ^13.0.0       | ^13.0.0                 | end             |
 
 如需指定版本
 

diff --git a/components/README.md b/components/README.md
@@ -16,7 +16,6 @@ English | [简体中文](README-zh_CN.md)
 ## Docs
 
 - [Docs github](https://enochgao.github.io/ng-zorro-antd-extension/)
-- [Docs gitee](http://enochgao.gitee.io/ng-zorro-antd-extension/)
 
 ## Installation
 
@@ -59,14 +58,14 @@ const customLanguagePack = {
 export class AppModule {}
 ```
 
-| angular | ng-zorro-antd | ng-zorro-antd-extension | LTS ends   |
-| ------- | ------------- | ----------------------- | ---------- |
-| ^18.0.0 | ^18.0.0       | ^18.0.0                 | 2025-11-xx |
-| ^17.0.0 | ^17.0.0       | ^15.6.0                 | 2025-05-15 |
-| ^16.0.0 | ^16.0.0       | ^15.6.0                 | 2024-11-08 |
-| ^15.0.0 | ^15.0.0       | ^15.0.0                 | end        |
-| ^14.0.0 | ^14.0.0       | ^14.0.0                 | end        |
-| ^13.0.0 | ^13.0.0       | ^13.0.0                 | end        |
+| angular | ng-zorro-antd | ng-zorro-antd-extension | LTS ends        |
+| ------- | ------------- | ----------------------- | --------------- |
+| ^18.0.0 | ^18.0.0       | ^18.0.0                 | 2025-11-xx      |
+| ^17.0.0 | ^17.0.0       | ^15.6.0                 | 2025-05-15      |
+| ^16.0.0 | ^16.0.0       | ^15.6.0                 | 2024-11-08(end) |
+| ^15.0.0 | ^15.0.0       | ^15.0.0                 | 2024-05-18(end) |
+| ^14.0.0 | ^14.0.0       | ^14.0.0                 | end             |
+| ^13.0.0 | ^13.0.0       | ^13.0.0                 | end             |
 
 Install the specified version if required using:
 

diff --git a/components/configurable-query/configurable-query.component.ts b/components/configurable-query/configurable-query.component.ts
@@ -250,10 +250,10 @@ export class NzxConfigurableQueryComponent
 
   /** 重置 */
   reset(): void {
-    if (this.queryForm.invalid) {
-      updateControlStatus(this.queryForm);
-      return;
-    }
+    // if (this.queryForm.invalid) {
+    //   updateControlStatus(this.queryForm);
+    //   return;
+    // }
     this.queryForm.reset(this.defaultValue);
     this.resetChange.emit(this._queryParams);
   }

diff --git a/components/configurable-query/controls/date-picker.control.ts b/components/configurable-query/controls/date-picker.control.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { NzxAbstractControl } from './abstract.control';
 
 @Component({
+  selector: 'nzx-date-picker-control',
   template: `
     <ng-container [formGroup]="form">
       <nz-date-picker

diff --git a/components/configurable-query/controls/input.control.ts b/components/configurable-query/controls/input.control.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { NzxAbstractControl } from './abstract.control';
 
 @Component({
+  selector: 'nzx-input-control',
   template: `
     <ng-container [formGroup]="form">
       <input

diff --git a/components/configurable-query/controls/range-picker.control.ts b/components/configurable-query/controls/range-picker.control.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { NzxAbstractControl } from './abstract.control';
 
 @Component({
+  selector: 'nzx-range-picker-control',
   template: `
     <ng-container [formGroup]="form">
       <nz-range-picker

diff --git a/components/configurable-query/controls/select.control.ts b/components/configurable-query/controls/select.control.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { NzxAbstractControl } from './abstract.control';
 
 @Component({
+  selector: 'nzx-select-control',
   template: `
     <ng-container [formGroup]="form">
       <nz-select

diff --git a/components/configurable-query/controls/template.control.ts b/components/configurable-query/controls/template.control.ts
@@ -2,11 +2,12 @@ import { Component } from '@angular/core';
 import { NzxAbstractControl } from './abstract.control';
 
 @Component({
+  selector: 'nzx-template-control',
   template: `
     <ng-container
       *ngTemplateOutlet="
         control.templateRef!;
-        context: { $implicit: form.get(control.controlName!) }
+        context: { $implicit: form.get(control.controlName!), formGroup: form }
       "
     >
     </ng-container>

diff --git a/components/package.json b/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-zorro-antd-extension",
-  "version": "18.0.0",
+  "version": "18.1.0",
   "license": "MIT",
   "description": "An extension based on ng-zorro-antd",
   "keywords": [

diff --git a/components/util/lib/fileUtil.ts b/components/util/lib/fileUtil.ts
@@ -25,7 +25,7 @@ export function selectFile(
   return fromEvent(input, 'change')
     .pipe(take(1))
     .pipe(
-      map((e) => {
+      map((_e:any) => {
         if (input?.files) {
           if (input?.files.length) {
             if (multiple) {

diff --git a/docs/changelog/v16.x.md b/docs/changelog/v16.x.md
@@ -1,5 +1,25 @@
 ---
 category: component
-title: v16/17
+title: v16/17/v18
 order: 1
 ---
+
+## 16.4.0、17.4.0、18.1.0
+
+### 新功能
+
+`nzx-configurable-query`
+
+- template 自定义暴露 formGroup
+
+```html
+<ng-template nzxControl="level" let-formControl let-formGroup="formGroup">
+  <nz-rate [formControl]="formControl" nzAllowHalf></nz-rate>
+</ng-template>
+```
+
+### 破坏变更
+
+`nzx-configurable-query`
+
+- resetChange 内部方法不再进行表单合法性检测，必定触发
diff --git a/docs/en-us/changelog/v15.10.0.md b/docs/en-us/changelog/v15.10.0.md
diff --git a/docs/en-us/changelog/v15.10.1.md b/docs/en-us/changelog/v15.10.1.md
diff --git a/docs/en-us/changelog/v15.10.2.md b/docs/en-us/changelog/v15.10.2.md
diff --git a/docs/en-us/changelog/v15.11.0.md b/docs/en-us/changelog/v15.11.0.md
diff --git a/docs/en-us/changelog/v15.12.0.md b/docs/en-us/changelog/v15.12.0.md
diff --git a/docs/en-us/changelog/v15.14.0.md b/docs/en-us/changelog/v15.14.0.md
diff --git a/docs/en-us/changelog/v15.2.md b/docs/en-us/changelog/v15.2.md
diff --git a/docs/en-us/changelog/v15.3.md b/docs/en-us/changelog/v15.3.md
diff --git a/docs/en-us/changelog/v15.4.md b/docs/en-us/changelog/v15.4.md
diff --git a/docs/en-us/changelog/v15.5.md b/docs/en-us/changelog/v15.5.md
diff --git a/docs/en-us/changelog/v15.6.md b/docs/en-us/changelog/v15.6.md