From ecab7f66d875ad2d01d5959b26c5370ece82f929 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Wed, 23 Mar 2022 11:04:12 +0800 Subject: [PATCH] fix: rangePicker showTime disabled not work, close #5286 #5380 --- components/vc-picker/RangePicker.tsx | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/components/vc-picker/RangePicker.tsx b/components/vc-picker/RangePicker.tsx index 518252889..523c7771f 100644 --- a/components/vc-picker/RangePicker.tsx +++ b/components/vc-picker/RangePicker.tsx @@ -421,8 +421,16 @@ function RangerPicker() { let values = newValue; let startValue = getValue(values, 0); let endValue = getValue(values, 1); - const { generateConfig, locale, picker, order, onCalendarChange, allowEmpty, onChange } = - props; + const { + generateConfig, + locale, + picker, + order, + onCalendarChange, + allowEmpty, + onChange, + showTime, + } = props; // >>>>> Format start & end values if (startValue && endValue && generateConfig.isAfter(startValue, endValue)) { @@ -436,7 +444,9 @@ function RangerPicker() { (picker !== 'week' && picker !== 'quarter' && picker !== 'time' && - !isSameDate(generateConfig, startValue, endValue)) + !(showTime + ? isEqual(generateConfig, startValue, endValue) + : isSameDate(generateConfig, startValue, endValue))) ) { // Clean up end date when start date is after end date if (sourceIndex === 0) {