Skip to content

fix(calendar): fix calendar range issues #3938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

fix(calendar): fix calendar range issues #3938

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eed44a7
fix(calendar): 修复了当设定日历的range值为同一年内时，终止月份之后的月份选项没有正常禁用的问题
shumuuu Nov 1, 2025
b225261
Merge branch 'Tencent:develop' into fix/calendar
shumuuu Nov 2, 2025
72e931d
fix(calendar): 修正错误使用的rangeFromTo
shumuuu Nov 2, 2025
e828309
fix(calendar): 解决no-else-return报错问题
shumuuu Nov 2, 2025
93ec3d6
fix(calendar): 修复了年份选项错误地使用了月份选项禁用范围判定逻辑的问题
shumuuu Nov 2, 2025
5d9d073
fix(calendar): 移除钩子中多余的month
shumuuu Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions packages/components/calendar/Calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,21 @@ const Calendar = forwardRef<CalendarMethods, CalendarProps>((props, ref) => {
const isRangeValid = rangeFromTo && rangeFromTo.from && rangeFromTo.to;
const checkMonthSelectorDisabled = (yearIn: number, monthIn: number): boolean => {
if (isRangeValid) {
// 读取起止年份
const beginYear = dayjs(rangeFromTo.from).year();
const endYear = dayjs(rangeFromTo.to).year();
// 读取起止月份
const beginMon = parseInt(dayjs(rangeFromTo.from).format('M'), 10);
const endMon = parseInt(dayjs(rangeFromTo.to).format('M'), 10);

if (beginYear === endYear) {
// 同一年内，禁用开始月份至结束月份之外的月份选项
return monthIn < beginMon || monthIn > endMon;
}
if (yearIn === beginYear) {
const beginMon = parseInt(dayjs(rangeFromTo.from).format('M'), 10);
return monthIn < beginMon;
}
if (yearIn === endYear) {
const endMon = parseInt(dayjs(rangeFromTo.to).format('M'), 10);
return monthIn > endMon;
}
}
Expand All @@ -214,7 +221,7 @@ const Calendar = forwardRef<CalendarMethods, CalendarProps>((props, ref) => {
for (let i = yearBegin; i <= yearEnd; i++) {
yearList.push({
value: i,
disabled: checkMonthSelectorDisabled(i, month),
disabled: false,
});
}
// 月列表
Expand All @@ -225,7 +232,7 @@ const Calendar = forwardRef<CalendarMethods, CalendarProps>((props, ref) => {
});
}
return [yearList, monthList];
}, [rangeFromTo, year, month]);
}, [rangeFromTo, year]);

// mode为 'month' 时，构造日历列表
const dateList = useMemo<CalendarCell[][]>(
Expand Down
Loading