Skip to content

修正 getISOWeek #1124

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

Closed
cyfung1031 wants to merge 2 commits into from
Closed

修正 getISOWeek #1124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fe00b9
修正 getISOWeek
cyfung1031 Jan 2, 2026
8b73d5a
中文注释
cyfung1031 Jan 2, 2026
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
33 changes: 24 additions & 9 deletions src/app/service/sandbox/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ export class Runtime {
flag = last.getMonth() !== now.getMonth();
break;
case 5: // 每周
flag = this.getWeek(last) !== this.getWeek(now);
flag = this.getISOWeek(last) !== this.getISOWeek(now);
break;
default:
}
Expand All @@ -271,14 +271,29 @@ export class Runtime {
}

// 获取本周是第几周
getWeek(date: Date) {
const nowDate = new Date(date);
const firstDay = new Date(date);
firstDay.setMonth(0); // 设置1月
firstDay.setDate(1); // 设置1号
const diffDays = Math.ceil((nowDate.getTime() - firstDay.getTime()) / (24 * 60 * 60 * 1000));
const week = Math.ceil(diffDays / 7);
return week === 0 ? 1 : week;
// 遵循 ISO 8601, 一月四日为Week 1，星期一为新一周
// 见 https://en.wikipedia.org/wiki/ISO_week_date
// 2004 年第 53 周： 2004/12/27 (Mon) - 2005/01/02 (Sun)
// 2005 年第 52 周： 2005/12/26 (Mon) - 2006/01/01 (Sun)
// 2006 年第 52 周： 2006/12/25 (Mon) - 2006/12/31 (Sun)
// 2007 年第 52 周： 2007/12/24 (Mon) - 2007/12/30 (Sun)
// 2008 年第 52 周： 2008/12/22 (Mon) - 2008/12/28 (Sun)
// 2009 年第 53 周： 2009/12/28 (Mon) - 2010/01/03 (Sun)
// 2010 年第 52 周： 2010/12/27 (Mon) - 2011/01/02 (Sun)
getISOWeek(date: Date): number {
// 使用传入日期的年月日创建 UTC 日期对象，忽略本地时间部分，避免时区影响
const d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));

// 将日期调整到本周的星期四（ISO 8601 规定：周数以星期四所在周为准）
// 计算方式：当前日期 + 4 − 当前星期几（星期一 = 1，星期日 = 7）
d.setUTCDate(d.getUTCDate() + 4 - (d.getUTCDay() || 7));

// 获取该星期四所在年份的第一天（UTC）
const yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1));

// 计算从年初到该星期四的天数差
// 再换算为周数，并向上取整，得到 ISO 周数
return Math.ceil(((d.getTime() - yearStart.getTime()) / 86400000 + 1) / 7);
}

// 停止计时器
Expand Down
Loading