diff --git a/src/components/date-picker/panel/time-range.vue b/src/components/date-picker/panel/time-range.vue index ad7038d5..dd1a71ea 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"> @@ -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 a945408e..53dad98a 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"> @@ -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 e506a41d..fb269e77 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 cc289a72..4caeebf0 100644 --- a/test/routers/date.vue +++ b/test/routers/date.vue @@ -24,7 +24,7 @@ - + @@ -36,6 +36,7 @@ + time