Skip to content

Commit

Permalink
Merge branch 'v17'
Browse files Browse the repository at this point in the history
  • Loading branch information
EnochGao committed May 14, 2024
2 parents a0ba658 + 6cb3b07 commit da0d349
Show file tree
Hide file tree
Showing 33 changed files with 1,991 additions and 2,451 deletions.
1 change: 1 addition & 0 deletions components/README-zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export class AppModule {}
| ^14.0.0 | ^14.0.0 | ^14.0.0 | end |
| ^15.0.0 | ^15.0.0 | ^15.0.0 | 2024-05-18 |
| ^16.0.0 | ^16.0.0 | ^15.6.0 | 2024-11-08 |
| ^17.0.0 | ^17.0.0 | ^15.6.0 | 2025-05-15 |

如需指定版本

Expand Down
1 change: 1 addition & 0 deletions components/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export class AppModule {}
| ^14.0.0 | ^14.0.0 | ^14.0.0 | end |
| ^15.0.0 | ^15.0.0 | ^15.0.0 | 2024-05-18 |
| ^16.0.0 | ^16.0.0 | ^15.6.0 | 2024-11-08 |
| ^17.0.0 | ^17.0.0 | ^15.6.0 | 2025-05-15 |

Install the specified version if required using:

Expand Down
86 changes: 49 additions & 37 deletions components/configurable-query/configurable-query.component.html
Original file line number Diff line number Diff line change
@@ -1,39 +1,51 @@
<form class="nzx-query-container" nz-form [formGroup]="queryForm">
<div nz-row [nzGutter]="nzxGutter" [nzJustify]="nzxJustify">
<ng-container *ngFor="let config of controls">
<div
*ngIf="!config.hidden"
nz-col
[nzSpan]="config.nzxSpan || 24 / lineNumber"
[hidden]="nzxCollapse && config.collapse"
>
<nzx-configurable-query-item
*ngIf="config.controlName"
[form]="queryForm"
[control]="config"
></nzx-configurable-query-item>
</div>
</ng-container>
<form #queyForm class="nzx-query-container" nz-form [formGroup]="queryForm">
<div nz-row [nzGutter]="nzxGutter" [nzJustify]="nzxJustify">
<ng-container *ngFor="let config of controls; let i = index">
<div
*ngIf="!config.hidden"
nz-col
[nzSpan]="config.nzxSpan || 24 / lineNumber"
[hidden]="config.collapse"
[nzOrder]="i"
>
<nzx-configurable-query-item
*ngIf="config.controlName"
[form]="queryForm"
[control]="config"
></nzx-configurable-query-item>
</div>
</ng-container>

<div class="nzx-query-btn" nz-col [nzSpan]="nzxBtnSpan || 24 / lineNumber">
<div nz-row nzJustify="end" nzAlign="middle">
<button nz-button nzType="primary" type="button" (click)="search()">
{{ locale["query"] }}
</button>
<button nz-button type="button" (click)="reset()">
{{ locale["reset"] }}
</button>
<ng-content></ng-content>
<a
*ngIf="nzxCollapse"
nz-button
nzType="link"
(click)="toggleCollapse()"
>
{{ collapseText }}
<i nz-icon [nzType]="collapseIcon"></i>
</a>
</div>
</div>
</div>
<div
[nzOrder]="controls.length"
class="nzx-query-btn"
nz-col
[nzSpan]="nzxBtnSpan || 24 / lineNumber"
>
<div nz-row nzJustify="end" nzAlign="middle">
<button
nz-button
nzType="primary"
type="button"
title="Enter"
(click)="search($event)"
>
{{ locale['query'] }}
</button>
<button nz-button type="button" title="ctrl+r" (click)="reset()">
{{ locale['reset'] }}
</button>
<ng-content></ng-content>
<a
*ngIf="nzxCollapse"
nz-button
nzType="link"
(click)="toggleCollapse()"
>
{{ collapseText }}
<i nz-icon [nzType]="collapseIcon"></i>
</a>
</div>
</div>
</div>
</form>
Loading

0 comments on commit da0d349

Please sign in to comment.