From 36628acaab7b1c14ddbc540a89f0b943e92eb595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Mon, 26 Dec 2016 15:57:12 +0800 Subject: [PATCH] update TimePicker update TimePicker --- .../date-picker/base/time-spinner.vue | 87 +++++++++++++++++-- src/components/date-picker/panel/time.vue | 4 + test/routers/date.vue | 2 +- 3 files changed, 85 insertions(+), 8 deletions(-) diff --git a/src/components/date-picker/base/time-spinner.vue b/src/components/date-picker/base/time-spinner.vue index 9bcef057..bd3d8cef 100644 --- a/src/components/date-picker/base/time-spinner.vue +++ b/src/components/date-picker/base/time-spinner.vue @@ -2,21 +2,29 @@
    -
  • +
  • {{ item.text }}
-
  • +
      +
    • {{ item.text }}
    • +
    -
  • +
      +
    • {{ item.text }}
    • +
    \ No newline at end of file diff --git a/src/components/date-picker/panel/time.vue b/src/components/date-picker/panel/time.vue index 2f506722..2bd5ff5c 100644 --- a/src/components/date-picker/panel/time.vue +++ b/src/components/date-picker/panel/time.vue @@ -7,6 +7,10 @@ :hours="hours" :minutes="minutes" :seconds="seconds" + :disabled-hours="disabledHours" + :disabled-minutes="disabledMinutes" + :disabled-seconds="disabledSeconds" + :hide-disabled-options="hideDisabledOptions" @on-change="handleChange" @on-pick-click="handlePickClick"> diff --git a/test/routers/date.vue b/test/routers/date.vue index 26b29022..4489fff9 100644 --- a/test/routers/date.vue +++ b/test/routers/date.vue @@ -7,7 +7,7 @@ - +