fix(core): fix validator will trigger multi times with duplicate trig…

…gerTypes (#2495)
alibaba · Nov 24, 2021 · 88d6f83 · 88d6f83
1 parent ad48597
commit 88d6f83
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/packages/core/src/__tests__/field.spec.ts b/packages/core/src/__tests__/field.spec.ts
@@ -1716,3 +1716,21 @@ test('nested field modified', async () => {
   await form.reset()
   expect(form.modified).toBeFalsy()
 })
+
+test('field setValidator repeat call', async () => {
+  const form = attach(createForm())
+  const field = attach(
+    form.createField({
+      name: 'normal',
+    })
+  )
+
+  const validator1 = jest.fn(() => '')
+  const validator2 = jest.fn(() => '')
+  const validator3 = jest.fn(() => '')
+
+  field.setValidator([validator1, validator2, validator3])
+
+  await form.validate()
+  expect(validator1).toBeCalledTimes(1)
+})
diff --git a/packages/core/src/shared/internals.ts b/packages/core/src/shared/internals.ts
@@ -949,8 +949,14 @@ export const validateSelf = batch.bound(
     if (target.pattern !== 'editable' || target.display !== 'visible') return {}
     start()
     if (!triggerType) {
-      const allTriggerTypes = parseValidatorDescriptions(target.validator).map(
-        (desc) => desc.triggerType
+      const allTriggerTypes = parseValidatorDescriptions(
+        target.validator
+      ).reduce(
+        (types, desc) =>
+          types.indexOf(desc.triggerType) > -1
+            ? types
+            : types.concat(desc.triggerType),
+        []
       )
       const results = {}
       for (let i = 0; i < allTriggerTypes.length; i++) {