From d70cad45ec14fc75f456926f3f3f622f8c06e518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Tue, 27 Dec 2016 15:50:07 +0800
Subject: [PATCH] update TimePicker

update TimePicker
---
 .../date-picker/base/time-spinner.vue         | 20 ++++++++++++++-----
 src/utils/assist.js                           |  1 +
 test/routers/date.vue                         |  4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/components/date-picker/base/time-spinner.vue b/src/components/date-picker/base/time-spinner.vue
index cd02c9da..cc5555d4 100644
--- a/src/components/date-picker/base/time-spinner.vue
+++ b/src/components/date-picker/base/time-spinner.vue
@@ -19,7 +19,7 @@
 </template>
 <script>
     import Options from '../time-mixins';
-    import { deepCopy, scrollTop } from '../../../utils/assist';
+    import { deepCopy, scrollTop, firstUpperCase } from '../../../utils/assist';
 
     const prefixCls = 'ivu-time-picker-cells';
 
@@ -70,7 +70,7 @@
                     const hour = deepCopy(hour_tmpl);
                     hour.text = i;
 
-                    if (this.disabledHours && this.disabledHours.indexOf(i) > -1) {
+                    if (this.disabledHours.length && this.disabledHours.indexOf(i) > -1) {
                         hour.disabled = true;
                         if (this.hideDisabledOptions) hour.hide = true;
                     }
@@ -93,7 +93,7 @@
                     const minute = deepCopy(minute_tmpl);
                     minute.text = i;
 
-                    if (this.disabledMinutes && this.disabledMinutes.indexOf(i) > -1) {
+                    if (this.disabledMinutes.length && this.disabledMinutes.indexOf(i) > -1) {
                         minute.disabled = true;
                         if (this.hideDisabledOptions) minute.hide = true;
                     }
@@ -116,7 +116,7 @@
                     const second = deepCopy(second_tmpl);
                     second.text = i;
 
-                    if (this.disabledSeconds && this.disabledSeconds.indexOf(i) > -1) {
+                    if (this.disabledSeconds.length && this.disabledSeconds.indexOf(i) > -1) {
                         second.disabled = true;
                         if (this.hideDisabledOptions) second.hide = true;
                     }
@@ -156,7 +156,17 @@
                     this.$emit('on-change', data);
 
                     const from = this.$els[type].scrollTop;
-                    const to = 24 * cell.text;
+
+                    let index = cell.text;
+                    const Type = firstUpperCase(type);
+                    const disabled = this[`disabled${Type}`];
+                    if (disabled.length && this.hideDisabledOptions) {
+                        let _count = 0;
+                        disabled.forEach(item => item <= index ? _count++ : '');
+                        index -= _count;
+                    }
+
+                    const to = 24 * index;
                     scrollTop(this.$els[type], from, to, 500);
                 }
             }
diff --git a/src/utils/assist.js b/src/utils/assist.js
index 77f5a49a..34dcdc0a 100644
--- a/src/utils/assist.js
+++ b/src/utils/assist.js
@@ -81,6 +81,7 @@ export function getStyle (element, styleName) {
 function firstUpperCase(str) {
     return str.toString()[0].toUpperCase() + str.toString().slice(1);
 }
+export {firstUpperCase};
 
 // Warn
 export function warnProp(component, prop, correctType, wrongType) {
diff --git a/test/routers/date.vue b/test/routers/date.vue
index 613b2041..9b8c1432 100644
--- a/test/routers/date.vue
+++ b/test/routers/date.vue
@@ -16,8 +16,8 @@
                 :value="value"
                 placeholder="选择时间"
                 format="HH:mm:ss"
-                :hide-disabled-options="true"
-                :disabled-hours="[1,2]"
+                :hide-disabled-options="false"
+                :disabled-hours="[1,2,5,10,11]"
                 style="width: 168px"></time-picker>
         </i-col>
     </row>