github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: rangePicker showTime disabled not work, close #5286 #5380

pull/5387/head
tangjinzhou 2022-03-23 11:04:12 +08:00
parent 5724c84fe7
commit ecab7f66d8
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/vc-picker/RangePicker.tsx
View File

@ -421,8 +421,16 @@ function RangerPicker<DateType>() {
let values = newValue; let values = newValue;
let startValue = getValue(values, 0); let startValue = getValue(values, 0);
let endValue = getValue(values, 1); let endValue = getValue(values, 1);
const { generateConfig, locale, picker, order, onCalendarChange, allowEmpty, onChange } = const {
props; generateConfig,
locale,
picker,
order,
onCalendarChange,
allowEmpty,
onChange,
showTime,
} = props;
// >>>>> Format start & end values // >>>>> Format start & end values
if (startValue && endValue && generateConfig.isAfter(startValue, endValue)) { if (startValue && endValue && generateConfig.isAfter(startValue, endValue)) {
@ -436,7 +444,9 @@ function RangerPicker<DateType>() {
(picker !== 'week' && (picker !== 'week' &&
picker !== 'quarter' && picker !== 'quarter' &&
picker !== 'time' && 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 // Clean up end date when start date is after end date
if (sourceIndex === 0) { if (sourceIndex === 0) {