Merge pull request #6687 from Alex-Grimes/fix/datepicker-changes-12am-to-12pm-on-date-selection

Fix/datepicker changes 12am to 12pm on date selection
pull/6768/head
Tuğçe Küçükoğlu 2024-11-12 12:03:22 +03:00 committed by GitHub
commit ff099dfac6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions

View File

@ -998,7 +998,6 @@ export default {
this.pm = currentHour > 11; this.pm = currentHour > 11;
if (currentHour >= 12) currentHour = currentHour == 12 ? 12 : currentHour - 12; if (currentHour >= 12) currentHour = currentHour == 12 ? 12 : currentHour - 12;
else currentHour = currentHour == 0 ? 12 : currentHour;
} }
this.currentHour = Math.floor(currentHour / this.stepHour) * this.stepHour; this.currentHour = Math.floor(currentHour / this.stepHour) * this.stepHour;
@ -2925,6 +2924,9 @@ export default {
return yearPickerValues; return yearPickerValues;
}, },
formattedCurrentHour() { formattedCurrentHour() {
if (this.currentHour == 0) {
return this.currentHour + 12;
}
return this.currentHour < 10 ? '0' + this.currentHour : this.currentHour; return this.currentHour < 10 ? '0' + this.currentHour : this.currentHour;
}, },
formattedCurrentMinute() { formattedCurrentMinute() {