Merge branch 'v17'

EnochGao · Jun 12, 2024 · 093c08a · 093c08a
2 parents 25a5d03 + d80c777
commit 093c08a
Show file tree

Hide file tree

Showing 6 changed files with 1,177 additions and 791 deletions.
diff --git a/components/configurable-query/configurable-query.component.html b/components/configurable-query/configurable-query.component.html
@@ -17,9 +17,9 @@
     </ng-container>
 
     <div
-      [nzOrder]="controls.length"
       class="nzx-query-btn"
       nz-col
+      [nzOrder]="controls.length"
       [nzSpan]="nzxBtnSpan || 24 / lineNumber"
     >
       <div nz-row nzJustify="end" nzAlign="middle">
@@ -28,7 +28,7 @@
           nzType="primary"
           type="button"
           title="Enter"
-          (click)="search($event)"
+          (click)="search()"
         >
           {{ locale['query'] }}
         </button>

diff --git a/components/configurable-query/configurable-query.component.ts b/components/configurable-query/configurable-query.component.ts
@@ -239,10 +239,7 @@ export class NzxConfigurableQueryComponent
   }
 
   /** 查询 */
-  search(event?: Event): void {
-    if (event) {
-      event.stopPropagation();
-    }
+  search(): void {
     if (this.queryForm.invalid) {
       updateControlStatus(this.queryForm);
       return;