Form 做动作前都会 flush 一把

package.json

@@ -72,7 +72,8 @@
     "sortablejs": "1.10.0",
     "tslib": "^1.10.0",
     "uncontrollable": "4.1.0",
-    "video-react": "0.9.4"
+    "video-react": "0.9.4",
+    "lodash": "^4.17.15"
   },
   "devDependencies": {
     "@types/dom-helpers": "^3.4.1",

src/renderers/Form/Combo.tsx

@@ -303,13 +303,11 @@ export default class ComboControl extends React.Component<ComboProps> {
 
   handleChange(values: any, diff: any, {index}: any) {
     const {
-      formItem,
       flat,
       store,
       joinValues,
       delimiter,
       disabled,
-      validateOnChange,
       submitOnChange
     } = this.props;
 
@@ -326,10 +324,6 @@ export default class ComboControl extends React.Component<ComboProps> {
 
     this.props.onChange(value, submitOnChange, true);
 
-    if (validateOnChange !== false && formItem && formItem.validated) {
-      this.subForms.forEach(item => item.validate());
-    }
-
     store.forms.forEach(item =>
       item.items.forEach(item => item.unique && item.syncOptions())
     );

src/renderers/Form/Control.tsx

@@ -46,6 +46,7 @@ export default class FormControl extends React.PureComponent<
 > {
   public model: IFormItemStore | undefined;
   control: any;
+  value?: any;
   hook?: () => any;
   hook2?: () => any;
   hook3?: () => any;
@@ -61,7 +62,7 @@ export default class FormControl extends React.PureComponent<
     trailing: true,
     leading: false
   });
-  state = {value: this.props.control.value};
+  state = {value: this.value = this.props.control.value};
   componentWillMount() {
     const {
       formStore: form,
@@ -122,11 +123,11 @@ export default class FormControl extends React.PureComponent<
 
     // 同步 value
     this.setState({
-      value: model.value
+      value: this.value = model.value
     });
     this.reaction = reaction(
       () => model.value,
-      value => this.setState({value})
+      value => this.setState({value: this.value = value})
     );
   }
 
@@ -371,28 +372,25 @@ export default class FormControl extends React.PureComponent<
       value = pipeOut(value, oldValue, form.data);
     }
 
-    this.setState(
+    this.setState({
-      {
+      value: this.value = value
-        value
+    });
-      },
+    changeImmediately || conrolChangeImmediately || !formInited
-      () =>
+      ? this.emitChange(submitOnChange)
-        changeImmediately || conrolChangeImmediately || !formInited
+      : this.lazyEmitChange(submitOnChange);
-          ? this.emitChange(submitOnChange)
-          : this.lazyEmitChange(submitOnChange)
-    );
   }
 
   emitChange(submitOnChange: boolean = this.props.control.submitOnChange) {
     const {
       formStore: form,
       onChange,
-      control: {validateOnChange, name, pipeOut, onChange: onFormItemChange}
+      control: {validateOnChange, name, onChange: onFormItemChange}
     } = this.props;
 
     if (!this.model) {
       return;
     }
-    let value = this.state.value;
+    const value = this.value; // value 跟 this.state.value 更及时。
     const oldValue = this.model.value;
 
     if (oldValue === value) {
@@ -445,8 +443,9 @@ export default class FormControl extends React.PureComponent<
       return;
     }
 
-    let lastKey: string = '',
+    let lastKey: string = '';
-      lastValue: any;
+    let lastValue: any;
+
     Object.keys(values).forEach(key => {
       const value = values[key];
       lastKey = key;

src/renderers/Form/index.tsx

@@ -538,10 +538,18 @@ export default class Form extends React.Component<FormProps, object> {
       trimValues
     } = this.props;
 
+    // 做动作之前，先把数据同步一下。
+    this.flush();
+
     if (trimValues) {
       store.trimValues();
     }
 
+    // 如果 data 就是当前层，则 flush 一下。
+    if (data === this.props.data) {
+      data = store.data;
+    }
+
     if (Array.isArray(action.required) && action.required.length) {
       return store.validateFields(action.required).then(result => {
         if (!result) {
@@ -925,7 +933,8 @@ export default class Form extends React.Component<FormProps, object> {
       disabled: disabled || (control as Schema).disabled || form.loading,
       btnDisabled: form.loading || form.validating,
       onAction: this.handleAction,
-      onChange: formLazyChange === false ? this.handleChange : this.lazyHandleChange,
+      onChange:
+        formLazyChange === false ? this.handleChange : this.lazyHandleChange,
       addHook: this.addHook,
       removeHook: this.removeHook,
       renderFormItems: this.renderFormItems,