setFields/registerField支持triggerDependenciesUpdate

src/useForm.ts

@@ -563,6 +563,9 @@ export class FormStore {
       });
     });
 
+    // Dependencies update
+    this.triggerDependenciesUpdate(prevStore, namePathList);
+
     this.notifyWatch(namePathList);
   };
 
@@ -623,6 +626,9 @@ export class FormStore {
         type: 'valueUpdate',
         source: 'internal',
       });
+
+      // Dependencies update
+      this.triggerDependenciesUpdate(prevStore, [namePath]);
     }
 
     // un-register field callback
@@ -649,7 +655,7 @@ export class FormStore {
           this.notifyObservers(prevStore, [namePath], { type: 'remove' });
 
           // Dependencies update
-          this.triggerDependenciesUpdate(prevStore, namePath);
+          this.triggerDependenciesUpdate(prevStore, [namePath]);
         }
       }
 
@@ -695,16 +701,17 @@ export class FormStore {
   /**
    * Notify dependencies children with parent update
    * We need delay to trigger validate in case Field is under render props
+   * Pass namePath array to calculate childrenFields together to avoid repeatedly trigger notifyObservers
    */
-  private triggerDependenciesUpdate = (prevStore: Store, namePath: InternalNamePath) => {
+  private triggerDependenciesUpdate = (prevStore: Store, namePath: InternalNamePath[]) => {
     const childrenFields = this.getDependencyChildrenFields(namePath);
     if (childrenFields.length) {
       this.validateFields(childrenFields);
     }
 
     this.notifyObservers(prevStore, childrenFields, {
       type: 'dependenciesUpdate',
-      relatedFields: [namePath, ...childrenFields],
+      relatedFields: [...namePath, ...childrenFields],
     });
 
     return childrenFields;
@@ -722,7 +729,7 @@ export class FormStore {
     this.notifyWatch([namePath]);
 
     // Dependencies update
-    const childrenFields = this.triggerDependenciesUpdate(prevStore, namePath);
+    const childrenFields = this.triggerDependenciesUpdate(prevStore, [namePath]);
 
     // trigger callback function
     const { onValuesChange } = this.callbacks;
@@ -762,7 +769,7 @@ export class FormStore {
     ]);
   };
 
-  private getDependencyChildrenFields = (rootNamePath: InternalNamePath): InternalNamePath[] => {
+  private getDependencyChildrenFields = (rootNamePath: InternalNamePath[]): InternalNamePath[] => {
     const children: Set<FieldEntity> = new Set();
     const childrenFields: InternalNamePath[] = [];
 
@@ -798,7 +805,7 @@ export class FormStore {
       });
     };
 
-    fillChildren(rootNamePath);
+    rootNamePath.forEach(namePath => fillChildren(namePath));
 
     return childrenFields;
   };