blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-05 05:42:44 +08:00
Code Issues Projects Releases Wiki Activity

fix(DatePicker): min-date prop not work correctly (#10985)

Browse Source
This commit is contained in:
neverland 2022-08-28 17:11:04 +08:00 committed by GitHub
parent 05544c109f
commit a677bee2b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
packages/vant/src/date-picker/DatePicker.tsx
View File

@ -65,7 +65,10 @@ export default defineComponent({
);
};
const isMinYear = (year: number) => year === props.minDate.getFullYear();
const isMaxYear = (year: number) => year === props.maxDate.getFullYear();
const isMinMonth = (month: number) =>
month === props.minDate.getMonth() + 1;
const isMaxMonth = (month: number) =>
month === props.maxDate.getMonth() + 1;
@ -88,28 +91,30 @@ export default defineComponent({
};
const genMonthOptions = () => {
if (isMaxYear(getValue('year'))) {
return genOptions(
1,
props.maxDate.getMonth() + 1,
'month',
props.formatter,
props.filter
);
}
return genOptions(1, 12, 'month', props.formatter, props.filter);
const year = getValue('year');
const minMonth = isMinYear(year) ? props.minDate.getMonth() + 1 : 1;
const maxMonth = isMaxYear(year) ? props.maxDate.getMonth() + 1 : 12;
return genOptions(
minMonth,
maxMonth,
'month',
props.formatter,
props.filter
);
};
const genDayOptions = () => {
const year = getValue('year');
const month = getValue('month');
const minDate =
isMinYear(year) && isMinMonth(month) ? props.minDate.getDate() : 1;
const maxDate =
isMaxYear(year) && isMaxMonth(month)
? props.maxDate.getDate()
: getMonthEndDay(year, month);
let maxDate = getMonthEndDay(year, month);
if (isMaxYear(year) && isMaxMonth(month)) {
maxDate = props.maxDate.getDate();
}
return genOptions(1, maxDate, 'day', props.formatter, props.filter);
return genOptions(minDate, maxDate, 'day', props.formatter, props.filter);
};
const columns = computed(() =>