@morehao/dsh-github-trending 0.4.3 → 0.4.4

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [v0.4.4] - 2026-10-31
+
+### 变更
+
+- **概览榜单支持日/周/月三周期切换**：概览页「最近榜单」区块此前只展示日榜，现在按日榜 / 周榜 / 月榜分段展示，每个周期各自显示最近若干期，点格子可直接跳到榜单页对应期数；分段按钮上显示各周期期数。仅在调度启用多个周期时出现分段控件。
+- **精简空日期展示**：不再把没有记录的日期逐个铺成「无记录」卡片，只渲染真正有记录的期数；完全无记录时显示空状态提示。今天尚未运行且调度开启时，日榜末尾保留一个「等待 {时间}」状态位。
+
+### 修复
+
+- **时间格式统一为 24 小时制**：`localTime` / `shortTime` / 下次运行时间等展示改用 `hourCycle: 'h23'`，避免不同环境下出现 12 小时制与 24 小时制混用。
+
 ## [v0.4.3] - 2026-10-31
 
 ### 变更

package/client.js

@@ -280,9 +280,10 @@ var DICT = {
     "overview.ready.repo": "仓库",
     "overview.ready.github": "GitHub",
     "overview.ready.view": "查看",
-    "overview.week.title": "最近 7 天（日榜）",
+    "overview.week.title": "最近榜单",
     "overview.week.all": "全部运行记录",
-    "overview.week.none": "无记录",
+    "overview.week.empty": "还没有运行记录",
+    "overview.week.selectPeriod": "选择榜单周期",
     "overview.week.wait": "等待 {time}",
     "overview.live.title": "正在运行",
     "overview.live.core": "核心执行中",
@@ -607,9 +608,10 @@ var DICT = {
     "overview.ready.repo": "Repository",
     "overview.ready.github": "GitHub",
     "overview.ready.view": "View",
-    "overview.week.title": "Last 7 days (daily)",
+    "overview.week.title": "Recent leaderboards",
     "overview.week.all": "All runs",
-    "overview.week.none": "No record",
+    "overview.week.empty": "No runs yet",
+    "overview.week.selectPeriod": "Choose leaderboard period",
     "overview.week.wait": "Waiting for {time}",
     "overview.live.title": "Running",
     "overview.live.core": "Core is working",
@@ -970,7 +972,7 @@ var CSS = `
 .dshgt-md a:hover{text-decoration:underline;}
 
 /* ——— 周期标签 / 分段 ——— */
-.dshgt-pchip{display:inline-flex;align-items:center;height:20px;padding:0 8px;border-radius:999px;font-size:11px;font-weight:600;line-height:18px;white-space:nowrap;border:1px solid var(--gt-border);color:var(--gt-muted);background:var(--gt-bg);}
+.dshgt-pchip{display:inline-flex;align-items:center;justify-content:center;height:20px;padding:0 8px;border-radius:999px;font-size:11px;font-weight:600;line-height:18px;white-space:nowrap;border:1px solid var(--gt-border);color:var(--gt-muted);background:var(--gt-bg);}
 .dshgt-pchip.daily{color:var(--gt-accent);border-color:color-mix(in srgb,var(--gt-accent) 35%,var(--gt-border));background:color-mix(in srgb,var(--gt-accent) 9%,var(--gt-bg));}
 .dshgt-pchip.weekly{color:#7c3aed;border-color:#ddd6fe;background:#f5f3ff;}
 .dshgt-pchip.monthly{color:#0f766e;border-color:#99f6e4;background:#f0fdfa;}
@@ -980,6 +982,8 @@ var CSS = `
 .dshgt-period-seg button.on{background:var(--gt-bg);color:var(--gt-fg);font-weight:600;box-shadow:0 1px 2px rgba(15,23,42,.08);}
 .dshgt-period-count{font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:11px;color:var(--gt-muted);background:color-mix(in srgb,var(--gt-fg) 6%,var(--gt-bg));border-radius:999px;padding:0 6px;line-height:16px;}
 .dshgt-period-seg button.on .dshgt-period-count{color:var(--gt-accent);background:color-mix(in srgb,var(--gt-accent) 12%,var(--gt-bg));}
+.dshgt-overview-seg{margin-bottom:8px;}
+.dshgt-overview-empty{padding:14px 2px;}
 
 /* ——— 运行记录 ——— */
 .dshgt-runs-head{display:flex;align-items:center;gap:10px;flex-wrap:wrap;}
@@ -1202,7 +1206,15 @@ function localTime(iso) {
   if (iso === null || iso === void 0) return "—";
   const date = new Date(iso);
   if (Number.isNaN(date.getTime())) return "—";
-  return date.toLocaleString();
+  return date.toLocaleString(void 0, {
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hourCycle: "h23"
+  });
 }
 async function copyText(value) {
   try {
@@ -1217,7 +1229,13 @@ function shortTime(iso) {
   if (iso === null || iso === void 0) return "—";
   const date = new Date(iso);
   if (Number.isNaN(date.getTime())) return "—";
-  return date.toLocaleString(void 0, { month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit" });
+  return date.toLocaleString(void 0, {
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    hourCycle: "h23"
+  });
 }
 
 // client/api.ts
@@ -2188,38 +2206,6 @@ function digestTarget(record, timeZone) {
   const period = recordPeriod(record);
   return { period, bucket: periodBucket(period, info.date) };
 }
-function buildDigestDates(records, options) {
-  const now = options.now ?? /* @__PURE__ */ new Date();
-  const today = zonedDateString(now, options.timeZone);
-  const earliest = addDays(today, -(DIGEST_WINDOW_DAYS - 1));
-  const groups = /* @__PURE__ */ new Map();
-  for (const record of records) {
-    if (recordPeriod(record) !== "daily") continue;
-    const info = recordDate(record, options.timeZone);
-    if (info === void 0) continue;
-    if (info.date < earliest || info.date > today) continue;
-    const group = groups.get(info.date);
-    if (group === void 0) groups.set(info.date, { records: [record], derivedFromAt: info.derivedFromAt });
-    else {
-      group.records.push(record);
-      group.derivedFromAt = group.derivedFromAt || info.derivedFromAt;
-    }
-  }
-  const days = [];
-  for (const [date, group] of groups) {
-    const sorted = [...group.records].sort((a, b) => b.at.localeCompare(a.at));
-    const preferred = sorted.find(
-      (record2) => record2.preview !== void 0 && record2.ok && record2.kind !== "dry-run" && !record2.skipped
-    );
-    const record = preferred ?? sorted[0];
-    if (record === void 0) continue;
-    const info = recordDate(record, options.timeZone);
-    const legacy = record.legacy === true || info?.derivedFromAt === true || group.derivedFromAt;
-    days.push({ date, record, status: digestStatus(record), legacy });
-  }
-  days.sort((a, b) => b.date.localeCompare(a.date));
-  return days;
-}
 function buildPeriodGroups(records, options) {
   const now = options.now ?? /* @__PURE__ */ new Date();
   const today = zonedDateString(now, options.timeZone);
@@ -2265,11 +2251,6 @@ function buildPeriodGroups(records, options) {
     return { period, days, previewCount: days.filter((day) => day.status === "preview").length };
   });
 }
-function recentDates(today, count) {
-  const dates = [];
-  for (let offset = count - 1; offset >= 0; offset -= 1) dates.push(addDays(today, -offset));
-  return dates;
-}
 function formatDayLabel(date, lang) {
   let weekday = "";
   try {
@@ -2369,6 +2350,7 @@ function readyRows(t, state) {
 function OverviewView(props) {
   const { t, lang, store, controller } = props;
   const state = store.state;
+  const [activePeriod, setActivePeriod] = import_react.default.useState("daily");
   if (state === null) {
     return h("div", { className: "dshgt-empty" }, store.error ?? t("quickfill.loading"));
   }
@@ -2378,9 +2360,15 @@ function OverviewView(props) {
   const readyCount = rows.filter((row) => row.ok).length;
   const timeZone = state.schedule.timezone;
   const today = zonedDateString(/* @__PURE__ */ new Date(), timeZone);
-  const days = buildDigestDates(state.status.history, { timeZone });
-  const byDate = new Map(days.map((day) => [day.date, day]));
-  const week = recentDates(today, 7);
+  const groups = buildPeriodGroups(state.status.history, { timeZone });
+  const groupMap = new Map(groups.map((group) => [group.period, group]));
+  const enabledPeriods = PERIODS.filter((period2) => state.schedule.periods.includes(period2));
+  const periods = enabledPeriods.length > 0 ? enabledPeriods : PERIODS;
+  const period = periods.includes(activePeriod) ? activePeriod : periods[0] ?? "daily";
+  const activeDays = groupMap.get(period)?.days ?? [];
+  const recent = period === "daily" ? activeDays.slice(0, 7) : activeDays;
+  const todayHasDaily = groupMap.get("daily")?.days.some((day) => day.date === today) ?? false;
+  const showWaiting = period === "daily" && !todayHasDaily && state.schedule.enabled;
   const lastTarget = last === null ? void 0 : digestTarget(last, timeZone);
   return h(
     "div",
@@ -2492,42 +2480,59 @@ function OverviewView(props) {
         t("overview.week.title"),
         h("button", { type: "button", className: "dshgt-linkbtn dshgt-section-tail", onClick: props.onOpenRuns }, t("overview.week.all"))
       ),
-      h(
+      periods.length > 1 ? h(
         "div",
-        { className: "dshgt-week" },
-        week.map((date) => {
-          const day = byDate.get(date);
-          if (day === void 0) {
-            const waiting = date === today && state.schedule.enabled;
-            return h(
-              "div",
-              { className: "dshgt-day", key: date },
-              h("div", { className: "dshgt-day-date" }, date.slice(5).replace("-", "/")),
-              h("div", { className: "dshgt-day-status" }, waiting ? t("overview.week.wait", { time: state.schedule.time }) : t("overview.week.none"))
-            );
-          }
+        { className: "dshgt-period-seg dshgt-overview-seg", role: "tablist", "aria-label": t("overview.week.selectPeriod") },
+        periods.map((item) => {
+          const on = item === period;
+          const count = groupMap.get(item)?.days.length ?? 0;
           return h(
             "button",
             {
+              key: item,
               type: "button",
-              className: "dshgt-day dshgt-day-clickable",
-              key: date,
-              onClick: () => props.onOpenDigest({ period: "daily", bucket: date }),
-              title: day.record.errorCode === void 0 ? formatDayLabel(date, lang) : `${formatDayLabel(date, lang)} · ${day.record.errorCode}`
+              role: "tab",
+              "aria-selected": on ? "true" : "false",
+              className: on ? "on" : "",
+              onClick: () => setActivePeriod(item)
             },
-            h("div", { className: "dshgt-day-date" }, date.slice(5).replace("-", "/")),
-            h(
-              "div",
-              { className: "dshgt-day-status" },
-              h("span", { className: `dshgt-lamp ${STATUS_LAMP[day.status]}` }),
-              dayLabel(t, day)
-            )
+            h("span", null, t(`period.${item}`)),
+            h("span", { className: "dshgt-period-count" }, String(count))
           );
         })
+      ) : null,
+      recent.length === 0 && !showWaiting ? h("div", { className: "dshgt-hint dshgt-overview-empty" }, t("overview.week.empty")) : h(
+        "div",
+        { className: "dshgt-week" },
+        recent.map(
+          (day) => h(
+            "button",
+            {
+              type: "button",
+              className: "dshgt-day dshgt-day-clickable",
+              key: day.bucket,
+              onClick: () => props.onOpenDigest({ period, bucket: day.bucket }),
+              title: day.record.errorCode === void 0 ? formatBucketLabel(period, day.bucket, lang) : `${formatBucketLabel(period, day.bucket, lang)} · ${day.record.errorCode}`
+            },
+            h("div", { className: "dshgt-day-date" }, shortBucket(period, day.bucket)),
+            h("div", { className: "dshgt-day-status" }, h("span", { className: `dshgt-lamp ${STATUS_LAMP[day.status]}` }), dayLabel(t, day))
+          )
+        ),
+        showWaiting ? h(
+          "div",
+          { className: "dshgt-day" },
+          h("div", { className: "dshgt-day-date" }, today.slice(5).replace("-", "/")),
+          h("div", { className: "dshgt-day-status" }, t("overview.week.wait", { time: state.schedule.time }))
+        ) : null
       )
     )
   );
 }
+function shortBucket(period, bucket) {
+  if (period === "daily") return bucket.slice(5).replace("-", "/");
+  if (period === "weekly") return bucket.slice(5);
+  return bucket.slice(2).replace("-", "/");
+}
 
 // client/runs.ts
 var FILTERS = [
@@ -3892,7 +3897,13 @@ function nextRunText(iso) {
   if (iso === void 0) return "—";
   const date = new Date(iso);
   if (Number.isNaN(date.getTime())) return "—";
-  return date.toLocaleString(void 0, { month: "numeric", day: "numeric", hour: "2-digit", minute: "2-digit" });
+  return date.toLocaleString(void 0, {
+    month: "numeric",
+    day: "numeric",
+    hour: "2-digit",
+    minute: "2-digit",
+    hourCycle: "h23"
+  });
 }
 function apply(ctx) {
   const slots = ctx.get?.("slots");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morehao/dsh-github-trending",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "GitHub 趋势日报插件：每天定时 spawn 本地 trendradar 核心，抓取 Trending、生成中文简介与总结，提交到你的仓库并自动合并 PR。",
   "type": "module",
   "main": "lib/index.js",