From d596b9e4f8591f36d9bf4f8edf9ae2da6ff3dcec Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Thu, 29 Dec 2016 18:09:16 +0800
Subject: [PATCH] update TimePicker

---
 src/components/date-picker/panel/time-range.vue | 4 +++-
 src/components/date-picker/panel/time.vue       | 4 +++-
 src/styles/components/time-picker.less          | 4 ++--
 test/routers/date.vue                           | 8 ++++++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/components/date-picker/panel/time-range.vue b/src/components/date-picker/panel/time-range.vue
index ad7038d..dd1a71e 100644
--- a/src/components/date-picker/panel/time-range.vue
+++ b/src/components/date-picker/panel/time-range.vue
@@ -30,6 +30,7 @@
                     @on-pick-click="handlePickClick"></time-spinner>
             </div>
             <Confirm
+                v-if="confirm"
                 @on-pick-clear="handlePickClear"
                 @on-pick-success="handlePickSuccess"></Confirm>
         </div>
@@ -66,7 +67,8 @@
                 disabledHours: [],
                 disabledMinutes: [],
                 disabledSeconds: [],
-                hideDisabledOptions: false
+                hideDisabledOptions: false,
+                confirm: false
             };
         },
         computed: {
diff --git a/src/components/date-picker/panel/time.vue b/src/components/date-picker/panel/time.vue
index a945408..53dad98 100644
--- a/src/components/date-picker/panel/time.vue
+++ b/src/components/date-picker/panel/time.vue
@@ -15,6 +15,7 @@
                     @on-pick-click="handlePickClick"></time-spinner>
             </div>
             <Confirm
+                v-if="confirm"
                 @on-pick-clear="handlePickClear"
                 @on-pick-success="handlePickSuccess"></Confirm>
         </div>
@@ -47,7 +48,8 @@
                 disabledHours: [],
                 disabledMinutes: [],
                 disabledSeconds: [],
-                hideDisabledOptions: false
+                hideDisabledOptions: false,
+                confirm: false
             };
         },
         computed: {
diff --git a/src/styles/components/time-picker.less b/src/styles/components/time-picker.less
index e506a41..fb269e7 100644
--- a/src/styles/components/time-picker.less
+++ b/src/styles/components/time-picker.less
@@ -18,10 +18,10 @@
             border-left: 1px solid @border-color-split;
             &:first-child{
                 border-left: none;
-                border-radius: @btn-border-radius 0 0 0;
+                border-radius: @btn-border-radius 0 0 @btn-border-radius;
             }
             &:last-child{
-                border-radius: 0 @btn-border-radius 0 0;
+                border-radius: 0 @btn-border-radius @btn-border-radius 0;
             }
             ul{
                 width: 100%;
diff --git a/test/routers/date.vue b/test/routers/date.vue
index cc289a7..4caeebf 100644
--- a/test/routers/date.vue
+++ b/test/routers/date.vue
@@ -24,7 +24,7 @@
                 <!--style="width: 168px"></time-picker>-->
         <!--</i-col>-->
         <i-col span="12">
-            <Time-picker type="time" :value="value" placeholder="选择时间" style="width: 168px"></Time-picker>
+            <Time-picker type="timerange" confirm placeholder="选择时间" style="width: 168px"></Time-picker>
             <!--<time-picker-->
                 <!--:value="value2"-->
                 <!--type="timerange"-->
@@ -36,6 +36,7 @@
                 <!--@on-clear="clear"-->
                 <!--style="width: 168px"></time-picker>-->
         </i-col>
+        <i-button @click="time">time</i-button>
     </row>
 </template>
 <script>
@@ -43,7 +44,7 @@
         data () {
             return {
 //                value: '2016-12-12 03:03:03',
-                value: '15:12:01',
+                value: '03:12:01',
                 value2: ['08:40:00', '09:40:00'],
 //                value2: [new Date(), new Date()],
                 value3: ['2016-12-01', '2016-12-25']
@@ -60,6 +61,9 @@
             },
             clear () {
                 console.log('clear');
+            },
+            time () {
+                this.value = new Date();
             }
         }
     }
--
libgit2 0.21.4