fix Form.submit miss return values (#1382)

alibaba · May 11, 2021 · 57c2c1b · 57c2c1b
1 parent b6ac9f2
commit 57c2c1b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/packages/core/src/models/Form.ts b/packages/core/src/models/Form.ts
@@ -636,11 +636,14 @@ export class Form<ValueType extends object = any> {
     this.notify(LifeCycleTypes.ON_FORM_SUBMIT_VALIDATE_END)
     let results: any
     try {
-      if (isFn(onSubmit) && this.valid) {
-        results = await onSubmit(toJS(this.values))
-      } else if (this.invalid) {
+      if (this.invalid) {
         throw this.errors
       }
+      if (isFn(onSubmit)) {
+        results = await onSubmit(toJS(this.values))
+      } else {
+        results = toJS(this.values)
+      }
       this.notify(LifeCycleTypes.ON_FORM_SUBMIT_SUCCESS)
     } catch (e) {
       this.setSubmitting(false)