From 36628acaab7b1c14ddbc540a89f0b943e92eb595 Mon Sep 17 00:00:00 2001 From: 梁灏 Date: Mon, 26 Dec 2016 15:57:12 +0800 Subject: [PATCH] update TimePicker --- src/components/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 9bcef05..bd3d8ce 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 2f50672..2bd5ff5 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 26b2902..4489fff 100644 --- a/test/routers/date.vue +++ b/test/routers/date.vue @@ -7,7 +7,7 @@ - + -- libgit2 0.21.4