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

fix: datePicker support empty, close #6510

pull/6758/head
tangjinzhou 2023-04-27 22:39:23 +08:00
parent 80fbabc66f
commit 858169aee3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,7 +315,11 @@ function RangerPicker<DateType>() {
// Fill disabled unit // Fill disabled unit
for (let i = 0; i < 2; i += 1) { for (let i = 0; i < 2; i += 1) {
if (mergedDisabled.value[i] && !getValue(postValues, i) && !getValue(props.allowEmpty, i)) { if (
mergedDisabled.value[i] &&
!getValue(postValues, i) &&
!getValue(props.allowEmpty, i)
) {
postValues = updateValues(postValues, props.generateConfig.getNow(), i); postValues = updateValues(postValues, props.generateConfig.getNow(), i);
} }
} }

1
components/vc-picker/generate/dayjs.ts
View File

@ -123,6 +123,7 @@ function findTargetStr(val: string, index: number, segmentation: string) {
} }
const toDateWithValueFormat = (val: string | Dayjs, valueFormat: string) => { const toDateWithValueFormat = (val: string | Dayjs, valueFormat: string) => {
if (!val) return null;
if (dayjs.isDayjs(val)) { if (dayjs.isDayjs(val)) {
return val; return val;
} }