Merge branch 'master' of https://github.com/vueComponent/ant-design-vue

Author: tangjinzhou

components/form-model/Form.jsx

@@ -17,6 +17,7 @@ export const FormProps = {
   hideRequiredMark: PropTypes.bool,
   model: PropTypes.object,
   rules: PropTypes.object,
+  validateMessages: PropTypes.any,
   validateOnRuleChange: PropTypes.bool,
 };
 

components/form-model/FormItem.jsx

@@ -142,6 +142,9 @@ export default {
       }
       descriptor[this.prop] = rules;
       const validator = new AsyncValidator(descriptor);
+      if (this.FormContext && this.FormContext.validateMessages) {
+        validator.messages(this.FormContext.validateMessages);
+      }
       const model = {};
       model[this.prop] = this.fieldValue;
       validator.validate(model, { firstFields: true }, (errors, invalidFields) => {

types/form-model/form.d.ts

@@ -132,8 +132,14 @@ export declare class FormModel extends AntdComponent {
    * validation rules of form
    * @type object
    */
-
   rules: object;
+
+  /**
+   * Default validate message. And its format is similar with newMessages's returned value
+   * @type any
+   */
+  validateMessages?: any;
+
   /**
    * whether to trigger validation when the rules prop is changed
    * @type Boolean

types/form/form.d.ts

@@ -389,7 +389,7 @@ export declare class Form extends AntdComponent {
    */
   options: object;
 
-  createForm(context: Vue, options?: IformCreateOption): any;
+  createForm(context: Vue, options?: IformCreateOption): WrappedFormUtils;
 
   /**
    * Convert props to field value