diff --git a/components/lib/calendar/Calendar.vue b/components/lib/calendar/Calendar.vue index d63588b2e1..6d7bb7b455 100755 --- a/components/lib/calendar/Calendar.vue +++ b/components/lib/calendar/Calendar.vue @@ -1162,9 +1162,9 @@ export default { let date = new Date(dateMeta.year, dateMeta.month, dateMeta.day); if (this.showTime) { - if (this.hourFormat === '12' && this.currentHour !== 12) { - this.pm ? date.setHours(this.currentHour + 12) : date.setHours(this.currentHour); - } + (this.hourFormat === '12' && this.currentHour !== 12 && this.pm) ? + date.setHours(this.currentHour + 12) : + date.setHours(this.currentHour); date.setMinutes(this.currentMinute); date.setSeconds(this.currentSecond);