fix(core): rollback onFieldInit behavior

alibaba · Apr 16, 2021 · 15f9a56 · 15f9a56
1 parent a54cf82
commit 15f9a56
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/packages/core/src/effects/onFieldEffects.ts b/packages/core/src/effects/onFieldEffects.ts
@@ -28,7 +28,7 @@ function createFieldEffect<Result extends GeneralField = GeneralField>(
     }
   )
 }
-export const onFieldInit = createFieldEffect(LifeCycleTypes.ON_FIELD_INIT)
+const _onFieldInit = createFieldEffect(LifeCycleTypes.ON_FIELD_INIT)
 export const onFieldMount = createFieldEffect(LifeCycleTypes.ON_FIELD_MOUNT)
 export const onFieldUnmount = createFieldEffect(LifeCycleTypes.ON_FIELD_UNMOUNT)
 export const onFieldValueChange = createFieldEffect<DataField>(
@@ -53,6 +53,20 @@ export const onFieldValidateSuccess = createFieldEffect<DataField>(
   LifeCycleTypes.ON_FIELD_VALIDATE_SUCCESS
 )
 
+export function onFieldInit(
+  pattern: FormPathPattern,
+  callback?: (field: GeneralField, form: Form) => void
+) {
+  const form = useEffectForm()
+  const count = form.query(pattern).reduce((count, field) => {
+    callback(field, form)
+    return count + 1
+  }, 0)
+  if (count === 0) {
+    _onFieldInit(pattern, callback)
+  }
+}
+
 export function onFieldReact(
   pattern: FormPathPattern,
   callback?: (field: GeneralField, form: Form) => void