From 36931442588617d7feb7dce0ef431df6332f505f Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Fri, 30 Dec 2016 13:56:34 +0800
Subject: [PATCH] update DateTimePicker

---
 src/components/date-picker/panel/date.vue | 15 ++++++++++++++-
 src/components/date-picker/panel/time.vue | 41 ++++++++++++++++++++++-------------------
 src/components/date-picker/picker.vue     |  3 ---
 test/routers/date.vue                     |  6 +++---
 4 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/components/date-picker/panel/date.vue b/src/components/date-picker/panel/date.vue
index d10e247..6235b5f 100644
--- a/src/components/date-picker/panel/date.vue
+++ b/src/components/date-picker/panel/date.vue
@@ -60,8 +60,8 @@
                     @on-pick="handleMonthPick"
                     @on-pick-click="handlePickClick"></month-table>
                 <time-picker
-                    v-show="currentView === 'time'"
                     v-ref:time-picker
+                    v-show="currentView === 'time'"
                     :date="date"
                     :value="value"
                     :format="format"
@@ -142,6 +142,13 @@
                     this.year = newVal.getFullYear();
                     this.month = newVal.getMonth();
                 }
+                if (this.showTime) this.$refs.timePicker.value = newVal;
+            },
+            date (val) {
+                if (this.showTime) this.$refs.timePicker.date = val;
+            },
+            format (val) {
+                if (this.showTime) this.$refs.timePicker.format = val;
             },
             currentView (val) {
                 if (val === 'time') this.$refs.timePicker.updateScroll();
@@ -268,6 +275,12 @@
                 this.year = this.date.getFullYear();
                 this.month = this.date.getMonth();
             }
+            if (this.showTime) {
+                this.$refs.timePicker.date = this.date;
+                this.$refs.timePicker.value = this.value;
+                this.$refs.timePicker.format = this.format;
+                this.$refs.timePicker.showDate = true;
+            }
         }
     };
 </script>
diff --git a/src/components/date-picker/panel/time.vue b/src/components/date-picker/panel/time.vue
index 7277d1f..5ed1835 100644
--- a/src/components/date-picker/panel/time.vue
+++ b/src/components/date-picker/panel/time.vue
@@ -37,29 +37,32 @@
     export default {
         mixins: [Mixin],
         components: { TimeSpinner, Confirm },
-        props: {
-            date: {
-                default () {
-                    return initTimeDate();
-                }
-            },
-            value: {
-                default: ''
-            },
-            showDate: {
-                type: Boolean,
-                default: false
-            },
-            format: {
-                type: String,
-                default: 'HH:mm:ss'
-            }
-        },
+//        props: {
+//            date: {
+//                default () {
+//                    return initTimeDate();
+//                }
+//            },
+//            value: {
+//                default: ''
+//            },
+//            showDate: {
+//                type: Boolean,
+//                default: false
+//            },
+//            format: {
+//                type: String,
+//                default: 'HH:mm:ss'
+//            }
+//        },
         data () {
             return {
                 prefixCls: prefixCls,
                 timePrefixCls: timePrefixCls,
-//                format: 'HH:mm:ss',
+                date: initTimeDate(),
+                value: '',
+                showDate: false,
+                format: 'HH:mm:ss',
                 hours: '',
                 minutes: '',
                 seconds: '',
diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue
index be95418..588c849 100644
--- a/src/components/date-picker/picker.vue
+++ b/src/components/date-picker/picker.vue
@@ -398,13 +398,10 @@
                         this.handleClear();
                     });
                     this.picker.$on('on-pick-success', () => {
-//                        this.emitChange(this.value);
                         this.visible = false;
                         this.$emit('on-ok');
                     });
                     this.picker.$on('on-pick-click', () => this.disableClickOutSide = true);
-
-                    // todo $on('on-time-range')
                 }
                 if (this.internalValue instanceof Date) {
                     this.picker.date = new Date(this.internalValue.getTime());
diff --git a/test/routers/date.vue b/test/routers/date.vue
index 6d48363..992f291 100644
--- a/test/routers/date.vue
+++ b/test/routers/date.vue
@@ -5,9 +5,9 @@
 </style>
 <template>
     <row>
-        <!--<i-col span="12">-->
-            <!--<date-picker type="date" placeholder="选择日期" style="width: 200px" @on-ok="ok" confirm @on-clear="clear"></date-picker>-->
-        <!--</i-col>-->
+        <i-col span="12">
+            <Time-picker :value="value" type="time" placeholder="选择时间" style="width: 168px"></Time-picker>
+        </i-col>
         <!--<i-col span="12">-->
             <!--<date-picker :value="value3" type="daterange" placement="bottom-start" placeholder="选择日期" style="width: 200px"></date-picker>-->
         <!--</i-col>-->
--
libgit2 0.21.4