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

fix(Calendar): incorrect initial date #7412

Browse Source
This commit is contained in:
chenjiahan 2020-11-08 17:28:19 +08:00
parent f85ebfb222
commit ffa671791f
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/calendar/index.js
View File

@ -118,6 +118,20 @@ export default createComponent({
emits: ['select', 'confirm', 'unselect', 'month-show', 'update:show'],
setup(props, { emit, slots }) {
const limitDateRange = (
date,
minDate = props.minDate,
maxDate = props.maxDate
) => {
if (compareDay(date, minDate) === -1) {
return minDate;
}
if (compareDay(date, maxDate) === 1) {
return maxDate;
}
return date;
};
const getInitialDate = (defaultDate = props.defaultDate) => {
const { type, minDate, maxDate } = props;
@ -125,26 +139,32 @@ export default createComponent({
return defaultDate;
}
let defaultVal = new Date();
if (compareDay(defaultVal, minDate) === -1) {
defaultVal = minDate;
} else if (compareDay(defaultVal, maxDate) === 1) {
defaultVal = type === 'range' ? getPrevDay(maxDate) : maxDate;
}
const defaultIsArray = Array.isArray(defaultDate);
const now = new Date();
if (type === 'range') {
const [startDay, endDay] = defaultIsArray ? defaultDate : [];
return [startDay || defaultVal, endDay || getNextDay(defaultVal)];
if (!Array.isArray(defaultDate)) {
defaultDate = [];
}
const start = limitDateRange(
defaultDate[0] || now,
minDate,
getPrevDay(maxDate)
);
const end = limitDateRange(defaultDate[1] || now, getNextDay(minDate));
return [start, end];
}
if (type === 'multiple') {
return defaultIsArray ? defaultDate : [defaultVal];
if (Array.isArray(defaultDate)) {
return defaultDate.map((date) => limitDateRange(date));
}
return [limitDateRange(now)];
}
return defaultIsArray ? defaultVal : defaultDate;
if (!defaultDate || Array.isArray(defaultDate)) {
defaultDate = now;
}
return limitDateRange(defaultDate);
};
let bodyHeight;