Skip to content

fix(DateTimePicker): 修复在 showWeek 模式下日列表未正确排除 start、end、且 steps 步长不生效的 Bug #3861

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 2 commits into from
Aug 25, 2025
Merged

fix(DateTimePicker): 修复在 showWeek 模式下日列表未正确排除 start、end、且 steps 步长不生效的 Bug #3861

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65b0421
fix(DateTimePicker): 修复在 showWeek 模式下日列表未正确排除 start 和 end 的 Bug
composable-tu Aug 19, 2025
8ae177e
refactor(date-time-picker): 优化日期周显示逻辑，使用统一边界和步长控制
composable-tu Aug 22, 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
19 changes: 10 additions & 9 deletions src/date-time-picker/date-time-picker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,20 @@ export default class DateTimePicker extends SuperComponent {
});
},

getDaysOfWeekInMonth(date: Dayjs): Array<{ value: string; label: string }> {
const { locale, dayjsLocale } = this.data;
getDaysOfWeekInMonth(date: Dayjs, type: string): Array<{ value: string; label: string }> {
const { locale, steps, dayjsLocale } = this.data;
const startOfMonth = date.startOf('month');
const endOfMonth = date.endOf('month');
const minEdge = this.getOptionEdge('min', type);
const maxEdge = this.getOptionEdge('max', type);
const step = steps?.[type] ?? 1;
const daysOfWeek = [];

for (let i = 0; i <= endOfMonth.diff(startOfMonth, 'days'); i += 1) {
const currentDate = startOfMonth.add(i, 'days').locale(dayjsLocale);
for (let i = minEdge; i <= maxEdge; i += step) {
const currentDate = startOfMonth.date(i).locale(dayjsLocale);
const dayName = currentDate.format('ddd');

daysOfWeek.push({
value: `${i + 1}`,
label: `${i + 1}${locale.date || ''} ${dayName}`,
value: `${i}`,
label: `${i}${locale.date || ''} ${dayName}`,
});
}

Expand Down Expand Up @@ -217,7 +218,7 @@ export default class DateTimePicker extends SuperComponent {
const dayjsMonthsShort = dayjs().locale(this.data.dayjsLocale).localeData().monthsShort();

if (type === 'date' && showWeek) {
return this.getDaysOfWeekInMonth(this.date);
return this.getDaysOfWeekInMonth(this.date, type);
}

for (let i = minEdge; i <= maxEdge; i += step) {
Expand Down