From 22c27b7962a5363cadcf14fda9b51965fb42cbdf Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Wed, 8 Nov 2017 20:44:35 +0800
Subject: [PATCH] fixed #2215

---
 examples/routers/date.vue             |  99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------
 src/components/date-picker/picker.vue |   4 ++++
 2 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/examples/routers/date.vue b/examples/routers/date.vue
index ff32c2c..e1c493f 100644
--- a/examples/routers/date.vue
+++ b/examples/routers/date.vue
@@ -1,43 +1,43 @@
-<template>
-    <div>
-        {{ value1 }}
-        <Date-picker v-model="value1" type="datetimerange" placeholder="选择日期" style="width: 200px" @on-change="hc"></Date-picker>
-        <Button @click="setDate">set date</Button>
-        <Button @click="getDate">get date</Button>
-        <!--<Date-picker v-model="value2" type="daterange" placeholder="选择日期" style="width: 200px"></Date-picker>-->
-        <!--<Date-picker transfer type="datetimerange" placeholder="选择日期" style="width: 200px" @on-change="changeDate"></Date-picker>-->
-    </div>
-</template>
-<script>
-    export default {
-        data () {
-            return {
-                value1: ['2014-10-10 10:00:01', '2017-10-10 10:00:00'],
-                value2: []
-            }
-        },
-        methods: {
-            changeDate(date){
-                console.log(date);
-            },
-            setDate () {
-                this.value1 = ['2016-10-10', '2017-10-10'];
-            },
-            getDate () {
-                const date = new Date(this.value1);
-                console.log(date.getMonth()+1)
-            },
-            hc (d) {
-                console.log(d);
-            }
-        }
-    }
-</script>
-<style>
-    body{
-        width: 100%;
-    }
-</style>
+<!--<template>-->
+    <!--<div>-->
+        <!--{{ value1 }}-->
+        <!--<Date-picker v-model="value1" type="datetimerange" placeholder="选择日期" style="width: 200px" @on-change="hc"></Date-picker>-->
+        <!--<Button @click="setDate">set date</Button>-->
+        <!--<Button @click="getDate">get date</Button>-->
+        <!--&lt;!&ndash;<Date-picker v-model="value2" type="daterange" placeholder="选择日期" style="width: 200px"></Date-picker>&ndash;&gt;-->
+        <!--&lt;!&ndash;<Date-picker transfer type="datetimerange" placeholder="选择日期" style="width: 200px" @on-change="changeDate"></Date-picker>&ndash;&gt;-->
+    <!--</div>-->
+<!--</template>-->
+<!--<script>-->
+    <!--export default {-->
+        <!--data () {-->
+            <!--return {-->
+                <!--value1: ['2014-10-10 10:00:01', '2017-10-10 10:00:00'],-->
+                <!--value2: []-->
+            <!--}-->
+        <!--},-->
+        <!--methods: {-->
+            <!--changeDate(date){-->
+                <!--console.log(date);-->
+            <!--},-->
+            <!--setDate () {-->
+                <!--this.value1 = ['2016-10-10', '2017-10-10'];-->
+            <!--},-->
+            <!--getDate () {-->
+                <!--const date = new Date(this.value1);-->
+                <!--console.log(date.getMonth()+1)-->
+            <!--},-->
+            <!--hc (d) {-->
+                <!--console.log(d);-->
+            <!--}-->
+        <!--}-->
+    <!--}-->
+<!--</script>-->
+<!--<style>-->
+    <!--body{-->
+        <!--width: 100%;-->
+    <!--}-->
+<!--</style>-->
 
 
 <!--<template>-->
@@ -189,3 +189,22 @@
 
 
 
+<template>
+    <div>
+        <DatePicker v-model="value" @on-change="handleChange" type="date" placeholder="Select date" style="width: 200px"></DatePicker>
+    </div>
+</template>
+<script>
+    export default {
+        data () {
+            return {
+                value: new Date()
+            }
+        },
+        methods: {
+            handleChange (v) {
+                console.log(v);
+            }
+        }
+    }
+</script>
diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue
index f7b3e68..5211fcc 100644
--- a/src/components/date-picker/picker.vue
+++ b/src/components/date-picker/picker.vue
@@ -404,6 +404,10 @@
                 this.currentValue = '';
                 this.$emit('on-clear');
                 this.dispatch('FormItem', 'on-form-change', '');
+                // #2215，当初始设置了 value，直接点 clear，这时 this.picker 还没有加载
+                if (!this.picker) {
+                    this.emitChange('');
+                }
             },
             showPicker () {
                 if (!this.picker) {
--
libgit2 0.21.4