From 406f9fb9941863ac02f9817c1a9f91b4252787f8 Mon Sep 17 00:00:00 2001
From: Janry <wangzhili56@126.com>
Date: Sat, 11 Jan 2020 22:35:05 +0800
Subject: [PATCH] fix(@uform/core): fix submit catch error (#603)

* fix(@uform/core): fix submit catch error

* fix(@uform/core): fix ci

* fix(@uform/core): fix ci
---
 docs/Examples/antd/Layout.md                  | 91 -------------------
 packages/core/src/index.ts                    |  6 +-
 .../src/shared/connect.ts                     |  9 +-
 3 files changed, 8 insertions(+), 98 deletions(-)

diff --git a/docs/Examples/antd/Layout.md b/docs/Examples/antd/Layout.md
index 9d5586fecac..99a6f0f4f35 100644
--- a/docs/Examples/antd/Layout.md
+++ b/docs/Examples/antd/Layout.md
@@ -272,97 +272,6 @@ ReactDOM.render(<App />, document.getElementById('root'))
 
 ## 分步表单
 
-```jsx
-import {
-  SchemaForm,
-  SchemaMarkupField as Field,
-  FormButtonGroup,
-  Submit,
-  FormEffectHooks,
-  createFormActions,
-  FormGridRow,
-  FormItemGrid,
-  FormGridCol,
-  FormPath,
-  FormLayout,
-  FormBlock,
-  FormCard,
-  FormTextBox,
-  FormStep
-} from '@uform/antd'
-import { Button } from 'antd'
-import 'antd/dist/antd.css'
-
-const { onFormInit$ } = FormEffectHooks
-
-const actions = createFormActions()
-
-let cache = {}
-
-export default () => (
-  <SchemaForm
-    onSubmit={values => {
-      console.log('提交')
-      console.log(values)
-    }}
-    actions={actions}
-    labelCol={{ span: 8 }}
-    wrapperCol={{ span: 6 }}
-    validateFirst
-    effects={({ setFieldState, getFormGraph }) => {
-      onFormInit$().subscribe(() => {
-        setFieldState('col1', state => {
-          state.visible = false
-        })
-      })
-    }}
-  >
-    <FormStep
-      style={{ marginBottom: 20 }}
-      dataSource={[
-        { title: '基本信息', name: 'step-1' },
-        { title: '财务信息', name: 'step-2' },
-        { title: '条款信息', name: 'step-3' }
-      ]}
-    />
-    <FormCard name="step-1" title="基本信息">
-      <Field name="a1" required title="A1" type="string" />
-    </FormCard>
-    <FormCard name="step-2" title="财务信息">
-      <Field name="a2" required title="A2" type="string" />
-    </FormCard>
-    <FormCard name="step-3" title="条款信息">
-      <Field name="a3" required title="A3" type="string" />
-    </FormCard>
-    <FormButtonGroup>
-      <Submit>提交</Submit>
-      <Button onClick={() => actions.dispatch(FormStep.ON_FORM_STEP_PREVIOUS)}>
-        上一步
-      </Button>
-      <Button onClick={() => actions.dispatch(FormStep.ON_FORM_STEP_NEXT)}>
-        下一步
-      </Button>
-      <Button
-        onClick={() => {
-          cache = actions.getFormGraph()
-        }}
-      >
-        存储当前状态
-      </Button>
-      <Button
-        onClick={() => {
-          actions.setFormGraph(cache)
-        }}
-      >
-        回滚状态
-      </Button>
-    </FormButtonGroup>
-  </SchemaForm>
-)
-```
-
-## FormStep
-
 > 分步表单，主要用于大量表单填写，需要区分步骤的场景，使用FormStep和FormSpy
 
 #### Demo 示例
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 12b8dff9e02..d8297754e20 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -901,9 +901,9 @@ export function createForm<FieldProps, VirtualFieldProps>(
         try {
           payload = await Promise.resolve(onSubmit(values))
         } catch (e) {
-          if (e) {
-            console.error(e)
-          }
+          new Promise(() => {
+            throw e
+          })
         }
       }
 
diff --git a/packages/react-schema-renderer/src/shared/connect.ts b/packages/react-schema-renderer/src/shared/connect.ts
index 18a89f5222b..5c7451141dd 100644
--- a/packages/react-schema-renderer/src/shared/connect.ts
+++ b/packages/react-schema-renderer/src/shared/connect.ts
@@ -43,12 +43,13 @@ const bindEffects = (
     (event, key) => {
       const prevEvent = key === 'onChange' ? props[key] : undefined
       props[key] = (...args: any[]) => {
-        if (isFn(prevEvent)) {
-          prevEvent(...args)
-        }
         if (isFn(event)) {
-          return event(...args)
+          event(...args)
+        }
+        if (isFn(prevEvent)) {
+          return prevEvent(...args)
         }
+        
       }
     }
   )