From 05e2dda017b8cef9bc12409ac8f00c7f3e84affe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Tue, 25 Apr 2017 14:50:37 +0800
Subject: [PATCH] fixed #768

---
 examples/routers/form.vue         | 80 +++++++------------------------
 src/components/form/form-item.vue | 13 +++--
 2 files changed, 27 insertions(+), 66 deletions(-)

diff --git a/examples/routers/form.vue b/examples/routers/form.vue
index 403a4f4f..d494cf3e 100644
--- a/examples/routers/form.vue
+++ b/examples/routers/form.vue
@@ -1,78 +1,32 @@
 <template>
     <div style="width: 300px;">
-        <Form ref="formCustom" :model="formCustom" :rules="ruleCustom" :label-width="80">
-            <Form-item label="密码" prop="passwd">
-                <Input type="password" v-model="formCustom.passwd"></Input>
-            </Form-item>
-            <Form-item label="确认密码" prop="passwdCheck">
-                <Input type="password" v-model="formCustom.passwdCheck"></Input>
-            </Form-item>
-            <Form-item label="年龄" prop="age">
-                <Input type="text" v-model="formCustom.age" number></Input>
+        <i-form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">
+            <Form-item label="爱好" prop="interest">
+                <Checkbox-group v-model="formValidate.interest">
+                    <Checkbox label="吃饭"></Checkbox>
+                    <Checkbox label="睡觉"></Checkbox>
+                    <Checkbox label="跑步"></Checkbox>
+                    <Checkbox label="看电影"></Checkbox>
+                </Checkbox-group>
             </Form-item>
             <Form-item>
-                <Button type="primary" @click="handleSubmit('formCustom')">提交</Button>
-                <Button type="ghost" @click="handleReset('formCustom')" style="margin-left: 8px">重置</Button>
+                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
+                <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
             </Form-item>
-        </Form>
+        </i-form>
     </div>
 </template>
 <script>
     export default {
         data () {
-            const validatePass = (rule, value, callback) => {
-                if (value === '') {
-                    callback(new Error('请输入密码'));
-                } else {
-                    if (this.formCustom.passwdCheck !== '') {
-                        // 对第二个密码框单独验证
-                        this.$refs.formCustom.validateField('passwdCheck');
-                    }
-                    callback();
-                }
-            };
-            const validatePassCheck = (rule, value, callback) => {
-                if (value === '') {
-                    callback(new Error('请再次输入密码'));
-                } else if (value !== this.formCustom.passwd) {
-                    callback(new Error('两次输入密码不一致!'));
-                } else {
-                    callback();
-                }
-            };
-            const validateAge = (rule, value, callback) => {
-                if (!value) {
-                    return callback(new Error('年龄不能为空'));
-                }
-                // 模拟异步验证效果
-                setTimeout(() => {
-                    if (!Number.isInteger(value)) {
-                        callback(new Error('请输入数字值'));
-                    } else {
-                        if (value < 18) {
-                            callback(new Error('必须年满18岁'));
-                        } else {
-                            callback();
-                        }
-                    }
-                }, 2000);
-            };
-
             return {
-                formCustom: {
-                    passwd: '',
-                    passwdCheck: '',
-                    age: ''
+                formValidate: {
+                    interest: ['吃饭', '跑步']
                 },
-                ruleCustom: {
-                    passwd: [
-                        { validator: validatePass, trigger: 'blur' }
-                    ],
-                    passwdCheck: [
-                        { validator: validatePassCheck, trigger: 'blur' }
-                    ],
-                    age: [
-                        { validator: validateAge, trigger: 'blur' }
+                ruleValidate: {
+                    interest: [
+                        { required: true, type: 'array', min: 1, message: '至少选择一个爱好', trigger: 'change' },
+                        { type: 'array', max: 2, message: '最多选择两个爱好', trigger: 'change' }
                     ]
                 }
             }
diff --git a/src/components/form/form-item.vue b/src/components/form/form-item.vue
index d64c9b65..503ca31a 100644
--- a/src/components/form/form-item.vue
+++ b/src/components/form/form-item.vue
@@ -191,10 +191,17 @@
 
                 let prop = getPropByPath(model, path);
 
-                if (Array.isArray(value) && value.length > 0) {
+//                if (Array.isArray(value) && value.length > 0) {
+//                    this.validateDisabled = true;
+//                    prop.o[prop.k] = [];
+//                } else if (value !== this.initialValue) {
+//                    this.validateDisabled = true;
+//                    prop.o[prop.k] = this.initialValue;
+//                }
+                if (Array.isArray(value)) {
                     this.validateDisabled = true;
-                    prop.o[prop.k] = [];
-                } else if (value !== this.initialValue) {
+                    prop.o[prop.k] = [].concat(this.initialValue);
+                } else {
                     this.validateDisabled = true;
                     prop.o[prop.k] = this.initialValue;
                 }