From d609ba86825d727544bb66b8ea4680916c0ebc14 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Wed, 28 Dec 2016 16:07:11 +0800
Subject: [PATCH] update TimePicker

---
 src/components/date-picker/picker.vue | 4 ++--
 test/routers/date.vue                 | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue
index 0ed5e9f..1082d9e 100644
--- a/src/components/date-picker/picker.vue
+++ b/src/components/date-picker/picker.vue
@@ -417,7 +417,6 @@
 
                 let newDate = formatter(date, format);
                 if (type === 'daterange' || type === 'timerange') {
-                    console.log(newDate);
                     newDate = [newDate.split(RANGE_SEPARATOR)[0], newDate.split(RANGE_SEPARATOR)[1]];
                 }
 
@@ -445,12 +444,13 @@
                 immediate: true,
                 handler (val) {
                     const type = this.type;
-                    if (type === 'time' || type === 'timerange') {
+                    if ((type === 'time' || type === 'timerange') && !(val instanceof Date)) {
                         const parser = (
                             TYPE_VALUE_RESOLVER_MAP[type] ||
                             TYPE_VALUE_RESOLVER_MAP['default']
                         ).parser;
                         if (type === 'timerange') val = val.join(RANGE_SEPARATOR);
+
                         val = parser(val, this.format || DEFAULT_FORMATS[type]);
                     }
                     this.internalValue = val;
diff --git a/test/routers/date.vue b/test/routers/date.vue
index bdaed4a..3495e5b 100644
--- a/test/routers/date.vue
+++ b/test/routers/date.vue
@@ -6,7 +6,7 @@
 <template>
     <row>
         <i-col span="12">
-            <!--<date-picker type="date" placeholder="选择日期" style="width: 200px" @on-ok="ok" confirm @on-clear="clear"></date-picker>-->
+            <date-picker type="date" placeholder="选择日期" style="width: 200px" @on-ok="ok" confirm @on-clear="clear"></date-picker>
         </i-col>
         <i-col span="12">
             <date-picker :value="value3" type="daterange" placement="bottom-start" placeholder="选择日期" style="width: 200px"></date-picker>
@@ -40,7 +40,7 @@
     export default {
         data () {
             return {
-//                value: '2016-12-12 03:03:03'
+//                value: '2016-12-12 03:03:03',
                 value: '15:12:01',
                 value2: ['08:40:00', '09:40:00'],
 //                value2: [new Date(), new Date()],
@@ -50,7 +50,7 @@
         methods: {
             c (s) {
                 console.log(1,s);
-                this.value = s;
+                this.value2 = s;
             },
             ok () {
                 console.log('ok');
--
libgit2 0.21.4