Skip to content

Commit ecab7f6

Browse files
committed
fix: rangePicker showTime disabled not work, close #5286 #5380
1 parent 5724c84 commit ecab7f6

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

components/vc-picker/RangePicker.tsx

+13-3
Original file line numberDiff line numberDiff line change
@@ -421,8 +421,16 @@ function RangerPicker<DateType>() {
421421
let values = newValue;
422422
let startValue = getValue(values, 0);
423423
let endValue = getValue(values, 1);
424-
const { generateConfig, locale, picker, order, onCalendarChange, allowEmpty, onChange } =
425-
props;
424+
const {
425+
generateConfig,
426+
locale,
427+
picker,
428+
order,
429+
onCalendarChange,
430+
allowEmpty,
431+
onChange,
432+
showTime,
433+
} = props;
426434

427435
// >>>>> Format start & end values
428436
if (startValue && endValue && generateConfig.isAfter(startValue, endValue)) {
@@ -436,7 +444,9 @@ function RangerPicker<DateType>() {
436444
(picker !== 'week' &&
437445
picker !== 'quarter' &&
438446
picker !== 'time' &&
439-
!isSameDate(generateConfig, startValue, endValue))
447+
!(showTime
448+
? isEqual(generateConfig, startValue, endValue)
449+
: isSameDate(generateConfig, startValue, endValue)))
440450
) {
441451
// Clean up end date when start date is after end date
442452
if (sourceIndex === 0) {

0 commit comments

Comments
 (0)