fix(form:widget:array): fix error remove notify (#1758)

ng-alain · Feb 1, 2024 · 4957399 · 4957399
1 parent 6920137
commit 4957399
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/packages/form/src/model/array.property.ts b/packages/form/src/model/array.property.ts
@@ -107,7 +107,7 @@ export class ArrayProperty extends PropertyGroup {
       // TODO: 受限于 sf 的设计思路，对于移除数组项需要重新对每个子项进行校验，防止错误被父级合并后引起始终是错误的现象
       if (property instanceof ObjectProperty) {
         property.forEachChild(p => {
-          p.updateValueAndValidity();
+          p.updateValueAndValidity({ emitValueEvent: false });
         });
       }
     });

diff --git a/packages/form/src/widgets/array/array.widget.ts b/packages/form/src/widgets/array/array.widget.ts
@@ -3,6 +3,7 @@ import { SafeHtml } from '@angular/platform-browser';
 
 import { NzButtonType } from 'ng-zorro-antd/button';
 
+import { SFUpdateValueAndValidity } from '../../interface';
 import type { FormProperty } from '../../model/form.property';
 import { ArrayLayoutWidget } from '../../widget';
 
@@ -108,8 +109,13 @@ export class ArrayWidget extends ArrayLayoutWidget implements OnInit {
     this.removeTitle = removable === false ? null : removeTitle || this.l.removeText;
   }
 
-  private reValid(): void {
-    this.formProperty.updateValueAndValidity({ onlySelf: false, emitValueEvent: false, emitValidator: true });
+  private reValid(options?: SFUpdateValueAndValidity): void {
+    this.formProperty.updateValueAndValidity({
+      onlySelf: false,
+      emitValueEvent: false,
+      emitValidator: true,
+      ...options
+    });
   }
 
   addItem(): void {
@@ -119,8 +125,9 @@ export class ArrayWidget extends ArrayLayoutWidget implements OnInit {
   }
 
   removeItem(index: number): void {
+    const updatePath = (this.formProperty.properties as FormProperty[])[index].path;
     this.formProperty.remove(index);
-    this.reValid();
+    this.reValid({ updatePath, emitValueEvent: true });
     this.ui.remove?.(index);
   }
 }