tt-help-cli-ycl 1.4.140 → 1.4.144

package/src/watch/public/app.js

@@ -683,7 +683,7 @@ function closeAddModal() {
 
 // ========== 国家修改模态框 ==========
 
-const TARGET_LOCATIONS = [
+const DEFAULT_LOCATION_OPTIONS = [
   "AT",
   "BE",
   "CZ",
@@ -697,19 +697,35 @@ const TARGET_LOCATIONS = [
   "NL",
   "PL",
   "PT",
+  "TH",
+  "US",
 ];
+let locationOptions = [...DEFAULT_LOCATION_OPTIONS];
 
-function openLocationModal(uniqueId, currentLocation) {
+async function openLocationModal(uniqueId, currentLocation) {
   let overlay = document.getElementById("locationModalOverlay");
   if (overlay) return;
+  // 优先使用服务端配置的目标国家作为候选，失败则回退默认
+  try {
+    const res = await fetch("/api/settings/target-locations");
+    const data = await res.json();
+    const locs = (data.locations || []).filter(Boolean);
+    if (locs.length) {
+      locationOptions = [...new Set([...locs, ...DEFAULT_LOCATION_OPTIONS])];
+    }
+  } catch {
+    locationOptions = [...DEFAULT_LOCATION_OPTIONS];
+  }
   overlay = document.createElement("div");
   overlay.id = "locationModalOverlay";
   overlay.className = "modal-overlay";
   const safeId = escapeJsString(uniqueId);
-  const options = TARGET_LOCATIONS.map(
-    (loc) =>
-      `<button class="loc-option ${loc === currentLocation ? "active" : ""}" onclick="selectLocation('${safeId}','${loc}')">${loc}</button>`,
-  ).join("");
+  const options = locationOptions
+    .map(
+      (loc) =>
+        `<button class="loc-option ${loc === currentLocation ? "active" : ""}" onclick="selectLocation('${safeId}','${loc}')">${loc}</button>`,
+    )
+    .join("");
   overlay.innerHTML = `
     <div class="modal" style="max-width:420px">
       <h3>修改用户国家</h3>
@@ -1392,6 +1408,157 @@ function showSettingsPage() {
   hideAllPages();
   document.getElementById("settingsPage").classList.add("active");
   fetchLlmConfig();
+  loadTargetLocations();
+}
+
+// ========== 目标国家配置（通用 app-config，落盘 ~/.tt-help-config.json） ==========
+
+const AVAILABLE_COUNTRIES = [
+  "AT",
+  "BE",
+  "CZ",
+  "DE",
+  "ES",
+  "FR",
+  "GR",
+  "HU",
+  "IE",
+  "IT",
+  "NL",
+  "PL",
+  "PT",
+  "TH",
+  "US",
+  "GB",
+  "SE",
+  "NO",
+  "FI",
+  "DK",
+  "RO",
+  "BG",
+  "CH",
+  "SK",
+  "SI",
+  "HR",
+  "RS",
+  "UA",
+  "TR",
+  "MX",
+  "BR",
+  "AR",
+  "CL",
+  "CO",
+];
+
+function normalizeCountryInput(str) {
+  return [
+    ...new Set(
+      String(str || "")
+        .split(",")
+        .map((s) => s.trim().toUpperCase())
+        .filter(Boolean),
+    ),
+  ];
+}
+
+async function loadTargetLocations() {
+  const input = document.getElementById("targetLocationsInput");
+  const status = document.getElementById("targetLocationsStatus");
+  if (!input) return;
+  try {
+    const res = await fetch("/api/settings/target-locations");
+    const data = await res.json();
+    const locations = data.locations || [];
+    input.value = locations.join(",");
+    renderTargetCountryGrid(locations);
+    if (status) {
+      status.textContent = `当前 ${locations.length} 个国家: ${locations.join(", ")}`;
+      status.className = "settings-status ok";
+    }
+  } catch (e) {
+    console.error("loadTargetLocations error:", e);
+    if (status) {
+      status.textContent = "读取目标国家失败";
+      status.className = "settings-status warn";
+    }
+  }
+}
+
+function renderTargetCountryGrid(selected) {
+  const grid = document.getElementById("targetCountryGrid");
+  if (!grid) return;
+  const selectedSet = new Set(selected || []);
+  grid.innerHTML = AVAILABLE_COUNTRIES.map(
+    (loc) =>
+      `<button type="button" class="loc-option ${selectedSet.has(loc) ? "active" : ""}" onclick="toggleTargetCountry('${loc}')">${loc}</button>`,
+  ).join("");
+}
+
+function toggleTargetCountry(loc) {
+  const input = document.getElementById("targetLocationsInput");
+  if (!input) return;
+  let current = normalizeCountryInput(input.value);
+  if (current.includes(loc)) {
+    current = current.filter((l) => l !== loc);
+  } else {
+    current.push(loc);
+  }
+  input.value = current.join(",");
+  renderTargetCountryGrid(current);
+}
+
+async function saveTargetLocations() {
+  const input = document.getElementById("targetLocationsInput");
+  const status = document.getElementById("targetLocationsStatus");
+  if (!input) return;
+  const locations = normalizeCountryInput(input.value);
+  status.textContent = "保存中...";
+  status.className = "settings-status loading";
+  try {
+    const res = await fetch("/api/settings/target-locations", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ locations }),
+    });
+    const data = await res.json();
+    input.value = (data.locations || []).join(",");
+    renderTargetCountryGrid(data.locations || []);
+    status.textContent = `已保存 ${(data.locations || []).length} 个国家`;
+    status.className = "settings-status ok";
+  } catch (e) {
+    console.error("saveTargetLocations error:", e);
+    status.textContent = "保存失败";
+    status.className = "settings-status warn";
+  }
+}
+
+async function resetTargetLocations() {
+  const status = document.getElementById("targetLocationsStatus");
+  if (status) {
+    status.textContent = "保存中...";
+    status.className = "settings-status loading";
+  }
+  try {
+    const res = await fetch("/api/settings/target-locations", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ locations: [] }),
+    });
+    const data = await res.json();
+    const input = document.getElementById("targetLocationsInput");
+    if (input) input.value = (data.locations || []).join(",");
+    renderTargetCountryGrid(data.locations || []);
+    if (status) {
+      status.textContent = `已恢复默认 ${(data.locations || []).length} 个国家`;
+      status.className = "settings-status ok";
+    }
+  } catch (e) {
+    console.error("resetTargetLocations error:", e);
+    if (status) {
+      status.textContent = "恢复默认失败";
+      status.className = "settings-status warn";
+    }
+  }
 }
 
 let _llmProvidersCache = null;
@@ -1596,27 +1763,14 @@ function openAddTagModal() {
     if (e.target === overlay) closeAddTagModal();
   });
 
-  // 渲染国家复选框
+  // 渲染国家复选框（使用动态目标国家列表，含 TH/US，失败回退默认）
   const countryGrid = document.getElementById("addTagCountryCheckboxes");
-  const TARGET_LOCATIONS = [
-    "AT",
-    "BE",
-    "CZ",
-    "DE",
-    "ES",
-    "FR",
-    "GR",
-    "HU",
-    "IE",
-    "IT",
-    "NL",
-    "PL",
-    "PT",
-  ];
-  countryGrid.innerHTML = TARGET_LOCATIONS.map(
-    (c) =>
-      `<label class="checkbox-label"><input type="checkbox" value="${c}" checked> ${c}</label>`,
-  ).join("");
+  countryGrid.innerHTML = locationOptions
+    .map(
+      (c) =>
+        `<label class="checkbox-label"><input type="checkbox" value="${c}" checked> ${c}</label>`,
+    )
+    .join("");
 
   const ta = document.getElementById("addTagModalInput");
   ta.focus();
@@ -3450,6 +3604,8 @@ async function fetchWatchdogData() {
       _wdData.clashCountries || {},
       _wdData.errorTriggers || {},
       _wdData.loginPorts || {},
+      _wdData.switchRestarts || {},
+      _wdData.autoUpgrades || {},
     );
   } catch (e) {
     document.getElementById("wdClientsList").textContent =
@@ -3503,6 +3659,8 @@ function renderWatchdogDashboard(
   clashCountries,
   errorTriggers,
   loginPorts,
+  switchRestarts,
+  autoUpgrades,
 ) {
   // 顶栏统计始终更新（textContent 不闪烁）
   var onlineCount = clients.filter(function (c) {
@@ -3567,6 +3725,8 @@ function renderWatchdogDashboard(
         clashCountries,
         errorTriggers,
         loginPorts,
+        switchRestarts,
+        autoUpgrades,
       ),
     );
   });
@@ -3592,6 +3752,8 @@ function renderWatchdogDashboard(
         clashCountries,
         errorTriggers,
         loginPorts,
+        switchRestarts,
+        autoUpgrades,
       ),
     );
   });
@@ -3643,6 +3805,8 @@ function renderOfflineCard(
   clashCountries,
   errorTriggers,
   loginPorts,
+  switchRestarts,
+  autoUpgrades,
 ) {
   var cmdCount = cmds ? cmds.length : 0;
   return tag(
@@ -3654,10 +3818,10 @@ function renderOfflineCard(
     },
     styled(
       "div",
-      "display:flex;justify-content:space-between;align-items:center;margin-bottom:8px",
+      "display:flex;justify-content:space-between;align-items:center;margin-bottom:8px;flex-wrap:wrap;gap:8px",
       styled(
         "div",
-        "",
+        "display:flex;align-items:center;flex-wrap:wrap;min-width:0;flex:1",
         tag(
           "span",
           {
@@ -3696,7 +3860,7 @@ function renderOfflineCard(
       ) +
         styled(
           "div",
-          "display:flex;gap:10px;align-items:center",
+          "display:flex;gap:10px;align-items:center;flex-wrap:wrap;flex-shrink:0",
           styled("span", "color:#f87171;font-size:13px", "● 离线") +
             styled("span", "color:#555;font-size:12px", "—") +
             tag(
@@ -3718,6 +3882,8 @@ function renderOfflineCard(
       ) +
       renderCountrySection({}, userId, clashCountries) +
       renderErrorTriggerSection({}, userId, errorTriggers) +
+      renderSwitchRestartSection({}, userId, switchRestarts) +
+      renderAutoUpgradeSection({}, userId, autoUpgrades) +
       renderLoginSection({}, userId, loginPorts) +
       renderCmdRows(cmds || [], userId, [], false),
   );
@@ -3759,6 +3925,8 @@ function renderClientCard(
   clashCountries,
   errorTriggers,
   loginPorts,
+  switchRestarts,
+  autoUpgrades,
 ) {
   var os = c.osInfo || {},
     cfg = c.config || {},
@@ -3787,7 +3955,10 @@ function renderClientCard(
   var onlineBadge = online
     ? styled("span", "color:#4ade80", "● 在线")
     : styled("span", "color:#f87171", "● 离线");
-  var lastSeen = new Date(c.lastHeartbeat).toLocaleTimeString("zh-CN");
+  // 完整日期时间：跨天离线也能看出最后心跳是哪天
+  var lastSeen = c.lastHeartbeat
+    ? new Date(c.lastHeartbeat).toLocaleString("zh-CN", { hour12: false })
+    : "?";
 
   // 离线时标题和边框变红
   var titleColor = online ? "#60a5fa" : "#f87171";
@@ -3795,10 +3966,10 @@ function renderClientCard(
 
   var header = styled(
     "div",
-    "display:flex;justify-content:space-between;align-items:center;margin-bottom:8px",
+    "display:flex;justify-content:space-between;align-items:center;margin-bottom:8px;flex-wrap:wrap;gap:8px",
     styled(
       "div",
-      "",
+      "display:flex;align-items:center;flex-wrap:wrap;min-width:0;flex:1",
       tag(
         "span",
         {
@@ -3858,10 +4029,16 @@ function renderClientCard(
     ) +
       styled(
         "div",
-        "display:flex;gap:10px;align-items:center",
+        "display:flex;gap:10px;align-items:center;flex-wrap:wrap;flex-shrink:0",
         styled("span", "color:#888;font-size:13px", c.ip) +
           onlineBadge +
-          styled("span", "color:#666;font-size:12px", lastSeen) +
+          styled(
+            "span",
+            online
+              ? "color:#666;font-size:12px"
+              : "color:#fca5a5;font-size:12px",
+            "最后心跳 " + lastSeen,
+          ) +
           (!online && userId
             ? tag(
                 "button",
@@ -3891,6 +4068,8 @@ function renderClientCard(
       styled("div", "color:#888;font-size:12px;margin-bottom:6px", infoLine) +
       renderCountrySection(c, userId, clashCountries) +
       renderErrorTriggerSection(c, userId, errorTriggers) +
+      renderSwitchRestartSection(c, userId, switchRestarts) +
+      renderAutoUpgradeSection(c, userId, autoUpgrades) +
       renderLoginSection(c, userId, loginPorts) +
       renderProxySection(c, userId) +
       renderCmdRows(myCmds, userId, procs, online, c.llmAnalysis, c.clientId),
@@ -4290,6 +4469,155 @@ function renderErrorTriggerSection(c, userId, errorTriggers) {
   );
 }
 
+// ── 代理切换重启配置区域（看门狗面板中每个客户端卡片） ──
+
+function renderSwitchRestartSection(c, userId, switchRestarts) {
+  if (!userId) return "";
+  var entry = (switchRestarts && switchRestarts[userId]) || null;
+  var enabled = entry ? !!entry.enabled : false;
+  var label = entry ? (enabled ? "已启用" : "已禁用") : "未配置（默认禁用）";
+  var btnColor = enabled ? "#4ade80" : "#888";
+  return styled(
+    "div",
+    "margin-top:6px;padding:6px 8px;background:#111;border-radius:6px;" +
+      "display:flex;align-items:center;gap:8px;font-size:12px",
+    styled("span", "font-size:14px", "🔁") +
+      styled("span", "color:#888", "切换重启:") +
+      tag(
+        "button",
+        {
+          onclick: "wdShowSwitchRestartModal('" + esc(userId) + "')",
+          style:
+            "padding:2px 8px;font-size:11px;background:#333;color:" +
+            btnColor +
+            ";border:1px solid #444;border-radius:3px;cursor:pointer",
+          title: "代理切换后强制重启全部命令（默认关闭）",
+        },
+        (enabled ? "开 " : "关 ") + "⚙️",
+      ) +
+      styled("span", "color:#666;margin-left:auto", label),
+  );
+}
+
+// ── 代理切换重启配置弹窗 ──
+
+var _wdSwitchUserId = "";
+
+function wdShowSwitchRestartModal(userId) {
+  _wdSwitchUserId = userId;
+  document.getElementById("wdSwitchUserId").textContent = userId;
+  var entry =
+    _wdData && _wdData.switchRestarts && _wdData.switchRestarts[userId]
+      ? _wdData.switchRestarts[userId]
+      : null;
+  document.getElementById("wdSwitchEnabled").checked = entry
+    ? !!entry.enabled
+    : false;
+  document.getElementById("wdSwitchRestartModal").style.display = "flex";
+}
+
+async function wdSetSwitchRestart() {
+  var config = {
+    enabled: document.getElementById("wdSwitchEnabled").checked,
+  };
+  try {
+    var res = await fetch("/api/watchdog/set-switch-restart", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userId: _wdSwitchUserId, config: config }),
+    });
+    var d = await res.json();
+    document.getElementById("wdSwitchRestartModal").style.display = "none";
+    if (d.ok) {
+      alert(
+        config.enabled
+          ? "已开启代理切换重启\n\n代理节点切换后，客户端将强制重启全部命令。\n客户端将在下次心跳时生效（约15秒内）。"
+          : "已关闭代理切换重启\n\n客户端将在下次心跳时生效（约15秒内）。",
+      );
+    } else {
+      alert("失败: " + (d.error || "未知错误"));
+    }
+    fetchWatchdogData();
+  } catch (e) {
+    alert("保存失败: " + e.message);
+  }
+}
+
+// ── 自动升级开关（默认开启，后端可下发关闭） ──
+
+function renderAutoUpgradeSection(c, userId, autoUpgrades) {
+  if (!userId) return "";
+  var entry = (autoUpgrades && autoUpgrades[userId]) || null;
+  var enabled = entry ? !!entry.enabled : true; // 未配置默认开启
+  var label = enabled ? "已开启" : "已关闭";
+  var btnColor = enabled ? "#4ade80" : "#f87171";
+  return styled(
+    "div",
+    "margin-top:6px;padding:6px 8px;background:#111;border-radius:6px;" +
+      "display:flex;align-items:center;gap:8px;font-size:12px",
+    styled("span", "font-size:14px", "🚀") +
+      styled("span", "color:#888", "自动升级:") +
+      tag(
+        "button",
+        {
+          onclick: "wdShowAutoUpgradeModal('" + esc(userId) + "')",
+          style:
+            "padding:2px 8px;font-size:11px;background:#333;color:" +
+            btnColor +
+            ";border:1px solid #444;border-radius:3px;cursor:pointer",
+          title: "看门狗客户端检测到新版本时自动升级（默认开启）",
+        },
+        (enabled ? "开 " : "关 ") + "⚙️",
+      ) +
+      styled("span", "color:#666;margin-left:auto", label),
+  );
+}
+
+// ── 自动升级开关弹窗 ──
+
+var _wdAutoUpgradeUserId = "";
+
+function wdShowAutoUpgradeModal(userId) {
+  _wdAutoUpgradeUserId = userId;
+  document.getElementById("wdAutoUpgradeUserId").textContent = userId;
+  var entry =
+    _wdData && _wdData.autoUpgrades && _wdData.autoUpgrades[userId]
+      ? _wdData.autoUpgrades[userId]
+      : null;
+  // 未配置 = 默认开启
+  document.getElementById("wdAutoUpgradeEnabled").checked = entry
+    ? !!entry.enabled
+    : true;
+  document.getElementById("wdAutoUpgradeModal").style.display = "flex";
+}
+
+async function wdSetAutoUpgrade() {
+  var config = {
+    enabled: document.getElementById("wdAutoUpgradeEnabled").checked,
+  };
+  try {
+    var res = await fetch("/api/watchdog/set-auto-upgrade", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userId: _wdAutoUpgradeUserId, config: config }),
+    });
+    var d = await res.json();
+    document.getElementById("wdAutoUpgradeModal").style.display = "none";
+    if (d.ok) {
+      alert(
+        config.enabled
+          ? "已开启自动升级\n\n客户端检测到新版本时会自动升级。\n客户端将在下次心跳时生效（约15秒内）。"
+          : "已关闭自动升级\n\n该客户端将不再自动升级新版本（仍可手动升级）。\n客户端将在下次心跳时生效（约15秒内）。",
+      );
+    } else {
+      alert("失败: " + (d.error || "未知错误"));
+    }
+    fetchWatchdogData();
+  } catch (e) {
+    alert("保存失败: " + e.message);
+  }
+}
+
 // ── 错误自动切节点配置弹窗 ──
 
 var _wdErrUserId = "";

package/src/watch/public/index.html

@@ -20,7 +20,7 @@
         <input type="checkbox" id="fireworkToggle" checked onchange="toggleFireworks()">
         <span>🎆</span>
       </label>
-      <a class="script-link" onclick="navigateToSettings()" style="cursor:pointer">⚙️ LLM</a>
+      <a class="script-link" onclick="navigateToSettings()" style="cursor:pointer">⚙️ 配置</a>
       <a class="script-link" onclick="navigateToWatchdog()" style="cursor:pointer">🐕 看门狗</a>
       <span class="status" id="lastUpdate">--</span>
     </div>
@@ -488,6 +488,26 @@
         </div>
       </div>
     </div>
+    <div class="settings-card">
+      <h3>🎯 目标国家</h3>
+      <p class="settings-hint">设置采集的目标国家列表，保存后写入通用配置文件（~/.tt-help-config.json）。当前仅保存配置，后续接入采集流程后生效。</p>
+      <div class="settings-form">
+        <div class="settings-field">
+          <label>目标国家（英文国家代码，逗号分隔，如 CZ,GR,TH）</label>
+          <input type="text" id="targetLocationsInput" placeholder="CZ,GR,HU,PT,ES,PL,NL,BE,DE,FR,IT,IE,AT,TH,US">
+          <span class="settings-note">可手动输入，或点击下方国家快速选择。</span>
+        </div>
+        <div class="settings-field">
+          <label>快速选择</label>
+          <div class="loc-grid" id="targetCountryGrid"></div>
+        </div>
+        <div class="settings-status" id="targetLocationsStatus"></div>
+        <div class="btn-row">
+          <button class="btn-submit" onclick="saveTargetLocations()">保存目标国家</button>
+          <button class="btn-cancel" onclick="resetTargetLocations()">恢复默认</button>
+        </div>
+      </div>
+    </div>
   </div>
   <div id="watchdogPage">
     <div class="stats" style="margin-bottom:16px">
@@ -667,6 +687,46 @@
     </div>
   </div>
 
+  <!-- 代理切换重启配置弹窗 -->
+  <div id="wdSwitchRestartModal"
+    style="display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.6);z-index:9999;align-items:center;justify-content:center">
+    <div style="background:#1e1e2e;border:1px solid #333;border-radius:12px;padding:24px;width:90%;max-width:480px">
+      <div style="font-size:16px;color:#4ade80;margin-bottom:4px">🔁 代理切换重启 — <span id="wdSwitchUserId"></span></div>
+      <div style="color:#888;font-size:12px;margin-bottom:12px">代理节点发生切换后，客户端强制重启全部被监控命令（错峰停止 + 错峰启动）。<br><b
+          style="color:#f87171">默认关闭</b>，需手动开启。</div>
+      <label
+        style="display:flex;align-items:center;gap:8px;margin-bottom:12px;color:#e0e0e0;font-size:13px;cursor:pointer">
+        <input type="checkbox" id="wdSwitchEnabled" style="width:16px;height:16px"> 启用（切换后强制重启全部命令）
+      </label>
+      <div style="display:flex;justify-content:flex-end;gap:8px;margin-top:16px">
+        <button onclick="document.getElementById('wdSwitchRestartModal').style.display='none'"
+          style="padding:8px 16px;background:#333;color:#ccc;border:none;border-radius:6px;cursor:pointer;font-size:12px">取消</button>
+        <button onclick="wdSetSwitchRestart()"
+          style="padding:8px 16px;background:#4ade80;color:#000;border:none;border-radius:6px;cursor:pointer;font-size:12px;font-weight:600">保存并下发</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- 自动升级开关弹窗 -->
+  <div id="wdAutoUpgradeModal"
+    style="display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.6);z-index:9999;align-items:center;justify-content:center">
+    <div style="background:#1e1e2e;border:1px solid #333;border-radius:12px;padding:24px;width:90%;max-width:480px">
+      <div style="font-size:16px;color:#4ade80;margin-bottom:4px">🚀 自动升级 — <span id="wdAutoUpgradeUserId"></span></div>
+      <div style="color:#888;font-size:12px;margin-bottom:12px">客户端看门狗定期检测新版本并自动升级。<br><b
+          style="color:#4ade80">默认开启</b>，关闭后该客户端不再自动升级（仍可手动升级）。</div>
+      <label
+        style="display:flex;align-items:center;gap:8px;margin-bottom:12px;color:#e0e0e0;font-size:13px;cursor:pointer">
+        <input type="checkbox" id="wdAutoUpgradeEnabled" style="width:16px;height:16px"> 启用（检测到新版本自动升级）
+      </label>
+      <div style="display:flex;justify-content:flex-end;gap:8px;margin-top:16px">
+        <button onclick="document.getElementById('wdAutoUpgradeModal').style.display='none'"
+          style="padding:8px 16px;background:#333;color:#ccc;border:none;border-radius:6px;cursor:pointer;font-size:12px">取消</button>
+        <button onclick="wdSetAutoUpgrade()"
+          style="padding:8px 16px;background:#4ade80;color:#000;border:none;border-radius:6px;cursor:pointer;font-size:12px;font-weight:600">保存并下发</button>
+      </div>
+    </div>
+  </div>
+
   <!-- 登录检测端口配置弹窗 -->
   <div id="wdLoginPortsModal"
     style="display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.6);z-index:9999;align-items:center;justify-content:center">
@@ -704,7 +764,7 @@
     </div>
   </div>
 
-  <script src="app.js?v=20260826"></script>
+  <script src="app.js?v=20260828c"></script>
 </body>
 
 </html>

package/src/watch/public/style.css

@@ -1834,6 +1834,22 @@ td.user-id:hover {
   background: #e61944;
 }
 
+.settings-form .btn-cancel {
+  padding: 10px 20px;
+  border: 1px solid #333;
+  border-radius: 8px;
+  background: #2a2a3a;
+  color: #ccc;
+  font-size: 14px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: background 0.2s;
+}
+
+.settings-form .btn-cancel:hover {
+  background: #333;
+}
+
 /* ── 看门狗页面 ── */
 
 #watchdogPage {