Commit 22ff9a62f237e243b501e40bf0ca1ea4e56eacf7
1 parent
46726afd
fix showSeconds flag logic
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
src/components/date-picker/panel/Time/time-range.vue
| @@ -102,7 +102,7 @@ | @@ -102,7 +102,7 @@ | ||
| 102 | ]; | 102 | ]; |
| 103 | }, | 103 | }, |
| 104 | showSeconds () { | 104 | showSeconds () { |
| 105 | - return (this.format || '').indexOf('ss') !== -1; | 105 | + return !(this.format || '').match(/mm$/); |
| 106 | }, | 106 | }, |
| 107 | leftDatePanelLabel () { | 107 | leftDatePanelLabel () { |
| 108 | return this.panelLabelConfig(this.date); | 108 | return this.panelLabelConfig(this.date); |
src/components/date-picker/panel/Time/time.vue
| @@ -69,7 +69,7 @@ | @@ -69,7 +69,7 @@ | ||
| 69 | }, | 69 | }, |
| 70 | computed: { | 70 | computed: { |
| 71 | showSeconds () { | 71 | showSeconds () { |
| 72 | - return (this.format || '').indexOf('ss') !== -1; | 72 | + return !(this.format || '').match(/mm$/); |
| 73 | }, | 73 | }, |
| 74 | visibleDate () { // TODO | 74 | visibleDate () { // TODO |
| 75 | const date = this.date; | 75 | const date = this.date; |