From 9d85fdcdb3ae8b11dcb9602422fd8c54520496e6 Mon Sep 17 00:00:00 2001
From: markteng <markteng@tencent.com>
Date: Thu, 16 Apr 2020 11:34:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3props=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E9=AA=8C=E8=AF=81=E8=A1=A8=E5=8D=95=E6=B2=A1?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/routers/form.vue    | 23 +++++++++++++++++++++++
 src/components/form/form.vue |  4 ++++
 2 files changed, 27 insertions(+)

diff --git a/examples/routers/form.vue b/examples/routers/form.vue
index 0dcaaa3c..5809c816 100644
--- a/examples/routers/form.vue
+++ b/examples/routers/form.vue
@@ -169,6 +169,24 @@
                     </FormItem>
                 </Form>
             </i-col>
+            <i-col span="6">
+                <Form :model="formValidate5" ref="formValidate5">
+                    <FormItem label="name" prop="name">
+                         <Input v-model="formValidate5.name" placeholder="Enter your name"></Input>
+                    </FormItem>
+                    <FormItem label="name">
+                        <i-switch v-model="formValidate5.msgCheck"  />
+                    </FormItem>
+                    <FormItem label="msg" v-if="formValidate5.msgCheck" prop="msg" :rules="[{
+                        required: true
+                    }]" >
+                         <Input v-model="formValidate5.msg" placeholder="msg"></Input>
+                    </FormItem>
+                    <FormItem>
+                        <Button type="primary" @click="handleSubmit('formValidate5')">Submit</Button>
+                    </FormItem>
+                </Form>
+            </i-col>
         </row>
         <div style="margin: 100px;width: 200px;">
             <Divider>普通组件</Divider>
@@ -284,6 +302,11 @@
                     rate: 3,
                     colorPicker: ''
                 },
+                formValidate5: {
+                    name: '',
+                    msgCheck: false,
+                    msg: ''
+                },
                 ruleValidate: {
                     name: [
                         { required: true, message: 'The name cannot be empty', trigger: 'blur' }
diff --git a/src/components/form/form.vue b/src/components/form/form.vue
index 7f8b8b14..6669df1e 100644
--- a/src/components/form/form.vue
+++ b/src/components/form/form.vue
@@ -91,6 +91,10 @@
                 return new Promise(resolve => {
                     let valid = true;
                     let count = 0;
+                    // fields 为空需要返回promise
+                    if (this.fields.length === 0) {
+                        resolve(valid);
+                    }
                     this.fields.forEach(field => {
                         field.validate('', errors => {
                             if (errors) {

From 8cb900097e44375315946828ac786770d5c283e7 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Tue, 23 Jun 2020 17:27:58 +0800
Subject: [PATCH 2/2] Update form.vue

---
 src/components/form/form.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/form/form.vue b/src/components/form/form.vue
index 6669df1e..8cc157fd 100644
--- a/src/components/form/form.vue
+++ b/src/components/form/form.vue
@@ -94,6 +94,9 @@
                     // fields 为空需要返回promise
                     if (this.fields.length === 0) {
                         resolve(valid);
+                        if (typeof callback === 'function') {
+                            callback(valid);
+                        }
                     }
                     this.fields.forEach(field => {
                         field.validate('', errors => {