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

---
 src/components/date-picker/panel/date.vue |  1 +
 src/components/date-picker/panel/time.vue |  9 +++++++++
 src/styles/components/time-picker.less    |  8 ++++++++
 3 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/components/date-picker/panel/date.vue b/src/components/date-picker/panel/date.vue
index 186cc25..7d37138 100644
--- a/src/components/date-picker/panel/date.vue
+++ b/src/components/date-picker/panel/date.vue
@@ -64,6 +64,7 @@
                     v-ref:time-picker
                     :date="date"
                     :value="value"
+                    show-date
                     @on-pick="handleTimePick"></time-picker>
             </div>
             <Confirm
diff --git a/src/components/date-picker/panel/time.vue b/src/components/date-picker/panel/time.vue
index fb37a36..f31cd29 100644
--- a/src/components/date-picker/panel/time.vue
+++ b/src/components/date-picker/panel/time.vue
@@ -1,6 +1,7 @@
 <template>
     <div :class="[prefixCls + '-body-wrapper']">
         <div :class="[prefixCls + '-body']">
+            <div :class="[timePrefixCls + '-header']" v-if="showDate">{{ visibleDate }}</div>
             <div :class="[prefixCls + '-content']">
                 <time-spinner
                     v-ref:time-spinner
@@ -44,6 +45,10 @@
             },
             value: {
                 default: ''
+            },
+            showDate: {
+                type: Boolean,
+                default: false
             }
         },
         data () {
@@ -64,6 +69,10 @@
         computed: {
             showSeconds () {
                 return (this.format || '').indexOf('ss') !== -1;
+            },
+            visibleDate () {
+                const date = this.date;
+                return `${date.getFullYear()}年 ${date.getMonth() + 1}月`;
             }
         },
         watch: {
diff --git a/src/styles/components/time-picker.less b/src/styles/components/time-picker.less
index 812534d..9ecd1e5 100644
--- a/src/styles/components/time-picker.less
+++ b/src/styles/components/time-picker.less
@@ -135,7 +135,15 @@
                 }
                 &-list {
                     width: @time-picker-cells-width-with-date-base;
+                    max-height: 216px;
+                    &:first-child{
+                        border-radius: 0;
+                    }
+                    &:last-child{
+                        border-radius: 0;
+                    }
                     ul{
+                        padding: 0 0 192px 0;
                         li{
                             padding: 0 0 0 28px;
                         }
--
libgit2 0.21.4