Skip to content

Commit 21f5718

Browse files
committed
fix: disabledtime for ampm (#664)
1 parent ad7aaba commit 21f5718

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

__test__/__snapshots__/time-range.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
307307
data-type="ampm"
308308
>
309309
<li
310-
class="mx-time-item disabled"
310+
class="mx-time-item"
311311
data-index="0"
312312
>
313313

src/time/time-panel.vue

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,26 @@ export default {
180180
this.isDisabledTime(value.setSeconds(59, 999))
181181
);
182182
},
183+
isDisabledAMPM(date) {
184+
const value = new Date(date);
185+
const minHour = value.getHours() < 12 ? 0 : 12;
186+
const maxHour = minHour + 11;
187+
return (
188+
this.isDisabledTime(value) &&
189+
this.isDisabledTime(value.setHours(minHour, 0, 0, 0)) &&
190+
this.isDisabledTime(value.setHours(maxHour, 59, 59, 999))
191+
);
192+
},
183193
isDisabled(date, type) {
184194
if (type === 'hour') {
185195
return this.isDisabledHour(date);
186196
}
187197
if (type === 'minute') {
188198
return this.isDisabledMinute(date);
189199
}
200+
if (type === 'ampm') {
201+
return this.isDisabledAMPM(date);
202+
}
190203
return this.isDisabledTime(date);
191204
},
192205
handleSelect(value, type) {

0 commit comments

Comments
 (0)