Skip to content

Commit

Permalink
Merge branch 'v17'
Browse files Browse the repository at this point in the history
  • Loading branch information
EnochGao committed Jun 20, 2024
2 parents 093c08a + 7b3490f commit 514d4ec
Show file tree
Hide file tree
Showing 10 changed files with 5,433 additions and 4,519 deletions.
8 changes: 4 additions & 4 deletions README-zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ ng add ng-zorro-antd-extension
3、app.module v15.11.0+

```ts
import zh from "@angular/common/locales/zh";
import { NZ_I18N, zh_CN } from "ng-zorro-antd/i18n";
import { nzx_zh_CN } from "ng-zorro-antd-extension/i18n";
import zh from '@angular/common/locales/zh';
import { NZ_I18N, zh_CN } from 'ng-zorro-antd/i18n';
import { nzx_zh_CN } from 'ng-zorro-antd-extension/i18n';

registerLocaleData(zh);

Expand Down Expand Up @@ -69,7 +69,7 @@ npm install [email protected] --save
| ------- | ------------- | ----------------------- | ---------- |
| ^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 | 2024-05-18 |
| ^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 |

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ ng add ng-zorro-antd-extension
3、app.module v15.11.0+

```ts
import zh from "@angular/common/locales/zh";
import { NZ_I18N, zh_CN } from "ng-zorro-antd/i18n";
import { nzx_zh_CN } from "ng-zorro-antd-extension/i18n";
import zh from '@angular/common/locales/zh';
import { NZ_I18N, zh_CN } from 'ng-zorro-antd/i18n';
import { nzx_zh_CN } from 'ng-zorro-antd-extension/i18n';

registerLocaleData(zh);

Expand All @@ -63,7 +63,7 @@ export class AppModule {}
| ------- | ------------- | ----------------------- | ---------- |
| ^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 | 2024-05-18 |
| ^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 |

Expand Down
8 changes: 4 additions & 4 deletions components/README-zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ ng add ng-zorro-antd-extension
3、app.module v15.11.0+

```ts
import zh from "@angular/common/locales/zh";
import { NZ_I18N, zh_CN } from "ng-zorro-antd/i18n";
import { nzx_zh_CN } from "ng-zorro-antd-extension/i18n";
import zh from '@angular/common/locales/zh';
import { NZ_I18N, zh_CN } from 'ng-zorro-antd/i18n';
import { nzx_zh_CN } from 'ng-zorro-antd-extension/i18n';

registerLocaleData(zh);

Expand All @@ -63,7 +63,7 @@ export class AppModule {}
| ------- | ------------- | ----------------------- | ---------- |
| ^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 | 2024-05-18 |
| ^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 |

Expand Down
8 changes: 4 additions & 4 deletions components/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ ng add ng-zorro-antd-extension
3、app.module v15.11.0+

```ts
import zh from "@angular/common/locales/zh";
import { NZ_I18N, zh_CN } from "ng-zorro-antd/i18n";
import { nzx_zh_CN } from "ng-zorro-antd-extension/i18n";
import zh from '@angular/common/locales/zh';
import { NZ_I18N, zh_CN } from 'ng-zorro-antd/i18n';
import { nzx_zh_CN } from 'ng-zorro-antd-extension/i18n';

registerLocaleData(zh);

Expand All @@ -63,7 +63,7 @@ export class AppModule {}
| ------- | ------------- | ----------------------- | ---------- |
| ^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 | 2024-05-18 |
| ^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 |

Expand Down
5 changes: 3 additions & 2 deletions components/configurable-query/configurable-query.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,15 @@ export class NzxConfigurableQueryComponent
controlName: string,
config: Partial<NzxQueryControlOptions>
): void {
Promise.resolve().then(() => {
setTimeout(() => {
const control = this.getControl(controlName);
if (control) {
Object.keys(config).forEach((key) => {
(control as any)[key] = (config as any)[key];
});
this.cd.markForCheck();
}
});
}, 0);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ export const controls7: Array<NzxQueryControlOptions> = [
placeholder: '城市',
controlType: 'select',
menuList: [
{ label: '班级', value: 1 },
{ label: '姓名', value: 2 },
{ label: '青岛', value: '青岛' },
{ label: '潍坊', value: '潍坊' },
],
},
];
Expand All @@ -267,8 +267,8 @@ export const controls8: Array<NzxQueryControlOptions> = [
placeholder: '城市',
controlType: 'select',
menuList: [
{ label: '班级', value: 1 },
{ label: '姓名', value: 2 },
{ label: '青岛', value: '青岛' },
{ label: '潍坊', value: '潍坊' },
],
},
];
Expand All @@ -286,8 +286,8 @@ export const controls9: Array<NzxQueryControlOptions> = [
placeholder: '城市',
controlType: 'select',
menuList: [
{ label: '班级', value: 1 },
{ label: '姓名', value: 2 },
{ label: '青岛', value: '青岛' },
{ label: '潍坊', value: '潍坊' },
],
},
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ export class NzxConfigurableQueryExampleComponent implements OnInit {
if (cacheStr) {
this.query9.setQueryParams(JSON.parse(cacheStr));
}
setTimeout(() => {
this.query9.setControl('city', { menuList: this.cityList });
}, 3000);
}

queryChange(params: NzxQueryParams) {
Expand Down
2 changes: 1 addition & 1 deletion components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-zorro-antd-extension",
"version": "17.2.0",
"version": "17.3.0",
"license": "MIT",
"description": "An extension based on ng-zorro-antd",
"keywords": [
Expand Down
Loading

0 comments on commit 514d4ec

Please sign in to comment.