From 3fe00b95ff8c42130d513c9b322220eff58ff171 Mon Sep 17 00:00:00 2001 From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com> Date: Fri, 2 Jan 2026 17:40:29 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20getISOWeek?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/service/sandbox/runtime.ts | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/app/service/sandbox/runtime.ts b/src/app/service/sandbox/runtime.ts index cbf02fad4..ea0b5f331 100644 --- a/src/app/service/sandbox/runtime.ts +++ b/src/app/service/sandbox/runtime.ts @@ -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: } @@ -271,14 +271,23 @@ 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 { + const d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate())); // remove the time + // Set to nearest Thursday: current date + 4 - current day number (Monday = 1) + d.setUTCDate(d.getUTCDate() + 4 - (d.getUTCDay() || 7)); + // Get first day of year + const yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1)); + // Calculate full weeks to nearest Thursday + return Math.ceil(((d.getTime() - yearStart.getTime()) / 86400000 + 1) / 7); } // 停止计时器 From 8b73d5a26afa5b4189f9a628aa2a97d03febe298 Mon Sep 17 00:00:00 2001 From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com> Date: Fri, 2 Jan 2026 19:36:19 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=AD=E6=96=87=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/service/sandbox/runtime.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/service/sandbox/runtime.ts b/src/app/service/sandbox/runtime.ts index ea0b5f331..a62711437 100644 --- a/src/app/service/sandbox/runtime.ts +++ b/src/app/service/sandbox/runtime.ts @@ -281,12 +281,18 @@ export class Runtime { // 2009 年第 53 周： 2009/12/28 (Mon) - 2010/01/03 (Sun) // 2010 年第 52 周： 2010/12/27 (Mon) - 2011/01/02 (Sun) getISOWeek(date: Date): number { - const d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate())); // remove the time - // Set to nearest Thursday: current date + 4 - current day number (Monday = 1) + // 使用传入日期的年月日创建 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)); - // Get first day of year + + // 获取该星期四所在年份的第一天（UTC） const yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1)); - // Calculate full weeks to nearest Thursday + + // 计算从年初到该星期四的天数差 + // 再换算为周数，并向上取整，得到 ISO 周数 return Math.ceil(((d.getTime() - yearStart.getTime()) / 86400000 + 1) / 7); }