fix: validateFields function not resolve or reject (#340)

* fix: validateFields function not resolve or reject

* test: add validateFieldsAndScroll promise test suite

* test: add validateFieldsAndScroll promise test suite

* test: add validateFieldsAndScroll promise test suite

* test: add validateFieldsAndScroll promise test suite

* test: add validateFieldsAndScroll.spec.js file

Author: shaodahong

src/createBaseForm.js

@@ -537,7 +537,8 @@ function createBaseForm(option = {}, mixins = []) {
             callback = (errors, values) => {
               if (oldCb) {
                 oldCb(errors, values);
-              } else if (errors) {
+              }
+              if (errors) {
                 reject({ errors, values });
               } else {
                 resolve(values);
@@ -572,7 +573,9 @@ function createBaseForm(option = {}, mixins = []) {
           }, callback);
         });
         pending.catch((e) => {
+          // eslint-disable-next-line no-console
           if (console.error && process.env.NODE_ENV !== 'production') {
+            // eslint-disable-next-line no-console
             console.error(e);
           }
           return e;

tests/validateFieldsAndScroll.spec.js

@@ -0,0 +1,64 @@
+/* eslint-disable react/prop-types */
+import React from 'react'
+import ReactDOM from 'react-dom'
+import { Simulate } from 'react-dom/test-utils'
+import createDOMForm from '../src/createDOMForm'
+
+class Test extends React.Component {
+  check = (rule, value, callback) => {
+    setTimeout(() => {
+      if (value === '1') {
+        callback()
+      } else {
+        callback(new Error('must be 1'))
+      }
+    }, 100)
+  }
+
+  render() {
+    const { getFieldProps } = this.props.form
+    return (
+      <div>
+        <input {...getFieldProps('normal')} />
+        <input
+          {...getFieldProps('async', {
+            rules: [this.check],
+          })}
+        />
+      </div>
+    )
+  }
+}
+
+Test = createDOMForm({
+  withRef: true,
+})(Test)
+
+describe('Test validateFieldsAndScroll', () => {
+  let container
+  let component
+  let form
+
+  beforeEach(() => {
+    container = document.createElement('div')
+    document.body.appendChild(container)
+    component = ReactDOM.render(<Test />, container)
+    component = component.refs.wrappedComponent
+    form = component.props.form
+  })
+
+  afterEach(() => {
+    ReactDOM.unmountComponentAtNode(container)
+    document.body.removeChild(container)
+  })
+
+  it('validate validateFieldsAndScroll promise', (done) => {
+    form.getFieldInstance('async').value = '1'
+    Simulate.change(form.getFieldInstance('async'))
+    return form.validateFieldsAndScroll().then(values => {
+      expect(values.normal).toBe(undefined)
+      expect(values.async).toBe('1')
+      done()
+    })
+  })
+})