From 22ff9a62f237e243b501e40bf0ca1ea4e56eacf7 Mon Sep 17 00:00:00 2001 From: Sergio Crisostomo Date: Wed, 24 Jan 2018 13:34:02 +0100 Subject: [PATCH] fix showSeconds flag logic --- src/components/date-picker/panel/Time/time-range.vue | 2 +- src/components/date-picker/panel/Time/time.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/date-picker/panel/Time/time-range.vue b/src/components/date-picker/panel/Time/time-range.vue index f4a65aa..bbbbf71 100644 --- a/src/components/date-picker/panel/Time/time-range.vue +++ b/src/components/date-picker/panel/Time/time-range.vue @@ -102,7 +102,7 @@ ]; }, showSeconds () { - return (this.format || '').indexOf('ss') !== -1; + return !(this.format || '').match(/mm$/); }, leftDatePanelLabel () { return this.panelLabelConfig(this.date); diff --git a/src/components/date-picker/panel/Time/time.vue b/src/components/date-picker/panel/Time/time.vue index 35a2688..0ae5046 100644 --- a/src/components/date-picker/panel/Time/time.vue +++ b/src/components/date-picker/panel/Time/time.vue @@ -69,7 +69,7 @@ }, computed: { showSeconds () { - return (this.format || '').indexOf('ss') !== -1; + return !(this.format || '').match(/mm$/); }, visibleDate () { // TODO const date = this.date; -- libgit2 0.21.4