drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #561 from mouxhun/master

Browse source 
fix #551 TimePicker with Select Hour & Minute bug
This commit is contained in:
Aresn 2020-06-28 14:01:36 +08:00 • committed by GitHub
commit f0d03d7200
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/date-picker/panel/Time/time-range.vue
View file

@ -101,7 +101,8 @@
]; ];
}, },
showSeconds () { showSeconds () {
return !(this.format || '').match(/mm$/); //fix Hour & Minute Picker bug,show seconds when has "ss"
return !!(this.format || '').match(/ss/);
}, },
leftDatePanelLabel () { leftDatePanelLabel () {
return this.panelLabelConfig(this.date); return this.panelLabelConfig(this.date);

3
src/components/date-picker/panel/Time/time.vue
View file

@ -81,7 +81,8 @@
}, },
computed: { computed: {
showSeconds () { showSeconds () {
return !(this.format || '').match(/mm$/); //fix Hour & Minute Picker bug,show seconds when has "ss"
return !!(this.format || '').match(/ss/);
}, },
visibleDate () { // TODO visibleDate () { // TODO
const date = this.date; const date = this.date;