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

fix(Calendar): range type defaultDate when set allowSameDay (#10971)

Browse Source
This commit is contained in:
chenyunjie 2022-08-27 11:15:46 +08:00 committed by GitHub
parent da3400435f
commit 35f81fb208
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/vant/src/calendar/Calendar.tsx
View File

@ -134,7 +134,7 @@ export default defineComponent({
}; };
const getInitialDate = (defaultDate = props.defaultDate) => { const getInitialDate = (defaultDate = props.defaultDate) => {
const { type, minDate, maxDate } = props; const { type, minDate, maxDate, allowSameDay } = props;
if (defaultDate === null) { if (defaultDate === null) {
return defaultDate; return defaultDate;
@ -151,7 +151,10 @@ export default defineComponent({
minDate, minDate,
getPrevDay(maxDate) getPrevDay(maxDate)
); );
const end = limitDateRange(defaultDate[1] || now, getNextDay(minDate)); const end = limitDateRange(
defaultDate[1] || now,
allowSameDay ? minDate : getNextDay(minDate)
);
return [start, end]; return [start, end];
} }