Skip to content

fix(calendar): fix calendar range issues #3759

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

Merged
merged 3 commits into from
Nov 6, 2025
Merged

fix(calendar): fix calendar range issues #3759

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
851e61b
fix(calendar): 修复了当设定日历的range值为同一年内时，终止月份之后的月份选项没有正常禁用的问题
shumuuu Nov 1, 2025
485dc44
fix(calendar): 修正了错误使用的rangeFromTo
shumuuu Nov 1, 2025
991a36f
fix(calendar): 修复了年份选项错误地使用了月份选项禁用范围判定逻辑的问题
shumuuu Nov 1, 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: 10 additions & 5 deletions src/calendar/calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,10 @@ export default mixins(getConfigReceiverMixins<Vue, CalendarConfig>('calendar')).
}

for (let i = begin; i <= end; i++) {
const disabled = this.checkMonthAndYearSelectorDisabled(i, this.curSelectedMonth);
re.push({
value: i,
label: this.t(this.global.yearSelection, { year: i }),
disabled,
disabled: false,
});
}
return re;
Expand Down Expand Up @@ -535,13 +534,19 @@ export default mixins(getConfigReceiverMixins<Vue, CalendarConfig>('calendar')).
checkMonthAndYearSelectorDisabled(year: number, month: number): boolean {
let disabled = false;
if (this.rangeFromTo && this.rangeFromTo.from && this.rangeFromTo.to) {
// 读取起止年份
const beginYear = dayjs(this.rangeFromTo.from).year();
const endYear = dayjs(this.rangeFromTo.to).year();
if (year === beginYear) {
const beginMon = parseInt(dayjs(this.rangeFromTo.from).format('M'), 10);
// 读取起止月份
const beginMon = parseInt(dayjs(this.rangeFromTo.from).format('M'), 10);
const endMon = parseInt(dayjs(this.rangeFromTo.to).format('M'), 10);

if (beginYear === endYear) {
// 同一年内，禁用开始月份至结束月份之外的月份选项
disabled = month < beginMon || month > endMon;
} else if (year === beginYear) {
disabled = month < beginMon;
} else if (year === endYear) {
const endMon = parseInt(dayjs(this.rangeFromTo.to).format('M'), 10);
disabled = month > endMon;
}
}
Expand Down
Loading