Skip to content

Commit bfec6fa

Browse files
committed
fix(RangePicker): disabled won't work with show-time close vueComponent#5286
1 parent 5d9afb7 commit bfec6fa

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

components/vc-picker/RangePicker.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
isEqual,
1313
getClosingViewDate,
1414
isSameDate,
15+
isSameTime,
1516
isSameWeek,
1617
isSameQuarter,
1718
formatValue,
@@ -423,7 +424,6 @@ function RangerPicker<DateType>() {
423424
let endValue = getValue(values, 1);
424425
const { generateConfig, locale, picker, order, onCalendarChange, allowEmpty, onChange } =
425426
props;
426-
427427
// >>>>> Format start & end values
428428
if (startValue && endValue && generateConfig.isAfter(startValue, endValue)) {
429429
if (
@@ -436,7 +436,8 @@ function RangerPicker<DateType>() {
436436
(picker !== 'week' &&
437437
picker !== 'quarter' &&
438438
picker !== 'time' &&
439-
!isSameDate(generateConfig, startValue, endValue))
439+
isSameDate(generateConfig, startValue, endValue)) ||
440+
isSameTime(generateConfig, startValue, endValue)
440441
) {
441442
// Clean up end date when start date is after end date
442443
if (sourceIndex === 0) {
@@ -469,7 +470,6 @@ function RangerPicker<DateType>() {
469470
: '';
470471
if (onCalendarChange) {
471472
const info: RangeInfo = { range: sourceIndex === 0 ? 'start' : 'end' };
472-
473473
onCalendarChange(values, [startStr, endStr], info);
474474
}
475475

0 commit comments

Comments
 (0)