From cc419499906a2321410e8a446ae690688ccd96a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 29 Mar 2017 09:33:31 +0800
Subject: [PATCH] fixed #525

---
 examples/routers/form.vue            | 69 +++++++++++++++++++++++-----
 src/components/cascader/cascader.vue |  8 ++--
 2 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/examples/routers/form.vue b/examples/routers/form.vue
index 1c02a75b..e2833318 100644
--- a/examples/routers/form.vue
+++ b/examples/routers/form.vue
@@ -266,11 +266,11 @@
 <template>
     <div>
         <Form ref="DateForm" :model="form" :rules="rules" :label-width="80" style="width: 400px;">
-            <Form-item label="选择日期" prop="date">
-                <Date-picker v-model="form.date" type="datetime"></Date-picker>
+            <Form-item label="选择日期" prop="value1">
+                <Cascader :data="form.data" v-model="form.value1"></Cascader>
             </Form-item>
             <Form-item>
-                <Button type="primary" @click.native="handleClick">确定</Button>
+                <Button type="primary" @click="handleClick">确定</Button>
             </Form-item>
         </Form>
     </div>
@@ -280,12 +280,62 @@
         data () {
             return {
                 form: {
-                    date: ''
+                    value1: [],
+                    data: [{
+                        value: 'beijing',
+                        label: '北京',
+                        children: [
+                            {
+                                value: 'gugong',
+                                label: '故宫'
+                            },
+                            {
+                                value: 'tiantan',
+                                label: '天坛'
+                            },
+                            {
+                                value: 'wangfujing',
+                                label: '王府井'
+                            }
+                        ]
+                    }, {
+                        value: 'jiangsu',
+                        label: '江苏',
+                        children: [
+                            {
+                                value: 'nanjing',
+                                label: '南京',
+                                children: [
+                                    {
+                                        value: 'fuzimiao',
+                                        label: '夫子庙',
+                                    }
+                                ]
+                            },
+                            {
+                                value: 'suzhou',
+                                label: '苏州',
+                                children: [
+                                    {
+                                        value: 'zhuozhengyuan',
+                                        label: '拙政园',
+                                    },
+                                    {
+                                        value: 'shizilin',
+                                        label: '狮子林',
+                                    }
+                                ]
+                            }
+                        ],
+                    }]
                 },
                 rules: {
-                    date: [
-                        { required: true, type: 'date', message: '不能为空', trigger: 'change' },
-                        { type: 'date', message: '日期格式不正确', trigger: 'change'}
+                    value1: [
+                        {
+                            required: true,
+                            type: 'array',
+                            message: '没有填写'
+                        }
                     ]
                 }
             }
@@ -294,11 +344,6 @@
             handleClick() {
                 this.$refs.DateForm.validate();
             }
-        },
-        watch: {
-            'form.date' (val) {
-                console.log(val);
-            }
         }
     }
 </script>
\ No newline at end of file
diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index c457a41a..7c0b867b 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -162,9 +162,11 @@
             emitValue (val, oldVal) {
                 if (JSON.stringify(val) !== oldVal) {
                     this.$emit('on-change', this.currentValue, JSON.parse(JSON.stringify(this.selected)));
-                    this.dispatch('FormItem', 'on-form-change', {
-                        value: this.currentValue,
-                        selected: JSON.parse(JSON.stringify(this.selected))
+                    this.$nextTick(() => {
+                        this.dispatch('FormItem', 'on-form-change', {
+                            value: this.currentValue,
+                            selected: JSON.parse(JSON.stringify(this.selected))
+                        });
                     });
                 }
             }