fix(@uform/validator): Fix validate threshold check (#235)

alibaba · Aug 6, 2019 · 3ca7c08 · 3ca7c08
1 parent 3896efb
commit 3ca7c08
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 5 deletions.
diff --git a/packages/react/src/__tests__/validate.spec.js b/packages/react/src/__tests__/validate.spec.js
@@ -293,15 +293,16 @@ test('test idcard rules', async () => {
   const value5 = '12345678912345678X'
   // 18位数字
   const value6 = '123456789123456789'
+
   const element = await waitForElement(() => queryByTestId('test-input'))
   waitForDomChange({ container: element }).then(mutationsList => {
     const mutation = mutationsList[0]
     const { value } = mutation.target
     const errorTipsElement = queryByText('idCard is not an idcard format')
     if (value === value1 || value === value3) {
-      errorTipsElement.toBeVisible()
+      expect(errorTipsElement).toBeVisible()
     } else {
-      errorTipsElement.toBeNull()
+      expect(errorTipsElement).toBeNull()
     }
   })
   fireEvent.change(element, { target: { value: value1 } })
@@ -311,3 +312,38 @@ test('test idcard rules', async () => {
   fireEvent.change(element, { target: { value: value5 } })
   fireEvent.change(element, { target: { value: value6 } })
 })
+
+test('dynamic switch visible', async () => {
+  const TestComponent = () => {
+    return (
+      <SchemaForm
+        initialValues={{ aa: '', bb: '' }}
+        effects={($, { setFieldState }) => {
+          $('onFieldChange', 'aa').subscribe(({ value }) => {
+            setFieldState('bb', state => {
+              state.visible = value == 'aa'
+            })
+          })
+        }}
+      >
+        <Field name="aa" type="string" />
+        <Field name="bb" type="string" required />
+      </SchemaForm>
+    )
+  }
+  const { queryAllByTestId, queryByText } = render(<TestComponent />)
+  await sleep(33)
+  fireEvent.change(queryAllByTestId('test-input')[0], {
+    target: { value: 'aa' }
+  })
+  await sleep(33)
+  fireEvent.change(queryAllByTestId('test-input')[0], {
+    target: { value: 'bb' }
+  })
+  await sleep(33)
+  fireEvent.change(queryAllByTestId('test-input')[0], {
+    target: { value: 'aa' }
+  })
+  await sleep(33)
+  expect(queryByText('bb is required')).toBeNull()
+})
diff --git a/packages/validator/src/index.ts b/packages/validator/src/index.ts
@@ -7,7 +7,8 @@ import {
   isArr,
   isEqual,
   clone,
-  format
+  format,
+  isEmpty
 } from './utils'
 import { validate } from './validators'
 import { ValidateHandler, IValidateResponse, IFieldMap } from '@uform/types'
@@ -49,9 +50,13 @@ export const runValidation = async (
     ) {
       return
     }
-    if (isEqual(field.lastValidateValue, value) && !forceUpdate) {
-      return
+    if (!forceUpdate) {
+      if (isEmpty(field.lastValidateValue) && isEmpty(value)) return
+      if (isEqual(field.lastValidateValue, value)) {
+        return
+      }
     }
+
     const title = field.props && field.props.title
     const rafId = setTimeout(() => {
       field.loading = true