Merge upstream admin updates and fix dashboard pointer and group picker interactions

src/index.css

@@ -100,6 +100,11 @@
     body {
         @apply bg-background text-foreground;
     }
+
+    button:not(:disabled):not([aria-disabled="true"]),
+    [role="button"]:not([aria-disabled="true"]):not([data-disabled]) {
+        cursor: pointer;
+    }
 }
 
 html,

src/locales/en/translation.json

@@ -164,6 +164,8 @@
     "ServerNotificationDays": "Server Notification Days",
     "FullIPNotification": "Show Full IP Address in Notification Messages",
     "EnableMCP": "Enable MCP endpoint (off by default; review API token scopes and server allow-list first)",
+    "OnlineStatsDays": "Online stats range (days)",
+    "OnlineStatsDaysHint": "Retention and query window for per-server online periods; sessions outside the range are removed by the daily cleanup job.",
     "EditService": "Edit Service",
     "CreateService": "Create Service",
     "EditTask": "Edit Task",

src/locales/zh-CN/translation.json

@@ -171,6 +171,8 @@
     "ServerNotificationDays": "VPS到期提醒天数",
     "FullIPNotification": "在通知消息中显示完整的 IP 地址",
     "EnableMCP": "启用 MCP 接入（默认关闭；启用前请确认已审阅 API 令牌 scope 与服务器白名单）",
+    "OnlineStatsDays": "在线统计范围（天）",
+    "OnlineStatsDaysHint": "设备在线时间段的统计与保留窗口，超出范围的记录会在每日清理时删除。",
     "LoginFailed": "登录失败",
     "BruteForceAttackingToken": "暴力攻击令牌",
     "BruteForceAttackingAgentSecret": "暴力攻击代理秘密",

src/locales/zh-TW/translation.json

@@ -152,8 +152,8 @@
     "ReservedHostsHint": "反代部署下面板看不到自身的對外網域，無法自動保護。請在此列出所有公網入口網域，否則成員可將其註冊為 NAT 網域搶佔面板路由。",
     "ConfigTLS": "Agent 使用 TLS 連線",
     "CustomPublicDNSNameserversforDDNS": "DDNS 的自訂公共 DNS 名稱伺服器",
-    "WebRealIPHeader": "前端真實IP請求頭",
-    "AgentRealIPHeader": "Agent真實IP請求頭",
+    "WebRealIPHeader": "前端真實 IP 請求標頭",
+    "AgentRealIPHeader": "Agent 真實 IP 請求標頭",
     "UseDirectConnectingIP": "使用直連 IP",
     "IPChangeNotification": "IP變更通知",
     "FullIPNotification": "在通知訊息中顯示完整的 IP 位址",
@@ -224,6 +224,8 @@
         "StatusCancelled": "已取消"
     },
     "EnableMCP": "啟用 MCP 端點（預設關閉；啟用前請先檢查 API token 範圍與伺服器允許清單）",
+    "OnlineStatsDays": "線上統計範圍（天）",
+    "OnlineStatsDaysHint": "裝置線上時間段的統計與保留視窗，超出範圍的紀錄會在每日清理時刪除。",
     "ApiTokens": "API Token",
     "CreateApiToken": "建立 API token",
     "CreateApiTokenDescription": "Token 會代表你對 MCP 與外部用戶端進行驗證，其權限不會超過你本身的權限。",
@@ -249,5 +251,71 @@
     "Copied": "已複製到剪貼簿",
     "Scopes": "範圍",
     "InvalidUsernameOrPassword": "使用者名稱或密碼無效",
-    "NetworkError": "網路錯誤"
+    "NetworkError": "網路錯誤",
+    "Terminal": "終端機",
+    "Config": "設定",
+    "Add": "新增",
+    "Delete": "刪除",
+    "AdvancedJSON": "進階 JSON",
+    "Save": "儲存",
+    "PublicNote": {
+        "Label": "公開備註",
+        "Billing": "計費",
+        "Plan": "方案",
+        "StartDate": "開始日期",
+        "EndDate": "結束日期",
+        "AutoRenewal": "自動續約",
+        "Cycle": "週期",
+        "Amount": "金額",
+        "Bandwidth": "頻寬",
+        "TrafficVolume": "流量",
+        "TrafficType": "流量計算方式",
+        "IPv4": "IPv4",
+        "IPv6": "IPv6",
+        "NetworkRoute": "網路線路",
+        "Extra": "其他資訊",
+        "Enabled": "已啟用",
+        "Disabled": "已停用",
+        "Inbound": "連入流量",
+        "Both": "雙向流量",
+        "Day": "天",
+        "Week": "週",
+        "Month": "月",
+        "Year": "年",
+        "NoExpiry": "不會到期",
+        "SetNoExpiry": "設定為不會到期",
+        "CancelNoExpiry": "取消不會到期",
+        "Free": "免費",
+        "PayAsYouGo": "按用量計費",
+        "CommaSeparated": "多個項目請以逗號分隔",
+        "Has": "有",
+        "None": "無",
+        "CustomFields": "自訂欄位",
+        "ClearDate": "清除日期",
+        "Clear": "清除",
+        "RawText": "原始文字"
+    },
+    "Validation": {
+        "InvalidDate": "日期無效",
+        "MustBe0Or1": "必須為 0 或 1",
+        "MustBeDayWeekMonthYear": "必須為 Day/Week/Month/Year",
+        "MustBe1Or2": "必須為 1 或 2",
+        "DigitsOnly": "只能輸入數字",
+        "InvalidForm": "表單無效",
+        "InvalidJSON": "JSON 無效"
+    },
+    "AlertRules": {
+        "CoverAllServers": "監控所有伺服器",
+        "IgnoreAllSelectSpecific": "忽略所有伺服器，僅選取特定伺服器",
+        "IgnoreHint": "{{server}} ID：true/false",
+        "IgnoreExample": "例如：{\"1\": true, \"2\": false}"
+    },
+    "Search": "搜尋...",
+    "Format": "格式化",
+    "Formatted": "已格式化",
+    "Paste": "貼上",
+    "CopiedToClipboard": "已複製到剪貼簿",
+    "ClipboardWriteFailed": "寫入剪貼簿失敗",
+    "PastedFromClipboard": "已從剪貼簿貼上",
+    "ClipboardReadFailed": "讀取剪貼簿失敗"
 }

src/routes/settings.tsx

@@ -41,6 +41,7 @@ const settingFormSchema = z.object({
     ignored_ip_notification: asOptionalField(z.string()),
     ip_change_notification_group_id: z.coerce.number().int().min(0),
     cover: z.coerce.number().int().min(1),
+    online_stats_days: z.coerce.number().int().min(7).max(3650),
     site_name: z.string().min(1),
     language: z.string().min(2),
     user_template: z.string().min(1),
@@ -96,6 +97,9 @@ export default function SettingsPage() {
         defaultValues: config
             ? {
                   ...config.config,
+                  // 兼容尚未包含 online_stats_days 的旧后端：字段缺省时回退
+                  // 默认值，避免必填校验拦截其他设置的提交
+                  online_stats_days: config.config?.online_stats_days ?? 7,
                   user_template:
                       config.config?.user_template ||
                       Object.keys(config.frontend_templates?.filter((t) => !t.is_admin) || {})[0] ||
@@ -104,6 +108,7 @@ export default function SettingsPage() {
             : {
                   ip_change_notification_group_id: 0,
                   cover: 1,
+                  online_stats_days: 7,
                   site_name: "",
                   language: "",
                   user_template: "user-dist",
@@ -118,7 +123,11 @@ export default function SettingsPage() {
 
     useEffect(() => {
         if (config?.config) {
-            form.reset(config?.config)
+            // 与 defaultValues 同一兼容口径：旧后端缺字段时回退默认值
+            form.reset({
+                ...config.config,
+                online_stats_days: config.config?.online_stats_days ?? 7,
+            })
         }
     }, [config?.config, form])
 
@@ -805,6 +814,26 @@ export default function SettingsPage() {
                                 </FormItem>
                             )}
                         />
+                        <FormField
+                            control={form.control}
+                            name="online_stats_days"
+                            render={({ field }) => (
+                                <FormItem>
+                                    <FormLabel>{t("OnlineStatsDays")}</FormLabel>
+                                    <FormControl>
+                                        <Input
+                                            type="number"
+                                            min={7}
+                                            max={3650}
+                                            placeholder="7"
+                                            {...field}
+                                        />
+                                    </FormControl>
+                                    <FormDescription>{t("OnlineStatsDaysHint")}</FormDescription>
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                        />
                         <Button type="submit">{t("Confirm")}</Button>
                     </form>
                 </Form>

src/test/settings-online-stats-days.test.tsx

@@ -0,0 +1,118 @@
+import { act, fireEvent, render, screen, waitFor } from "@testing-library/react"
+import { MemoryRouter } from "react-router-dom"
+import { afterEach, beforeEach, expect, test, vi } from "vitest"
+
+vi.mock("sonner", () => ({
+    toast: vi.fn(),
+}))
+
+vi.mock("react-i18next", () => ({
+    useTranslation: () => ({
+        t: (k: string) => k,
+        i18n: { language: "en", changeLanguage: vi.fn() },
+    }),
+    initReactI18next: { type: "3rdParty", init: () => undefined },
+    Trans: ({ children }: { children?: React.ReactNode }) => children ?? null,
+}))
+
+vi.mock("@/hooks/useAuth", () => ({
+    useAuth: () => ({ profile: { id: 1, role: 0 }, loading: false }),
+}))
+
+vi.mock("@/hooks/useNotfication", () => ({
+    useNotification: () => ({ notifierGroup: [] }),
+}))
+
+// h.data 可在每个用例中替换，覆盖"配置带/不带 online_stats_days"两种后端形态
+const h = vi.hoisted(() => ({
+    data: {
+        config: {
+            site_name: "Nezha",
+            language: "zh-CN",
+            user_template: "user-dist",
+            cover: 1,
+            ip_change_notification_group_id: 0,
+            online_stats_days: 30,
+        },
+        frontend_templates: [] as unknown[],
+    },
+    updateSettings: vi.fn(),
+}))
+
+vi.mock("@/hooks/useSetting", () => ({
+    default: () => ({ data: h.data, mutate: vi.fn() }),
+}))
+
+vi.mock("@/api/settings", () => ({
+    updateSettings: (...args: unknown[]) => h.updateSettings(...args),
+}))
+
+beforeEach(() => {
+    h.updateSettings.mockReset()
+    h.updateSettings.mockResolvedValue(undefined)
+    h.data.config.online_stats_days = 30
+})
+
+afterEach(() => {
+    document.body.innerHTML = ""
+})
+
+async function renderSettings() {
+    const { default: SettingsPage } = await import("@/routes/settings")
+    await act(async () => {
+        render(
+            <MemoryRouter>
+                <SettingsPage />
+            </MemoryRouter>,
+        )
+    })
+}
+
+async function submitWithDays(value: string) {
+    const input = screen.getByPlaceholderText("7")
+    await act(async () => {
+        fireEvent.change(input, { target: { value } })
+    })
+    await act(async () => {
+        fireEvent.click(screen.getByRole("button", { name: /Confirm/i }))
+    })
+}
+
+test.each(["6", "3651"])("rejects out-of-range online_stats_days (%s)", async (value) => {
+    await renderSettings()
+    await submitWithDays(value)
+    expect(h.updateSettings).not.toHaveBeenCalled()
+})
+
+test("rejects non-integer online_stats_days", async () => {
+    await renderSettings()
+    await submitWithDays("7.5")
+    expect(h.updateSettings).not.toHaveBeenCalled()
+})
+
+test("legacy backend without online_stats_days falls back to 7 and still submits", async () => {
+    // 模拟旧后端：配置里没有该字段（delete 掉而非置 undefined 字面量）
+    const legacy = h.data.config as Record<string, unknown>
+    delete legacy.online_stats_days
+
+    await renderSettings()
+
+    // 初始化与 reset 后表单都应回退默认值，而不是把 undefined 交给必填校验
+    const input = screen.getByPlaceholderText("7") as HTMLInputElement
+    expect(input.value).toBe("7")
+
+    await act(async () => {
+        fireEvent.click(screen.getByRole("button", { name: /Confirm/i }))
+    })
+    await waitFor(() => expect(h.updateSettings).toHaveBeenCalled())
+
+    const payload = h.updateSettings.mock.calls[0][0] as Record<string, unknown>
+    expect(payload.online_stats_days).toBe(7)
+})
+
+test("valid submit carries the field in the payload", async () => {
+    await renderSettings()
+    await submitWithDays("90")
+    await waitFor(() => expect(h.updateSettings).toHaveBeenCalled())
+    expect(h.updateSettings.mock.calls[0][0]).toMatchObject({ online_stats_days: 90 })
+})

src/test/settings-submit-error.test.tsx

@@ -35,6 +35,7 @@ const validConfig = {
         user_template: "user-dist",
         cover: 1,
         ip_change_notification_group_id: 0,
+        online_stats_days: 7,
     },
     frontend_templates: [],
 }

src/types/api.ts

@@ -726,6 +726,8 @@ export interface ModelSetting {
     oauth2_providers: string[]
     /** 反代部署下声明对外域名（逗号分隔），防止成员注册冲突 NAT 域名抢占路由 */
     reserved_hosts: string
+    /** 设备在线时间段统计范围（天），最小 7，最大 3650 */
+    online_stats_days: number
     site_name: string
     /** 用于前端判断生成的安装命令是否启用 TLS */
     tls: boolean
@@ -752,6 +754,8 @@ export interface ModelSettingForm {
     ip_change_notification_group_id: number
     /** @minLength 2 */
     language: string
+    /** 设备在线时间段统计范围（天），最小 7，最大 3650 */
+    online_stats_days?: number
     /** @minLength 1 */
     site_name: string
     tls?: boolean