hotfix #902 表单验证trigger生效出错

Author: September-9

site/docs/en-US/form.md

@@ -383,7 +383,7 @@ constructor(props) {
  } else {
  callback();
  }
- } }
+ } , trigger: 'blur'}
  ],
  age: [
  { required: true, message: 'Please input the age', trigger: 'blur' },

site/docs/zh-CN/form.md

@@ -381,7 +381,7 @@ constructor(props) {
  } else {
  callback();
  }
- } }
+ } , trigger: 'blur'}
  ],
  age: [
  { required: true, message: '请填写年龄', trigger: 'blur' },

src/form/Form.jsx

@@ -18,17 +18,6 @@ export default class Form extends Component {
  }
  }
 
- componentDidUpdate(newProps: Object): void {
- const {model} = newProps
- const oldModel = this.props.model
- if (!model) return
- const diff = Object.keys(model).filter(key => model[key] !== oldModel[key])
- if (diff.length) {
- this.state.fields.filter(({props}) => props.prop.match(diff))
- .map(field => field.validate('', () => undefined));
- }
- }
-
  getChildContext(): { component: Form } {
  return {
  component: this

src/form/FormItem.jsx

@@ -75,9 +75,10 @@ export default class FormItem extends Component {
 
  return;
  }
-
+ 
  setTimeout(() => {
  this.validate('change');
+ 
  });
  }
 
@@ -152,8 +153,13 @@ export default class FormItem extends Component {
  const rules = this.getRules();
 
  return rules.filter(rule => {
- return !rule.trigger || rule.trigger.indexOf(trigger) !== -1;
- });
+ if (!rule.trigger || trigger === '') return true;
+ if (Array.isArray(rule.trigger)) {
+ return rule.trigger.indexOf(trigger) > -1;
+ } else {
+ return rule.trigger === trigger;
+ }
+ }).map(rule => Object.assign({}, rule));
  }
 
  labelStyle(): { width?: number | string } {