ui/vant
1
0
Fork 0
mirror of https://github.com/youzan/vant.git synced 2025-10-17 08:37:23 +00:00
Code Issues Actions 2 Packages 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
1 changed files with 5 additions and 2 deletions
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 { type, minDate, maxDate } = props;
const { type, minDate, maxDate, allowSameDay } = props;
if (defaultDate === null) {
return defaultDate;
@@ -151,7 +151,10 @@ export default defineComponent({
minDate,
getPrevDay(maxDate)
);
const end = limitDateRange(defaultDate[1] || now, getNextDay(minDate));
const end = limitDateRange(
defaultDate[1] || now,
allowSameDay ? minDate : getNextDay(minDate)
);
return [start, end];
}