From 4d163c7676c9f5e5707198a382ee89b4ee61764d Mon Sep 17 00:00:00 2001
From: linkeyu <798648091@qq.com>
Date: Wed, 29 Jul 2026 19:06:57 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=BB=9F=E4=B8=80=E9=99=90=E5=88=B6=E7=99=BD=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增全局限制分组管理、多限制项临时不限白名单、设备搜索选择和风控记录快捷加入入口，并同步引导视频配置展示。
---
 src/app/(main)/config/GuideVideoConfig.tsx |  116 ++-
 src/app/(main)/layout.tsx                  |    2 +
 src/app/(main)/limit-whitelist/page.tsx    | 1024 ++++++++++++++++++++
 src/app/(main)/risk-monitor/page.tsx       |   77 +-
 src/lib/types.ts                           |   66 +-
 5 files changed, 1258 insertions(+), 27 deletions(-)
 create mode 100644 src/app/(main)/limit-whitelist/page.tsx

diff --git a/src/app/(main)/config/GuideVideoConfig.tsx b/src/app/(main)/config/GuideVideoConfig.tsx
index 706a636..cb721fd 100644
--- a/src/app/(main)/config/GuideVideoConfig.tsx
+++ b/src/app/(main)/config/GuideVideoConfig.tsx
@@ -1,7 +1,18 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import { Button, Card, InputNumber, Space, Spin, Switch, Tag, Typography, Upload, message } from 'antd';
+import {
+  Button,
+  Card,
+  InputNumber,
+  Space,
+  Spin,
+  Switch,
+  Tag,
+  Typography,
+  Upload,
+  message,
+} from 'antd';
 import { DeleteOutlined, UploadOutlined } from '@ant-design/icons';
 import { api, errMsg } from '@/lib/api';
 import { canDo } from '@/lib/auth';
@@ -38,7 +49,9 @@ function SceneConfig({ scene }: { scene: Scene }) {
   const load = async () => {
     setLoading(true);
     try {
-      const { data } = await api.get<GuideCfg>('/admin/api/guide-video', { params: { scene } });
+      const { data } = await api.get<GuideCfg>('/admin/api/guide-video', {
+        params: { scene },
+      });
       sync(data);
     } catch (e) {
       message.error(errMsg(e));
@@ -56,7 +69,11 @@ function SceneConfig({ scene }: { scene: Scene }) {
     try {
       const { data } = await api.patch<GuideCfg>(
         '/admin/api/guide-video',
-        { enabled, max_plays: maxPlays, reward_coin: rewardCoin },
+        {
+          enabled,
+          reward_coin: rewardCoin,
+          ...(scene === 'comparison' ? { max_plays: maxPlays } : {}),
+        },
         { params: { scene } },
       );
       sync(data);
@@ -121,11 +138,20 @@ function SceneConfig({ scene }: { scene: Scene }) {
       size="small"
       title={meta.title}
       style={{ marginBottom: 16 }}
-      extra={cfg?.updated_at ? <Text type="secondary">更新于 {new Date(cfg.updated_at).toLocaleString('zh-CN')}</Text> : null}
+      extra={
+        cfg?.updated_at ? (
+          <Text type="secondary">
+            更新于 {new Date(cfg.updated_at).toLocaleString('zh-CN')}
+          </Text>
+        ) : null
+      }
     >
       <p style={{ color: '#777', marginTop: 0 }}>
-        Android 用户点击「{meta.action}」后，前若干次在等候浮层广告位播放本视频并奖励金币。
-        次数按账号、按功能分别计算；开播即计次，播完或中途关闭均发放当次配置的金币。
+        Android 用户点击「{meta.action}」后，前 {cfg?.max_plays ?? 3}{' '}
+        次在等候浮层广告位播放本视频并奖励金币。次数按账号、按功能分别计算；
+        开播即计次，播完或中途关闭均发放当次配置的金币。
+        {scene === 'coupon' &&
+          '领券引导视频的播放次数上限请在「监控审计 → 白名单」中调整。'}
       </p>
       {loading || !cfg ? (
         <Spin style={{ display: 'block', margin: '24px 0' }} />
@@ -137,10 +163,24 @@ function SceneConfig({ scene }: { scene: Scene }) {
               <video
                 src={mediaUrl(cfg.video_url)}
                 controls
-                style={{ width: 240, maxHeight: 420, borderRadius: 12, background: '#000' }}
+                style={{
+                  width: 240,
+                  maxHeight: 420,
+                  borderRadius: 12,
+                  background: '#000',
+                }}
               />
             ) : (
-              <div style={{ height: 280, border: '1px dashed #d9d9d9', borderRadius: 12, display: 'grid', placeItems: 'center', color: '#aaa' }}>
+              <div
+                style={{
+                  height: 280,
+                  border: '1px dashed #d9d9d9',
+                  borderRadius: 12,
+                  display: 'grid',
+                  placeItems: 'center',
+                  color: '#aaa',
+                }}
+              >
                 未上传视频
               </div>
             )}
@@ -148,22 +188,51 @@ function SceneConfig({ scene }: { scene: Scene }) {
           <Space direction="vertical" size="middle" style={{ minWidth: 390 }}>
             <Space>
               <span>启用：</span>
-              <Switch checked={enabled} disabled={!canEdit} onChange={setEnabled} />
+              <Switch
+                checked={enabled}
+                disabled={!canEdit}
+                onChange={setEnabled}
+              />
               {!enabled && <Tag color="orange">已关闭</Tag>}
             </Space>
-            <Space>
-              <span>播放次数：</span>
-              <InputNumber min={0} max={50} precision={0} value={maxPlays} disabled={!canEdit} onChange={(v) => setMaxPlays(v ?? 0)} />
-              <Text type="secondary">每个账号前 N 次（默认 3）</Text>
-            </Space>
+            {scene === 'comparison' && (
+              <Space>
+                <span>播放次数：</span>
+                <InputNumber
+                  min={0}
+                  max={50}
+                  precision={0}
+                  value={maxPlays}
+                  disabled={!canEdit}
+                  onChange={(value) => setMaxPlays(value ?? 0)}
+                />
+                <Text type="secondary">每个账号前 N 次（默认 3）</Text>
+              </Space>
+            )}
             <Space>
               <span>每次金币：</span>
-              <InputNumber min={0} max={10000} precision={0} value={rewardCoin} disabled={!canEdit} onChange={(v) => setRewardCoin(v ?? 0)} />
+              <InputNumber
+                min={0}
+                max={10000}
+                precision={0}
+                value={rewardCoin}
+                disabled={!canEdit}
+                onChange={(value) => setRewardCoin(value ?? 0)}
+              />
               <Text type="secondary">默认 100</Text>
             </Space>
             <Space wrap>
-              <Upload accept="video/mp4,.mp4" showUploadList={false} beforeUpload={beforeUpload} disabled={!canEdit}>
-                <Button icon={<UploadOutlined />} loading={uploading} disabled={!canEdit}>
+              <Upload
+                accept="video/mp4,.mp4"
+                showUploadList={false}
+                beforeUpload={beforeUpload}
+                disabled={!canEdit}
+              >
+                <Button
+                  icon={<UploadOutlined />}
+                  loading={uploading}
+                  disabled={!canEdit}
+                >
                   {cfg.video_url ? '更换视频' : '上传视频'}
                 </Button>
               </Upload>
@@ -174,8 +243,17 @@ function SceneConfig({ scene }: { scene: Scene }) {
               )}
               <Text type="secondary">MP4（H.264），≤100MB</Text>
             </Space>
-            <Button type="primary" loading={saving} disabled={!canEdit} onClick={save}>保存配置</Button>
-            <Text type="secondary">累计播放 {cfg.total_plays} 次，已发币 {cfg.granted_plays} 次</Text>
+            <Button
+              type="primary"
+              loading={saving}
+              disabled={!canEdit}
+              onClick={save}
+            >
+              保存配置
+            </Button>
+            <Text type="secondary">
+              累计播放 {cfg.total_plays} 次，已发币 {cfg.granted_plays} 次
+            </Text>
           </Space>
         </Space>
       )}
diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx
index 24160dc..3826e98 100644
--- a/src/app/(main)/layout.tsx
+++ b/src/app/(main)/layout.tsx
@@ -18,6 +18,7 @@ import {
   ProfileOutlined,
   SafetyCertificateOutlined,
   SecurityScanOutlined,
+  StopOutlined,
   SettingOutlined,
   ShareAltOutlined,
   TeamOutlined,
@@ -105,6 +106,7 @@ const NAV_GROUPS: NavGroup[] = [
       { key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
       { key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
       { key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
+      { key: '/limit-whitelist', icon: <StopOutlined />, label: '白名单' },
     ],
   },
 ];
diff --git a/src/app/(main)/limit-whitelist/page.tsx b/src/app/(main)/limit-whitelist/page.tsx
new file mode 100644
index 0000000..57cc458
--- /dev/null
+++ b/src/app/(main)/limit-whitelist/page.tsx
@@ -0,0 +1,1024 @@
+'use client';
+
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import {
+  Alert,
+  App,
+  Button,
+  Card,
+  Checkbox,
+  DatePicker,
+  Form,
+  Input,
+  InputNumber,
+  Modal,
+  Popconfirm,
+  Select,
+  Space,
+  Switch,
+  Table,
+  Tag,
+  Tabs,
+  Typography,
+} from 'antd';
+import type { ColumnsType } from 'antd/es/table';
+import {
+  DeleteOutlined,
+  EditOutlined,
+  PlusOutlined,
+  ReloadOutlined,
+  UndoOutlined,
+} from '@ant-design/icons';
+import dayjs, { type Dayjs } from 'dayjs';
+
+import { api, errMsg } from '@/lib/api';
+import type {
+  LimitDeviceCandidate,
+  LimitOverride,
+  LimitOverrideList,
+  LimitRule,
+  LimitSubjectType,
+} from '@/lib/types';
+
+const { Text, Title } = Typography;
+
+const RULE_GROUPS = ['比价', '短信与登录', '广告', '引导与账号', '风控免告警'];
+const deviceSourceScope = (ruleCode: string) =>
+  ruleCode === 'compare.start.daily' ? 'comparison' : 'auth';
+
+const STATUS_META: Record<
+  LimitOverride['status'],
+  { label: string; color: string }
+> = {
+  active: { label: '生效中', color: 'success' },
+  scheduled: { label: '待生效', color: 'processing' },
+  expired: { label: '已失效', color: 'default' },
+  disabled: { label: '已停用', color: 'warning' },
+};
+
+interface OverrideFormValue {
+  subject_type: LimitSubjectType;
+  subject_value: string;
+  rule_codes: string[];
+  enabled: boolean;
+  starts_at?: Dayjs | null;
+  expires_at?: Dayjs | null;
+  reason?: string;
+}
+
+interface CreatePreset {
+  subject_type: LimitSubjectType;
+  subject_value: string;
+  rule_code: string;
+}
+
+const asIso = (value?: Dayjs | null) => (value ? value.toISOString() : null);
+const showTime = (value: string | null) =>
+  value ? dayjs(value).format('YYYY-MM-DD HH:mm') : '-';
+
+export default function LimitWhitelistPage() {
+  const { message } = App.useApp();
+  const [rules, setRules] = useState<LimitRule[]>([]);
+  const [rows, setRows] = useState<LimitOverride[]>([]);
+  const [total, setTotal] = useState(0);
+  const [page, setPage] = useState(1);
+  const [pageSize, setPageSize] = useState(20);
+  const [loading, setLoading] = useState(true);
+  const [keyword, setKeyword] = useState('');
+  const [subjectType, setSubjectType] = useState<LimitSubjectType | undefined>();
+  const [ruleFilter, setRuleFilter] = useState<string | undefined>();
+  const [editing, setEditing] = useState<LimitOverride | null>(null);
+  const [editorOpen, setEditorOpen] = useState(false);
+  const [saving, setSaving] = useState(false);
+  const [createPreset, setCreatePreset] = useState<CreatePreset | null>(null);
+  const [deviceCandidates, setDeviceCandidates] = useState<
+    LimitDeviceCandidate[]
+  >([]);
+  const [deviceSearching, setDeviceSearching] = useState(false);
+  const [globalGroup, setGlobalGroup] = useState(RULE_GROUPS[0]);
+  const [editorRuleGroup, setEditorRuleGroup] = useState(RULE_GROUPS[0]);
+  const deviceSearchTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const [globalRule, setGlobalRule] = useState<LimitRule | null>(null);
+  const [globalValue, setGlobalValue] = useState<number | null>(null);
+  const [globalSaving, setGlobalSaving] = useState(false);
+  const [form] = Form.useForm<OverrideFormValue>();
+  const watchedRuleCodes = Form.useWatch('rule_codes', form) || [];
+  const watchedSubjectType = Form.useWatch('subject_type', form);
+  const watchedSubjectValue = Form.useWatch('subject_value', form);
+  const candidateRuleCode = useMemo(() => {
+    if (watchedSubjectType === 'device') {
+      const scopes = new Set(watchedRuleCodes.map(deviceSourceScope));
+      if (scopes.size !== 1) return undefined;
+    }
+    return createPreset?.rule_code &&
+      watchedRuleCodes.includes(createPreset.rule_code)
+      ? createPreset.rule_code
+      : watchedRuleCodes[0];
+  }, [createPreset?.rule_code, watchedRuleCodes, watchedSubjectType]);
+  const selectedDeviceCandidate = useMemo(
+    () =>
+      deviceCandidates.find(
+        (candidate) => candidate.device_id === watchedSubjectValue,
+      ),
+    [deviceCandidates, watchedSubjectValue],
+  );
+
+  const loadDeviceCandidates = useCallback(
+    async (ruleCode: string, search = '') => {
+      setDeviceSearching(true);
+      try {
+        const response = await api.get<LimitDeviceCandidate[]>(
+          '/admin/api/limit-whitelist/device-candidates',
+          {
+            params: {
+              rule_code: ruleCode,
+              keyword: search.trim() || undefined,
+              limit: 30,
+            },
+          },
+        );
+        setDeviceCandidates(response.data);
+      } catch (error) {
+        setDeviceCandidates([]);
+        message.error(errMsg(error, '设备候选加载失败'));
+      } finally {
+        setDeviceSearching(false);
+      }
+    },
+    [message],
+  );
+
+  const load = useCallback(async () => {
+    setLoading(true);
+    try {
+      const [ruleResponse, overrideResponse] = await Promise.all([
+        api.get<LimitRule[]>('/admin/api/limit-whitelist/rules'),
+        api.get<LimitOverrideList>('/admin/api/limit-whitelist', {
+          params: {
+            keyword: keyword.trim() || undefined,
+            subject_type: subjectType,
+            rule_code: ruleFilter,
+            offset: (page - 1) * pageSize,
+            limit: pageSize,
+          },
+        }),
+      ]);
+      setRules(ruleResponse.data);
+      setRows(overrideResponse.data.items);
+      setTotal(overrideResponse.data.total);
+    } catch (error) {
+      message.error(errMsg(error, '白名单数据加载失败'));
+    } finally {
+      setLoading(false);
+    }
+  }, [keyword, message, page, pageSize, ruleFilter, subjectType]);
+
+  useEffect(() => {
+    void load();
+  }, [load]);
+
+  const openCreate = () => {
+    setCreatePreset(null);
+    setDeviceCandidates([]);
+    setEditing(null);
+    setEditorRuleGroup(RULE_GROUPS[0]);
+    setEditorOpen(true);
+  };
+
+  const openEdit = (row: LimitOverride) => {
+    setEditing(row);
+    setEditorRuleGroup(row.rule_group);
+    setEditorOpen(true);
+  };
+
+  useEffect(() => {
+    const params = new URLSearchParams(window.location.search);
+    if (params.get('create') !== '1') return;
+    const subjectType = params.get('subject_type');
+    const subjectValue = params.get('subject_value');
+    const ruleCode = params.get('rule_code');
+    if (
+      (subjectType === 'phone' || subjectType === 'device') &&
+      subjectValue &&
+      ruleCode
+    ) {
+      setCreatePreset({
+        subject_type: subjectType,
+        subject_value: subjectValue,
+        rule_code: ruleCode,
+      });
+    }
+  }, []);
+
+  useEffect(() => {
+    if (!createPreset || rules.length === 0 || editorOpen) return;
+    const presetRule = rules.find(
+      (rule) => rule.code === createPreset.rule_code,
+    );
+    setEditorRuleGroup(presetRule?.group || RULE_GROUPS[0]);
+    setEditing(null);
+    setEditorOpen(true);
+  }, [createPreset, editorOpen, rules]);
+
+  const editorInitialValues = useMemo<Partial<OverrideFormValue>>(() => {
+    if (editing) {
+      return {
+        subject_type: editing.subject_type,
+        subject_value: editing.subject_value,
+        rule_codes: [editing.rule_code],
+        enabled: editing.enabled,
+        starts_at: editing.starts_at ? dayjs(editing.starts_at) : null,
+        expires_at: editing.expires_at ? dayjs(editing.expires_at) : null,
+        reason: editing.reason || '',
+      };
+    }
+    if (createPreset) {
+      return {
+        subject_type: createPreset.subject_type,
+        subject_value: createPreset.subject_value,
+        rule_codes: [createPreset.rule_code],
+        enabled: true,
+        expires_at: dayjs().add(1, 'day'),
+      };
+    }
+    return {
+      subject_type: 'phone',
+      rule_codes: [],
+      enabled: true,
+      expires_at: dayjs().add(1, 'day'),
+    };
+  }, [createPreset, editing]);
+
+  useEffect(() => {
+    if (
+      !editorOpen ||
+      editing ||
+      watchedSubjectType !== 'device' ||
+      !candidateRuleCode
+    ) {
+      return;
+    }
+    void loadDeviceCandidates(
+      candidateRuleCode,
+      createPreset?.subject_value || '',
+    );
+  }, [
+    createPreset?.subject_value,
+    editing,
+    editorOpen,
+    loadDeviceCandidates,
+    candidateRuleCode,
+    watchedSubjectType,
+  ]);
+
+  useEffect(
+    () => () => {
+      if (deviceSearchTimer.current) {
+        clearTimeout(deviceSearchTimer.current);
+      }
+    },
+    [],
+  );
+
+  const searchDevices = (value: string) => {
+    if (!candidateRuleCode) return;
+    if (deviceSearchTimer.current) {
+      clearTimeout(deviceSearchTimer.current);
+    }
+    deviceSearchTimer.current = setTimeout(() => {
+      void loadDeviceCandidates(candidateRuleCode, value);
+    }, 300);
+  };
+
+  const saveOverride = async () => {
+    let value: OverrideFormValue;
+    try {
+      value = await form.validateFields();
+    } catch {
+      return;
+    }
+    setSaving(true);
+    try {
+      if (editing) {
+        await api.patch(`/admin/api/limit-whitelist/${editing.id}`, {
+          enabled: value.enabled,
+          starts_at: asIso(value.starts_at),
+          expires_at: asIso(value.expires_at),
+          reason: value.reason || '',
+        });
+      } else {
+        await api.post('/admin/api/limit-whitelist/bulk', {
+          subject_type: value.subject_type,
+          subject_value: value.subject_value,
+          rule_codes: value.rule_codes,
+          enabled: value.enabled,
+          starts_at: asIso(value.starts_at),
+          expires_at: asIso(value.expires_at),
+          reason: value.reason || '',
+        });
+      }
+      message.success(
+        editing
+          ? '白名单配置已更新'
+          : `已新增 ${value.rule_codes.length} 条白名单配置`,
+      );
+      setEditorOpen(false);
+      setCreatePreset(null);
+      if (new URLSearchParams(window.location.search).get('create') === '1') {
+        window.history.replaceState({}, '', window.location.pathname);
+      }
+      await load();
+    } catch (error) {
+      message.error(errMsg(error));
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  const updateEnabled = async (row: LimitOverride, enabled: boolean) => {
+    try {
+      await api.patch(`/admin/api/limit-whitelist/${row.id}`, { enabled });
+      message.success(enabled ? '配置已启用' : '配置已停用');
+      await load();
+    } catch (error) {
+      message.error(errMsg(error));
+    }
+  };
+
+  const restoreGlobal = async (row: LimitOverride) => {
+    try {
+      await api.post(`/admin/api/limit-whitelist/${row.id}/reset`);
+      message.success('已停用例外配置并恢复全局策略');
+      await load();
+    } catch (error) {
+      message.error(errMsg(error));
+    }
+  };
+
+  const deleteRow = async (row: LimitOverride) => {
+    try {
+      await api.delete(`/admin/api/limit-whitelist/${row.id}`);
+      message.success('配置已删除');
+      if (rows.length === 1 && page > 1) {
+        setPage(page - 1);
+      } else {
+        await load();
+      }
+    } catch (error) {
+      message.error(errMsg(error));
+    }
+  };
+
+  const saveGlobal = async () => {
+    if (!globalRule || globalValue == null) return;
+    setGlobalSaving(true);
+    try {
+      await api.patch(`/admin/api/limit-whitelist/rules/${globalRule.code}`, {
+        value: globalValue,
+      });
+      message.success('全局限制已更新，业务接口即时读取新值');
+      setGlobalRule(null);
+      await load();
+    } catch (error) {
+      message.error(errMsg(error));
+    } finally {
+      setGlobalSaving(false);
+    }
+  };
+
+  const ruleColumns: ColumnsType<LimitRule> = [
+    {
+      title: '限制项',
+      key: 'rule',
+      render: (_, row) => <Text strong>{row.label}</Text>,
+    },
+    { title: '统计窗口', dataIndex: 'window_label', width: 180 },
+    {
+      title: '全局值',
+      dataIndex: 'global_limit',
+      width: 110,
+      render: (value) => <Text strong>{value}</Text>,
+    },
+    {
+      title: '可识别主体',
+      dataIndex: 'subject_types',
+      width: 150,
+      render: (values: LimitSubjectType[]) => (
+        <Space size={4}>
+          {values.map((value) => (
+            <Tag key={value}>{value === 'phone' ? '手机号' : '设备'}</Tag>
+          ))}
+        </Space>
+      ),
+    },
+    {
+      title: '操作',
+      width: 90,
+      render: (_, row) => (
+        <Button
+          type="link"
+          icon={<EditOutlined />}
+          onClick={() => {
+            setGlobalRule(row);
+            setGlobalValue(row.global_limit);
+          }}
+        >
+          修改
+        </Button>
+      ),
+    },
+  ];
+
+  const columns: ColumnsType<LimitOverride> = [
+    {
+      title: '主体',
+      key: 'subject',
+      width: 190,
+      render: (_, row) => (
+        <Space direction="vertical" size={0}>
+          <Tag color={row.subject_type === 'phone' ? 'blue' : 'cyan'}>
+            {row.subject_type === 'phone' ? '手机号' : '设备'}
+          </Tag>
+          <Text copyable={{ text: row.subject_value }}>{row.subject_value}</Text>
+        </Space>
+      ),
+    },
+    {
+      title: '限制项',
+      key: 'rule',
+      width: 250,
+      render: (_, row) => <Text>{row.rule_label}</Text>,
+    },
+    {
+      title: '白名单效果',
+      key: 'mode',
+      width: 145,
+      render: (_, row) =>
+        row.mode === 'suppress_alert' ? (
+          <Tag color="purple">免告警</Tag>
+        ) : row.mode === 'unlimited' ? (
+          <Tag color="green">临时不限</Tag>
+        ) : (
+          <Tag>历史配置</Tag>
+        ),
+    },
+    {
+      title: '实际值',
+      key: 'effective',
+      width: 120,
+      render: (_, row) =>
+        row.mode === 'suppress_alert'
+          ? '正常计数，免告警'
+          : row.effective_limit == null
+            ? '不限'
+            : `${row.effective_limit}（全局 ${row.global_limit}）`,
+    },
+    {
+      title: '有效期',
+      key: 'time',
+      width: 180,
+      render: (_, row) => (
+        <Space direction="vertical" size={0}>
+          <Text>{showTime(row.starts_at)}</Text>
+          <Text type="secondary">至 {showTime(row.expires_at)}</Text>
+        </Space>
+      ),
+    },
+    {
+      title: '状态',
+      key: 'status',
+      width: 115,
+      render: (_, row) => (
+        <Tag color={STATUS_META[row.status].color}>
+          {STATUS_META[row.status].label}
+        </Tag>
+      ),
+    },
+    { title: '原因', dataIndex: 'reason', ellipsis: true, render: (v) => v || '-' },
+    {
+      title: '启用',
+      key: 'enabled',
+      width: 80,
+      fixed: 'right',
+      render: (_, row) => (
+        <Switch
+          size="small"
+          checked={row.enabled}
+          disabled={row.mode === 'override'}
+          onChange={(checked) => void updateEnabled(row, checked)}
+        />
+      ),
+    },
+    {
+      title: '操作',
+      key: 'actions',
+      width: 210,
+      fixed: 'right',
+      render: (_, row) => (
+        <Space size={0}>
+          {row.mode !== 'override' && (
+            <Button type="link" icon={<EditOutlined />} onClick={() => openEdit(row)}>
+              编辑
+            </Button>
+          )}
+          {row.enabled && (
+            <Popconfirm
+              title="恢复全局策略？"
+              description="将停用这条白名单例外；历史流水、配置及审计记录都会保留。"
+              onConfirm={() => void restoreGlobal(row)}
+            >
+              <Button type="link" icon={<UndoOutlined />}>
+                恢复全局
+              </Button>
+            </Popconfirm>
+          )}
+          <Popconfirm
+            title="删除这条配置？"
+            onConfirm={() => void deleteRow(row)}
+          >
+            <Button type="link" danger icon={<DeleteOutlined />} />
+          </Popconfirm>
+        </Space>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <Space
+        align="start"
+        style={{ width: '100%', justifyContent: 'space-between', marginBottom: 16 }}
+      >
+        <div>
+          <Title level={2} style={{ marginBottom: 4 }}>
+            白名单
+          </Title>
+          <Text type="secondary">
+            统一管理限制全局值，并按手机号或设备设置临时白名单。
+          </Text>
+        </div>
+        <Space>
+          <Button icon={<ReloadOutlined />} onClick={() => void load()}>
+            刷新
+          </Button>
+          <Button type="primary" icon={<PlusOutlined />} onClick={openCreate}>
+            新增白名单
+          </Button>
+        </Space>
+      </Space>
+
+      <Alert
+        showIcon
+        type="info"
+        style={{ marginBottom: 16 }}
+        message="规则说明"
+        description="新增白名单后，普通限制项自动临时不限，风控限制项自动免告警；必须设置失效时间。“恢复全局”会停用白名单并立即重新使用全局限制。"
+      />
+
+      <Card title="全局限制" style={{ marginBottom: 16 }}>
+        <Tabs
+          activeKey={globalGroup}
+          onChange={setGlobalGroup}
+          items={RULE_GROUPS.map((group) => ({
+            key: group,
+            label: group,
+            children: (
+              <Table<LimitRule>
+                size="small"
+                rowKey="code"
+                pagination={false}
+                columns={ruleColumns}
+                dataSource={rules.filter((rule) => rule.group === group)}
+              />
+            ),
+          }))}
+        />
+      </Card>
+
+      <Card
+        title={`白名单配置（${total}）`}
+        extra={
+          <Space wrap>
+            <Select
+              allowClear
+              placeholder="主体类型"
+              style={{ width: 120 }}
+              value={subjectType}
+              onChange={(value) => {
+                setPage(1);
+                setSubjectType(value);
+              }}
+              options={[
+                { value: 'phone', label: '手机号' },
+                { value: 'device', label: '设备' },
+              ]}
+            />
+            <Select
+              allowClear
+              showSearch
+              optionFilterProp="label"
+              placeholder="限制项"
+              style={{ width: 240 }}
+              value={ruleFilter}
+              onChange={(value) => {
+                setPage(1);
+                setRuleFilter(value);
+              }}
+              options={rules.map((rule) => ({
+                value: rule.code,
+                label: rule.label,
+              }))}
+            />
+            <Input.Search
+              allowClear
+              placeholder="搜索手机号或设备"
+              style={{ width: 240 }}
+              value={keyword}
+              onChange={(event) => {
+                setPage(1);
+                setKeyword(event.target.value);
+              }}
+              onSearch={() => {
+                setPage(1);
+                void load();
+              }}
+            />
+          </Space>
+        }
+      >
+        <Table<LimitOverride>
+          rowKey="id"
+          loading={loading}
+          columns={columns}
+          dataSource={rows}
+          scroll={{ x: 1450 }}
+          pagination={{
+            current: page,
+            pageSize,
+            total,
+            showSizeChanger: true,
+            pageSizeOptions: [20, 50, 100],
+            showTotal: (count) => `共 ${count} 条`,
+            onChange: (nextPage, nextPageSize) => {
+              setPage(
+                nextPageSize !== pageSize ? 1 : nextPage,
+              );
+              setPageSize(nextPageSize);
+            },
+          }}
+        />
+      </Card>
+
+      <Modal
+        title={editing ? '编辑白名单配置' : '新增白名单配置'}
+        open={editorOpen}
+        okText="保存"
+        cancelText="取消"
+        confirmLoading={saving}
+        onOk={() => void saveOverride()}
+        onCancel={() => {
+          setEditorOpen(false);
+          setCreatePreset(null);
+          if (
+            new URLSearchParams(window.location.search).get('create') === '1'
+          ) {
+            window.history.replaceState({}, '', window.location.pathname);
+          }
+        }}
+        destroyOnHidden
+      >
+        <Form
+          form={form}
+          layout="vertical"
+          preserve={false}
+          initialValues={editorInitialValues}
+        >
+          <Form.Item
+            name="subject_type"
+            label="主体类型"
+            rules={[{ required: true }]}
+          >
+            <Select
+              disabled={!!editing}
+              onChange={(value: LimitSubjectType) => {
+                form.setFieldValue('subject_value', undefined);
+                setDeviceCandidates([]);
+                const compatibleCodes = new Set(
+                  rules
+                    .filter((rule) => rule.subject_types.includes(value))
+                    .map((rule) => rule.code),
+                );
+                let nextCodes = (form.getFieldValue('rule_codes') || []).filter(
+                  (code: string) => compatibleCodes.has(code),
+                );
+                if (
+                  value === 'device' &&
+                  new Set(nextCodes.map(deviceSourceScope)).size > 1
+                ) {
+                  nextCodes = [];
+                  void message.warning(
+                    '比价设备与短信/登录设备来自不同数据源，请重新选择同一类限制项',
+                  );
+                }
+                form.setFieldValue('rule_codes', nextCodes);
+              }}
+              options={[
+                { value: 'phone', label: '手机号' },
+                { value: 'device', label: '设备 ID' },
+              ]}
+            />
+          </Form.Item>
+          <Form.Item
+            name="rule_codes"
+            label="限制项"
+            rules={[{ required: true, message: '请选择限制项' }]}
+          >
+            <Checkbox.Group
+              disabled={!!editing}
+              style={{ width: '100%' }}
+              onChange={(values) => {
+                if (watchedSubjectType === 'device') {
+                  const nextCodes = values as string[];
+                  if (new Set(nextCodes.map(deviceSourceScope)).size > 1) {
+                    form.setFieldValue('rule_codes', watchedRuleCodes);
+                    void message.warning(
+                      '比价设备与短信/登录设备来自不同数据源，不能在同一白名单中混选',
+                    );
+                    return;
+                  }
+                  form.setFieldValue('subject_value', undefined);
+                  setDeviceCandidates([]);
+                }
+              }}
+            >
+              <Tabs
+                size="small"
+                activeKey={editorRuleGroup}
+                onChange={setEditorRuleGroup}
+                items={RULE_GROUPS.map((group) => {
+                  const groupRules = rules.filter(
+                    (rule) => rule.group === group,
+                  );
+                  const selectedCount = groupRules.filter((rule) =>
+                    watchedRuleCodes.includes(rule.code),
+                  ).length;
+                  const selectedDeviceScopes = new Set(
+                    watchedRuleCodes.map(deviceSourceScope),
+                  );
+                  return {
+                    key: group,
+                    label: `${group}${selectedCount ? ` (${selectedCount})` : ''}`,
+                    children: (
+                      <Space direction="vertical" size={10}>
+                        {groupRules.map((rule) => {
+                          const deviceScope = deviceSourceScope(rule.code);
+                          const incompatibleDeviceScope =
+                            watchedSubjectType === 'device' &&
+                            selectedDeviceScopes.size >= 1 &&
+                            !watchedRuleCodes.includes(rule.code) &&
+                            !selectedDeviceScopes.has(deviceScope);
+                          return (
+                            <Checkbox
+                              key={rule.code}
+                              value={rule.code}
+                              disabled={
+                                !rule.subject_types.includes(
+                                  watchedSubjectType || 'phone',
+                                ) || incompatibleDeviceScope
+                              }
+                            >
+                              {rule.label}
+                            </Checkbox>
+                          );
+                        })}
+                      </Space>
+                    ),
+                  };
+                })}
+              />
+            </Checkbox.Group>
+          </Form.Item>
+          <Form.Item
+            label={watchedSubjectType === 'device' ? '选择设备' : '手机号'}
+            extra={
+              watchedSubjectType === 'device'
+                ? '可按手机号、用户 ID、设备型号或设备 ID 搜索；候选设备按最近活跃时间排序。'
+                : undefined
+            }
+          >
+            <Form.Item
+              name="subject_value"
+              noStyle
+              rules={[
+                {
+                  required: true,
+                  message:
+                    watchedSubjectType === 'device'
+                      ? '请选择设备'
+                      : '请输入手机号',
+                },
+              ]}
+            >
+              {editing ? (
+                <Input disabled maxLength={128} />
+              ) : watchedSubjectType === 'device' ? (
+                <Select
+                  showSearch
+                  filterOption={false}
+                  loading={deviceSearching}
+                  disabled={!candidateRuleCode}
+                  placeholder={
+                    candidateRuleCode
+                      ? '输入手机号、用户 ID、设备型号或设备 ID'
+                      : '请先选择限制项'
+                  }
+                  onSearch={searchDevices}
+                  onOpenChange={(open) => {
+                    if (
+                      open &&
+                      candidateRuleCode &&
+                      deviceCandidates.length === 0
+                    ) {
+                      void loadDeviceCandidates(candidateRuleCode);
+                    }
+                  }}
+                  notFoundContent={
+                    deviceSearching ? '正在搜索设备…' : '未找到匹配设备'
+                  }
+                  options={deviceCandidates.map((candidate) => ({
+                    value: candidate.device_id,
+                    label: candidate.device_id,
+                  }))}
+                  labelRender={({ value, label }) => {
+                    const candidate = deviceCandidates.find(
+                      (item) => item.device_id === value,
+                    );
+                    if (!candidate) return label;
+                    return (
+                      <Space size={6}>
+                        <Text
+                          ellipsis={{ tooltip: candidate.device_id }}
+                          style={{ maxWidth: 320 }}
+                        >
+                          {candidate.device_id}
+                        </Text>
+                        <Tag color="blue" style={{ marginInlineEnd: 0 }}>
+                          {candidate.source_label}
+                        </Tag>
+                      </Space>
+                    );
+                  }}
+                  optionRender={(option) => {
+                    const candidate = deviceCandidates.find(
+                      (item) => item.device_id === option.value,
+                    );
+                    if (!candidate) return option.label;
+                    const owner =
+                      [
+                        candidate.phone,
+                        candidate.user_id
+                          ? `用户 #${candidate.user_id}`
+                          : null,
+                        candidate.username || candidate.nickname,
+                        candidate.device_model,
+                      ]
+                        .filter(Boolean)
+                        .join(' · ') || '暂未关联用户或机型';
+                    return (
+                      <div style={{ paddingBlock: 4 }}>
+                        <Space size={6}>
+                          <Text strong>{candidate.device_id}</Text>
+                          <Tag color="blue" style={{ marginInlineEnd: 0 }}>
+                            {candidate.source_label}
+                          </Tag>
+                        </Space>
+                        <div
+                          style={{
+                            display: 'flex',
+                            justifyContent: 'space-between',
+                            gap: 12,
+                            marginTop: 3,
+                          }}
+                        >
+                          <Text
+                            type="secondary"
+                            ellipsis={{ tooltip: owner }}
+                            style={{ minWidth: 0, fontSize: 12 }}
+                          >
+                            {owner}
+                          </Text>
+                          <Text
+                            type="secondary"
+                            style={{ flexShrink: 0, fontSize: 12 }}
+                          >
+                            最近活跃 {showTime(candidate.last_active_at)}
+                          </Text>
+                        </div>
+                      </div>
+                    );
+                  }}
+                />
+              ) : (
+                <Input maxLength={20} placeholder="请输入手机号" />
+              )}
+            </Form.Item>
+            {!editing &&
+              watchedSubjectType === 'device' &&
+              selectedDeviceCandidate && (
+                <div
+                  style={{
+                    display: 'grid',
+                    gridTemplateColumns: '1fr 1fr',
+                    gap: '4px 16px',
+                    marginTop: 8,
+                    padding: '10px 12px',
+                    border: '1px solid #f0f0f0',
+                    borderRadius: 6,
+                    background: '#fafafa',
+                  }}
+                >
+                  <Text type="secondary">
+                    关联用户：
+                    <Text>
+                      {selectedDeviceCandidate.phone ||
+                        selectedDeviceCandidate.username ||
+                        selectedDeviceCandidate.nickname ||
+                        '未关联'}
+                    </Text>
+                  </Text>
+                  <Text type="secondary">
+                    设备型号：
+                    <Text>{selectedDeviceCandidate.device_model || '-'}</Text>
+                  </Text>
+                  <Text type="secondary" style={{ gridColumn: '1 / -1' }}>
+                    最近活跃：
+                    <Text>
+                      {showTime(selectedDeviceCandidate.last_active_at)}
+                    </Text>
+                  </Text>
+                </div>
+              )}
+          </Form.Item>
+          <Form.Item name="starts_at" label="生效时间">
+            <DatePicker showTime style={{ width: '100%' }} placeholder="立即生效" />
+          </Form.Item>
+          <Form.Item
+            name="expires_at"
+            label="失效时间"
+            rules={[
+              { required: true, message: '请选择失效时间' },
+              {
+                validator: async (_, value) => {
+                  if (value && value.valueOf() <= dayjs().valueOf()) {
+                    throw new Error('失效时间必须晚于当前时间');
+                  }
+                },
+              },
+            ]}
+          >
+            <DatePicker
+              showTime
+              style={{ width: '100%' }}
+              placeholder="请选择失效时间"
+            />
+          </Form.Item>
+          <Form.Item name="enabled" label="启用" valuePropName="checked">
+            <Switch />
+          </Form.Item>
+          <Form.Item name="reason" label="配置原因">
+            <Input.TextArea maxLength={256} showCount rows={3} />
+          </Form.Item>
+        </Form>
+      </Modal>
+
+      <Modal
+        title={`修改全局限制：${globalRule?.label || ''}`}
+        open={!!globalRule}
+        okText="保存"
+        cancelText="取消"
+        confirmLoading={globalSaving}
+        onOk={() => void saveGlobal()}
+        onCancel={() => setGlobalRule(null)}
+      >
+        <Alert
+          type="warning"
+          showIcon
+          style={{ marginBottom: 16 }}
+          message="保存后所有未覆盖该规则的用户立即使用新值。"
+        />
+        <InputNumber
+          value={globalValue}
+          min={globalRule?.min_value}
+          max={globalRule?.max_value}
+          precision={0}
+          style={{ width: '100%' }}
+          onChange={setGlobalValue}
+        />
+        <Text type="secondary">
+          允许范围：{globalRule?.min_value}～{globalRule?.max_value}；系统初始值：
+          {globalRule?.default_limit}
+        </Text>
+      </Modal>
+    </div>
+  );
+}
diff --git a/src/app/(main)/risk-monitor/page.tsx b/src/app/(main)/risk-monitor/page.tsx
index 3d46201..f0e5b74 100644
--- a/src/app/(main)/risk-monitor/page.tsx
+++ b/src/app/(main)/risk-monitor/page.tsx
@@ -19,6 +19,7 @@ import {
   CopyOutlined,
   DownOutlined,
   EditOutlined,
+  PlusCircleOutlined,
   ReloadOutlined,
   RightOutlined,
 } from '@ant-design/icons';
@@ -69,8 +70,8 @@ type IncidentStatus = 'open' | 'blocked';
 const RULE_LIMITS: Record<RiskKind, { min: number; max: number; help: string }> = {
   sms: {
     min: 1,
-    max: 5,
-    help: '统计成功下发；最高5次，与现有每设备每小时发送上限一致。',
+    max: 100000,
+    help: '统计成功下发；告警阈值与短信硬限制分别配置。',
   },
   oneclick: {
     min: 1,
@@ -79,8 +80,8 @@ const RULE_LIMITS: Record<RiskKind, { min: number; max: number; help: string }>
   },
   compare: {
     min: 1,
-    max: 100,
-    help: '同一账户按北京时间自然日累计；最高100次，与比价每日上限一致。',
+    max: 100000,
+    help: '同一账户按北京时间自然日累计；告警阈值与比价硬限制分别配置。',
   },
 };
 const utcTime = (value: string | null, withDate = true) =>
@@ -597,6 +598,40 @@ export default function RiskMonitorPage() {
     [lists, loadAll, message, modal],
   );
 
+  const addToWhitelist = useCallback(
+    (row: RiskIncidentItem) => {
+      const isCompare = row.kind === 'compare';
+      const subjectValue = isCompare ? row.phone : row.subject_id;
+      if (!isCompare && subjectValue?.startsWith('legacy-ip:')) {
+        void message.error(
+          '旧客户端未上报真实设备 ID，无法加入设备白名单，请升级客户端后重试',
+        );
+        return;
+      }
+      if (!subjectValue) {
+        void message.error(
+          isCompare
+            ? '该风险记录没有关联手机号，暂时无法加入白名单'
+            : '该风险记录没有设备 ID，暂时无法加入白名单',
+        );
+        return;
+      }
+      const ruleCode: Record<RiskKind, string> = {
+        sms: 'risk.sms.hourly',
+        oneclick: 'risk.oneclick.daily',
+        compare: 'risk.compare.daily',
+      };
+      const params = new URLSearchParams({
+        create: '1',
+        subject_type: isCompare ? 'phone' : 'device',
+        subject_value: subjectValue,
+        rule_code: ruleCode[row.kind],
+      });
+      window.location.assign(`/limit-whitelist?${params.toString()}`);
+    },
+    [message],
+  );
+
   const columns = useCallback(
     (kind: RiskKind): ColumnsType<RiskIncidentItem> => {
       const actionColumn = {
@@ -604,9 +639,12 @@ export default function RiskMonitorPage() {
         key: 'actions',
         align: 'right' as const,
         fixed: 'right' as const,
-        width: 180,
+        width: 280,
         render: (_: unknown, row: RiskIncidentItem) => {
           const open = expanded.has(row.incident_id);
+          const canAddToWhitelist =
+            row.kind === 'compare' ||
+            !row.subject_id.startsWith('legacy-ip:');
           return (
             <span className={styles.actionGroup}>
               <Button
@@ -618,6 +656,24 @@ export default function RiskMonitorPage() {
               >
                 {open ? '收起' : '展开'}
               </Button>
+              <Tooltip
+                title={
+                  canAddToWhitelist
+                    ? undefined
+                    : '旧客户端未上报真实设备 ID，无法加入设备白名单'
+                }
+              >
+                <span>
+                  <Button
+                    size="small"
+                    icon={<PlusCircleOutlined />}
+                    disabled={!canAddToWhitelist}
+                    onClick={() => addToWhitelist(row)}
+                  >
+                    加入白名单
+                  </Button>
+                </span>
+              </Tooltip>
               {row.status === 'open' && (
                 <>
                   <Button
@@ -700,7 +756,16 @@ export default function RiskMonitorPage() {
         actionColumn,
       ];
     },
-    [acting, copy, detailLoading, expanded, revokeRestriction, runAction, toggle],
+    [
+      acting,
+      addToWhitelist,
+      copy,
+      detailLoading,
+      expanded,
+      revokeRestriction,
+      runAction,
+      toggle,
+    ],
   );
 
   const cards = useMemo(() => {
diff --git a/src/lib/types.ts b/src/lib/types.ts
index de37144..e433edf 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -414,14 +414,14 @@ export interface FeedbackQrConfig {
   updated_at: string | null;
 }
 
-/** 领券等候浮层的「新手引导视频」配置(前 3 次用它替代广告,每次固定 120 金币)。
+/** 领券等候浮层的「新手引导视频」配置(前 3 次用它替代广告,默认每次固定 100 金币)。
  *  后台只开放 enabled + 换片;下面几个字段接口仍返回,但页面不展示、也不回传。 */
 export interface GuideVideoConfig {
   scene: 'coupon' | 'comparison';
   enabled: boolean;
   video_url: string | null; // /media/guide_video/xxx.mp4;null = 未配片(浮层照旧只放广告)
   max_plays: number; // 每个账号前 N 次浮层放引导视频(服务端默认 3,后台不开放调整)
-  reward_coin: number; // 每次固定金币(服务端默认 120,播完 / 中途关闭都发)
+  reward_coin: number; // 每次固定金币(服务端默认 100,播完 / 中途关闭都发)
   updated_at: string | null;
   total_plays: number; // 只读统计:全站已播次数(后台不再展示)
   granted_plays: number; // 只读统计:其中已发币次数(后台不再展示)
@@ -895,3 +895,65 @@ export interface HealthTrendPoint extends HealthMetrics {
 export interface HealthBreakdownRow extends HealthMetrics {
   key: string; // 维度值(event 名 / app_ver / oem);缺失为 "(unknown)"
 }
+
+// ===== 统一限制策略 / 白名单 =====
+export type LimitSubjectType = 'phone' | 'device';
+export type LimitPolicyMode =
+  | 'inherit'
+  | 'override'
+  | 'unlimited'
+  | 'suppress_alert';
+
+export interface LimitRule {
+  code: string;
+  label: string;
+  group: string;
+  global_limit: number;
+  default_limit: number;
+  window_label: string;
+  subject_types: LimitSubjectType[];
+  allowed_modes: LimitPolicyMode[];
+  min_value: number;
+  max_value: number;
+  supports_reset: boolean;
+  alert_only: boolean;
+}
+
+export interface LimitDeviceCandidate {
+  device_id: string;
+  source: string;
+  source_label: string;
+  user_id: number | null;
+  username: string | null;
+  phone: string | null;
+  nickname: string | null;
+  device_model: string | null;
+  last_active_at: string;
+}
+
+export interface LimitOverride {
+  id: number;
+  subject_type: LimitSubjectType;
+  subject_value: string;
+  rule_code: string;
+  rule_label: string;
+  rule_group: string;
+  mode: LimitPolicyMode;
+  limit_value: number | null;
+  global_limit: number;
+  effective_limit: number | null;
+  enabled: boolean;
+  starts_at: string | null;
+  expires_at: string | null;
+  reset_at: string | null;
+  reason: string | null;
+  status: 'active' | 'scheduled' | 'expired' | 'disabled';
+  created_by_admin_id: number | null;
+  created_at: string;
+  updated_at: string;
+}
+
+export interface LimitOverrideList {
+  items: LimitOverride[];
+  total: number;
+}
-- 
2.52.0


From e98402d75c67e62e4e7758eea65c32809d832f6c Mon Sep 17 00:00:00 2001
From: linkeyu <798648091@qq.com>
Date: Thu, 30 Jul 2026 20:21:20 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E7=99=BD=E5=90=8D=E5=8D=95=E9=85=8D=E7=BD=AE=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92=E4=B8=8E=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(main)/limit-whitelist/page.tsx | 713 +++++++++++++++---------
 src/lib/types.ts                        |  15 +
 2 files changed, 478 insertions(+), 250 deletions(-)

diff --git a/src/app/(main)/limit-whitelist/page.tsx b/src/app/(main)/limit-whitelist/page.tsx
index 57cc458..8add99b 100644
--- a/src/app/(main)/limit-whitelist/page.tsx
+++ b/src/app/(main)/limit-whitelist/page.tsx
@@ -12,7 +12,7 @@ import {
   Input,
   InputNumber,
   Modal,
-  Popconfirm,
+  Popover,
   Select,
   Space,
   Switch,
@@ -22,21 +22,16 @@ import {
   Typography,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
-import {
-  DeleteOutlined,
-  EditOutlined,
-  PlusOutlined,
-  ReloadOutlined,
-  UndoOutlined,
-} from '@ant-design/icons';
+import { EditOutlined, PlusOutlined, SearchOutlined } from '@ant-design/icons';
 import dayjs, { type Dayjs } from 'dayjs';
 
 import { api, errMsg } from '@/lib/api';
 import type {
   LimitDeviceCandidate,
   LimitOverride,
-  LimitOverrideList,
   LimitRule,
+  LimitSubject,
+  LimitSubjectList,
   LimitSubjectType,
 } from '@/lib/types';
 
@@ -60,9 +55,8 @@ interface OverrideFormValue {
   subject_type: LimitSubjectType;
   subject_value: string;
   rule_codes: string[];
-  enabled: boolean;
-  starts_at?: Dayjs | null;
-  expires_at?: Dayjs | null;
+  enabled?: boolean;
+  valid_range?: [Dayjs, Dayjs] | null;
   reason?: string;
 }
 
@@ -72,24 +66,41 @@ interface CreatePreset {
   rule_code: string;
 }
 
+interface WhitelistFilters {
+  keyword: string;
+  subjectType?: LimitSubjectType;
+  ruleCode?: string;
+}
+
 const asIso = (value?: Dayjs | null) => (value ? value.toISOString() : null);
 const showTime = (value: string | null) =>
   value ? dayjs(value).format('YYYY-MM-DD HH:mm') : '-';
+const normalizeSubjectValue = (
+  subjectType: LimitSubjectType,
+  value: string,
+) =>
+  subjectType === 'phone'
+    ? value.replace(/\D/g, '')
+    : value.trim();
 
 export default function LimitWhitelistPage() {
-  const { message } = App.useApp();
+  const { message, modal } = App.useApp();
   const [rules, setRules] = useState<LimitRule[]>([]);
-  const [rows, setRows] = useState<LimitOverride[]>([]);
+  const [rows, setRows] = useState<LimitSubject[]>([]);
   const [total, setTotal] = useState(0);
   const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(20);
+  const [pageSize, setPageSize] = useState(10);
   const [loading, setLoading] = useState(true);
   const [keyword, setKeyword] = useState('');
   const [subjectType, setSubjectType] = useState<LimitSubjectType | undefined>();
   const [ruleFilter, setRuleFilter] = useState<string | undefined>();
-  const [editing, setEditing] = useState<LimitOverride | null>(null);
+  const [appliedFilters, setAppliedFilters] = useState<WhitelistFilters>({
+    keyword: '',
+  });
+  const [editing, setEditing] = useState<LimitSubject | null>(null);
   const [editorOpen, setEditorOpen] = useState(false);
   const [saving, setSaving] = useState(false);
+  const [togglingSubject, setTogglingSubject] = useState<string | null>(null);
   const [createPreset, setCreatePreset] = useState<CreatePreset | null>(null);
   const [deviceCandidates, setDeviceCandidates] = useState<
     LimitDeviceCandidate[]
@@ -105,6 +116,11 @@ export default function LimitWhitelistPage() {
   const watchedRuleCodes = Form.useWatch('rule_codes', form) || [];
   const watchedSubjectType = Form.useWatch('subject_type', form);
   const watchedSubjectValue = Form.useWatch('subject_value', form);
+  const effectiveSubjectType =
+    watchedSubjectType ||
+    editing?.subject_type ||
+    createPreset?.subject_type ||
+    'phone';
   const candidateRuleCode = useMemo(() => {
     if (watchedSubjectType === 'device') {
       const scopes = new Set(watchedRuleCodes.map(deviceSourceScope));
@@ -153,11 +169,11 @@ export default function LimitWhitelistPage() {
     try {
       const [ruleResponse, overrideResponse] = await Promise.all([
         api.get<LimitRule[]>('/admin/api/limit-whitelist/rules'),
-        api.get<LimitOverrideList>('/admin/api/limit-whitelist', {
+        api.get<LimitSubjectList>('/admin/api/limit-whitelist/subjects', {
           params: {
-            keyword: keyword.trim() || undefined,
-            subject_type: subjectType,
-            rule_code: ruleFilter,
+            keyword: appliedFilters.keyword.trim() || undefined,
+            subject_type: appliedFilters.subjectType,
+            rule_code: appliedFilters.ruleCode,
             offset: (page - 1) * pageSize,
             limit: pageSize,
           },
@@ -171,12 +187,21 @@ export default function LimitWhitelistPage() {
     } finally {
       setLoading(false);
     }
-  }, [keyword, message, page, pageSize, ruleFilter, subjectType]);
+  }, [appliedFilters, message, page, pageSize]);
 
   useEffect(() => {
     void load();
   }, [load]);
 
+  const applyFilters = () => {
+    setPage(1);
+    setAppliedFilters({
+      keyword,
+      subjectType,
+      ruleCode: ruleFilter,
+    });
+  };
+
   const openCreate = () => {
     setCreatePreset(null);
     setDeviceCandidates([]);
@@ -185,9 +210,12 @@ export default function LimitWhitelistPage() {
     setEditorOpen(true);
   };
 
-  const openEdit = (row: LimitOverride) => {
+  const openEdit = (row: LimitSubject) => {
     setEditing(row);
-    setEditorRuleGroup(row.rule_group);
+    const firstSelectedGroup = RULE_GROUPS.find(
+      (group) => (row.group_counts[group] || 0) > 0,
+    );
+    setEditorRuleGroup(firstSelectedGroup || RULE_GROUPS[0]);
     setEditorOpen(true);
   };
 
@@ -222,14 +250,25 @@ export default function LimitWhitelistPage() {
 
   const editorInitialValues = useMemo<Partial<OverrideFormValue>>(() => {
     if (editing) {
+      const startsAt = editing.items
+        .map((item) => item.starts_at)
+        .filter((value): value is string => Boolean(value))
+        .sort();
+      const expiresAt = editing.items
+        .map((item) => item.expires_at)
+        .filter((value): value is string => Boolean(value))
+        .sort()
+        .at(-1);
+      const reasons = new Set(editing.items.map((item) => item.reason || ''));
       return {
         subject_type: editing.subject_type,
         subject_value: editing.subject_value,
-        rule_codes: [editing.rule_code],
-        enabled: editing.enabled,
-        starts_at: editing.starts_at ? dayjs(editing.starts_at) : null,
-        expires_at: editing.expires_at ? dayjs(editing.expires_at) : null,
-        reason: editing.reason || '',
+        rule_codes: editing.items.map((item) => item.rule_code),
+        enabled: editing.items.every((item) => item.enabled),
+        valid_range: expiresAt
+          ? [startsAt[0] ? dayjs(startsAt[0]) : dayjs(), dayjs(expiresAt)]
+          : null,
+        reason: reasons.size === 1 ? Array.from(reasons)[0] : '',
       };
     }
     if (createPreset) {
@@ -237,17 +276,15 @@ export default function LimitWhitelistPage() {
         subject_type: createPreset.subject_type,
         subject_value: createPreset.subject_value,
         rule_codes: [createPreset.rule_code],
-        enabled: true,
-        expires_at: dayjs().add(1, 'day'),
+        valid_range: [dayjs(), dayjs().add(1, 'month')],
       };
     }
     return {
       subject_type: 'phone',
       rule_codes: [],
-      enabled: true,
-      expires_at: dayjs().add(1, 'day'),
+      valid_range: [dayjs(), dayjs().add(1, 'month')],
     };
-  }, [createPreset, editing]);
+  }, [createPreset, editing, editorOpen]);
 
   useEffect(() => {
     if (
@@ -297,23 +334,87 @@ export default function LimitWhitelistPage() {
     } catch {
       return;
     }
+    const normalizedSubjectValue = normalizeSubjectValue(
+      value.subject_type,
+      value.subject_value,
+    );
+    if (!normalizedSubjectValue) {
+      message.error(
+        value.subject_type === 'phone'
+          ? '请输入有效手机号'
+          : '请选择有效设备',
+      );
+      return;
+    }
+    if (!editing) {
+      setSaving(true);
+      let existingSubject: LimitSubject | undefined;
+      try {
+        const response = await api.get<LimitSubjectList>(
+          '/admin/api/limit-whitelist/subjects',
+          {
+            params: {
+              subject_type: value.subject_type,
+              keyword: normalizedSubjectValue,
+              offset: 0,
+              limit: 100,
+            },
+          },
+        );
+        existingSubject = response.data.items.find(
+          (item) =>
+            item.subject_type === value.subject_type &&
+            item.subject_value === normalizedSubjectValue,
+        );
+      } catch (error) {
+        message.error(errMsg(error, '白名单重复配置检查失败'));
+        return;
+      } finally {
+        setSaving(false);
+      }
+
+      if (existingSubject) {
+        const isPhone = value.subject_type === 'phone';
+        const confirmed = await new Promise<boolean>((resolve) => {
+          modal.confirm({
+            title: isPhone
+              ? '该手机号已有白名单配置'
+              : '该设备已有白名单配置',
+            content: isPhone
+              ? '该手机号已有白名单配置，新增配置是以追加配置的方式；有效期将统一为本次配置的有效期。'
+              : '该设备已有白名单配置，新增配置是以追加配置的方式；有效期将统一为本次配置的有效期。',
+            okText: '确认追加',
+            cancelText: '取消',
+            onOk: () => resolve(true),
+            onCancel: () => resolve(false),
+          });
+        });
+        if (!confirmed) return;
+      }
+    }
+
     setSaving(true);
     try {
+      const [startsAt, expiresAt] = value.valid_range || [];
+      const enabled = editing ? value.enabled : true;
       if (editing) {
-        await api.patch(`/admin/api/limit-whitelist/${editing.id}`, {
-          enabled: value.enabled,
-          starts_at: asIso(value.starts_at),
-          expires_at: asIso(value.expires_at),
+        await api.put('/admin/api/limit-whitelist/subjects', {
+          subject_type: value.subject_type,
+          subject_value: normalizedSubjectValue,
+          rule_codes: value.rule_codes,
+          enabled,
+          starts_at: asIso(startsAt),
+          expires_at: asIso(expiresAt),
           reason: value.reason || '',
         });
       } else {
         await api.post('/admin/api/limit-whitelist/bulk', {
           subject_type: value.subject_type,
-          subject_value: value.subject_value,
+          subject_value: normalizedSubjectValue,
           rule_codes: value.rule_codes,
-          enabled: value.enabled,
-          starts_at: asIso(value.starts_at),
-          expires_at: asIso(value.expires_at),
+          enabled,
+          starts_at: asIso(startsAt),
+          expires_at: asIso(expiresAt),
           reason: value.reason || '',
         });
       }
@@ -335,40 +436,6 @@ export default function LimitWhitelistPage() {
     }
   };
 
-  const updateEnabled = async (row: LimitOverride, enabled: boolean) => {
-    try {
-      await api.patch(`/admin/api/limit-whitelist/${row.id}`, { enabled });
-      message.success(enabled ? '配置已启用' : '配置已停用');
-      await load();
-    } catch (error) {
-      message.error(errMsg(error));
-    }
-  };
-
-  const restoreGlobal = async (row: LimitOverride) => {
-    try {
-      await api.post(`/admin/api/limit-whitelist/${row.id}/reset`);
-      message.success('已停用例外配置并恢复全局策略');
-      await load();
-    } catch (error) {
-      message.error(errMsg(error));
-    }
-  };
-
-  const deleteRow = async (row: LimitOverride) => {
-    try {
-      await api.delete(`/admin/api/limit-whitelist/${row.id}`);
-      message.success('配置已删除');
-      if (rows.length === 1 && page > 1) {
-        setPage(page - 1);
-      } else {
-        await load();
-      }
-    } catch (error) {
-      message.error(errMsg(error));
-    }
-  };
-
   const saveGlobal = async () => {
     if (!globalRule || globalValue == null) return;
     setGlobalSaving(true);
@@ -386,6 +453,25 @@ export default function LimitWhitelistPage() {
     }
   };
 
+  const toggleSubject = async (row: LimitSubject, enabled: boolean) => {
+    const subjectKey = `${row.subject_type}:${row.subject_value}`;
+    setTogglingSubject(subjectKey);
+    try {
+      await api.patch('/admin/api/limit-whitelist/subjects/enabled', {
+        subject_type: row.subject_type,
+        subject_value: row.subject_value,
+        enabled,
+      });
+      message.success(enabled ? '白名单已启用' : '白名单已停用');
+      await load();
+    } catch (error) {
+      message.error(errMsg(error, '白名单启用状态更新失败'));
+      await load();
+    } finally {
+      setTogglingSubject(null);
+    }
+  };
+
   const ruleColumns: ColumnsType<LimitRule> = [
     {
       title: '限制项',
@@ -429,126 +515,250 @@ export default function LimitWhitelistPage() {
     },
   ];
 
-  const columns: ColumnsType<LimitOverride> = [
+  const columns: ColumnsType<LimitSubject> = [
     {
       title: '主体',
       key: 'subject',
-      width: 190,
+      width: 300,
       render: (_, row) => (
-        <Space direction="vertical" size={0}>
-          <Tag color={row.subject_type === 'phone' ? 'blue' : 'cyan'}>
-            {row.subject_type === 'phone' ? '手机号' : '设备'}
-          </Tag>
-          <Text copyable={{ text: row.subject_value }}>{row.subject_value}</Text>
+        <Space size={8}>
+          {row.subject_type === 'device' && <Tag color="cyan">设备</Tag>}
+          <Button
+            type="link"
+            style={{ height: 'auto', padding: 0, textAlign: 'left' }}
+            onClick={() => openEdit(row)}
+          >
+            {row.subject_value}
+          </Button>
         </Space>
       ),
     },
     {
       title: '限制项',
       key: 'rule',
-      width: 250,
-      render: (_, row) => <Text>{row.rule_label}</Text>,
-    },
-    {
-      title: '白名单效果',
-      key: 'mode',
-      width: 145,
-      render: (_, row) =>
-        row.mode === 'suppress_alert' ? (
-          <Tag color="purple">免告警</Tag>
-        ) : row.mode === 'unlimited' ? (
-          <Tag color="green">临时不限</Tag>
-        ) : (
-          <Tag>历史配置</Tag>
-        ),
-    },
-    {
-      title: '实际值',
-      key: 'effective',
-      width: 120,
-      render: (_, row) =>
-        row.mode === 'suppress_alert'
-          ? '正常计数，免告警'
-          : row.effective_limit == null
-            ? '不限'
-            : `${row.effective_limit}（全局 ${row.global_limit}）`,
+      render: (_, row) => {
+        const groupCounts = Object.fromEntries(
+          RULE_GROUPS.map((group) => [
+            group,
+            row.items.filter((item) => item.rule_group === group).length,
+          ]),
+        );
+        return (
+          <Popover
+            trigger={['hover', 'click']}
+            placement="topLeft"
+            mouseEnterDelay={0.15}
+            title="限制项明细"
+            content={
+              <div
+                style={{
+                  width: 380,
+                  maxHeight: 420,
+                  overflowY: 'auto',
+                  paddingRight: 4,
+                }}
+              >
+                {RULE_GROUPS.map((group, groupIndex) => {
+                  const items = row.items.filter(
+                    (item) => item.rule_group === group,
+                  );
+                  return (
+                    <div
+                      key={group}
+                      style={{
+                        paddingBlock: 8,
+                        borderTop:
+                          groupIndex === 0 ? undefined : '1px solid #f0f0f0',
+                      }}
+                    >
+                      <div
+                        style={{
+                          display: 'flex',
+                          alignItems: 'center',
+                          justifyContent: 'space-between',
+                          marginBottom: items.length ? 4 : 0,
+                        }}
+                      >
+                        <Text strong>{group}</Text>
+                        <Text type="secondary">{items.length} 项</Text>
+                      </div>
+                      {items.length ? (
+                        items.map((item) => (
+                          <div
+                            key={item.id}
+                            style={{
+                              display: 'flex',
+                              alignItems: 'center',
+                              justifyContent: 'space-between',
+                              gap: 12,
+                              minHeight: 30,
+                              paddingLeft: 12,
+                            }}
+                          >
+                            <Text>{item.rule_label}</Text>
+                            <Tag
+                              color={STATUS_META[item.status].color}
+                              style={{ flexShrink: 0, marginInlineEnd: 0 }}
+                            >
+                              {STATUS_META[item.status].label}
+                            </Tag>
+                          </div>
+                        ))
+                      ) : (
+                        <Text type="secondary" style={{ paddingLeft: 12 }}>
+                          暂无配置
+                        </Text>
+                      )}
+                    </div>
+                  );
+                })}
+              </div>
+            }
+          >
+            <div
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                flexWrap: 'wrap',
+                gap: '8px 18px',
+                cursor: 'help',
+              }}
+            >
+              {RULE_GROUPS.map((group) => {
+                const count = groupCounts[group] || 0;
+                return (
+                  <span
+                    key={group}
+                    style={{
+                      display: 'inline-flex',
+                      alignItems: 'center',
+                      gap: 6,
+                      whiteSpace: 'nowrap',
+                    }}
+                  >
+                    {group}
+                    <span
+                      style={{
+                        display: 'inline-flex',
+                        alignItems: 'center',
+                        justifyContent: 'center',
+                        minWidth: 22,
+                        height: 22,
+                        padding: '0 6px',
+                        borderRadius: 6,
+                        border: '1px solid #d9d9d9',
+                        background: '#fafafa',
+                        color: 'rgba(0, 0, 0, 0.65)',
+                        fontSize: 12,
+                        lineHeight: 1,
+                      }}
+                    >
+                      {count}
+                    </span>
+                  </span>
+                );
+              })}
+            </div>
+          </Popover>
+        );
+      },
     },
     {
       title: '有效期',
       key: 'time',
-      width: 180,
-      render: (_, row) => (
-        <Space direction="vertical" size={0}>
-          <Text>{showTime(row.starts_at)}</Text>
-          <Text type="secondary">至 {showTime(row.expires_at)}</Text>
-        </Space>
-      ),
+      width: 190,
+      render: (_, row) => {
+        const startsAt = Array.from(
+          new Set(row.items.map((item) => item.starts_at)),
+        );
+        const expiresAt = Array.from(
+          new Set(row.items.map((item) => item.expires_at)),
+        ).sort();
+        if (startsAt.length === 1 && expiresAt.length === 1) {
+          return (
+            <Space direction="vertical" size={0}>
+              <Text>{showTime(startsAt[0])}</Text>
+              <Text type="secondary">至 {showTime(expiresAt[0])}</Text>
+            </Space>
+          );
+        }
+        return (
+          <Space direction="vertical" size={0}>
+            <Text>共 {row.total_rules} 条配置</Text>
+            <Text type="secondary">
+              最早失效 {showTime(expiresAt[0] || null)}
+            </Text>
+            <Text type="secondary">
+              最晚失效 {showTime(expiresAt.at(-1) || null)}
+            </Text>
+          </Space>
+        );
+      },
     },
     {
       title: '状态',
       key: 'status',
-      width: 115,
-      render: (_, row) => (
-        <Tag color={STATUS_META[row.status].color}>
-          {STATUS_META[row.status].label}
-        </Tag>
-      ),
+      width: 190,
+      render: (_, row) => {
+        const counts = row.items.reduce<
+          Partial<Record<LimitOverride['status'], number>>
+        >((result, item) => {
+          result[item.status] = (result[item.status] || 0) + 1;
+          return result;
+        }, {});
+        return (
+          <Space size={[0, 4]} wrap>
+            {Object.entries(STATUS_META).map(([status, meta]) =>
+              counts[status as LimitOverride['status']] ? (
+                <Tag key={status} color={meta.color}>
+                  {meta.label}
+                </Tag>
+              ) : null,
+            )}
+          </Space>
+        );
+      },
+    },
+    {
+      title: '备注',
+      key: 'reason',
+      width: 220,
+      render: (_, row) => {
+        const reasons = Array.from(
+          new Set(
+            row.items
+              .map((item) => item.reason)
+              .filter((value): value is string => Boolean(value)),
+          ),
+        );
+        const text =
+          reasons.length <= 1
+            ? reasons[0] || '-'
+            : `${reasons[0]} 等 ${reasons.length} 种`;
+        return <Text ellipsis={{ tooltip: reasons.join('；') }}>{text}</Text>;
+      },
     },
-    { title: '原因', dataIndex: 'reason', ellipsis: true, render: (v) => v || '-' },
     {
       title: '启用',
       key: 'enabled',
-      width: 80,
-      fixed: 'right',
-      render: (_, row) => (
-        <Switch
-          size="small"
-          checked={row.enabled}
-          disabled={row.mode === 'override'}
-          onChange={(checked) => void updateEnabled(row, checked)}
-        />
-      ),
-    },
-    {
-      title: '操作',
-      key: 'actions',
-      width: 210,
-      fixed: 'right',
-      render: (_, row) => (
-        <Space size={0}>
-          {row.mode !== 'override' && (
-            <Button type="link" icon={<EditOutlined />} onClick={() => openEdit(row)}>
-              编辑
-            </Button>
-          )}
-          {row.enabled && (
-            <Popconfirm
-              title="恢复全局策略？"
-              description="将停用这条白名单例外；历史流水、配置及审计记录都会保留。"
-              onConfirm={() => void restoreGlobal(row)}
-            >
-              <Button type="link" icon={<UndoOutlined />}>
-                恢复全局
-              </Button>
-            </Popconfirm>
-          )}
-          <Popconfirm
-            title="删除这条配置？"
-            onConfirm={() => void deleteRow(row)}
-          >
-            <Button type="link" danger icon={<DeleteOutlined />} />
-          </Popconfirm>
-        </Space>
-      ),
+      width: 90,
+      render: (_, row) => {
+        const subjectKey = `${row.subject_type}:${row.subject_value}`;
+        return (
+          <Switch
+            size="small"
+            checked={row.items.every((item) => item.enabled)}
+            loading={togglingSubject === subjectKey}
+            onChange={(enabled) => void toggleSubject(row, enabled)}
+          />
+        );
+      },
     },
   ];
 
   return (
     <div>
-      <Space
-        align="start"
-        style={{ width: '100%', justifyContent: 'space-between', marginBottom: 16 }}
-      >
+      <Space align="start" style={{ width: '100%', marginBottom: 16 }}>
         <div>
           <Title level={2} style={{ marginBottom: 4 }}>
             白名单
@@ -557,24 +767,8 @@ export default function LimitWhitelistPage() {
             统一管理限制全局值，并按手机号或设备设置临时白名单。
           </Text>
         </div>
-        <Space>
-          <Button icon={<ReloadOutlined />} onClick={() => void load()}>
-            刷新
-          </Button>
-          <Button type="primary" icon={<PlusOutlined />} onClick={openCreate}>
-            新增白名单
-          </Button>
-        </Space>
       </Space>
 
-      <Alert
-        showIcon
-        type="info"
-        style={{ marginBottom: 16 }}
-        message="规则说明"
-        description="新增白名单后，普通限制项自动临时不限，风控限制项自动免告警；必须设置失效时间。“恢复全局”会停用白名单并立即重新使用全局限制。"
-      />
-
       <Card title="全局限制" style={{ marginBottom: 16 }}>
         <Tabs
           activeKey={globalGroup}
@@ -596,7 +790,19 @@ export default function LimitWhitelistPage() {
       </Card>
 
       <Card
-        title={`白名单配置（${total}）`}
+        title={
+          <Space size={12}>
+            <span>{`白名单配置（${total} 个主体）`}</span>
+            <Button
+              type="primary"
+              size="small"
+              icon={<PlusOutlined />}
+              onClick={openCreate}
+            >
+              新增白名单
+            </Button>
+          </Space>
+        }
         extra={
           <Space wrap>
             <Select
@@ -604,10 +810,7 @@ export default function LimitWhitelistPage() {
               placeholder="主体类型"
               style={{ width: 120 }}
               value={subjectType}
-              onChange={(value) => {
-                setPage(1);
-                setSubjectType(value);
-              }}
+              onChange={setSubjectType}
               options={[
                 { value: 'phone', label: '手机号' },
                 { value: 'device', label: '设备' },
@@ -620,45 +823,43 @@ export default function LimitWhitelistPage() {
               placeholder="限制项"
               style={{ width: 240 }}
               value={ruleFilter}
-              onChange={(value) => {
-                setPage(1);
-                setRuleFilter(value);
-              }}
+              onChange={setRuleFilter}
               options={rules.map((rule) => ({
                 value: rule.code,
                 label: rule.label,
               }))}
             />
-            <Input.Search
+            <Input
               allowClear
               placeholder="搜索手机号或设备"
               style={{ width: 240 }}
               value={keyword}
-              onChange={(event) => {
-                setPage(1);
-                setKeyword(event.target.value);
-              }}
-              onSearch={() => {
-                setPage(1);
-                void load();
-              }}
+              onChange={(event) => setKeyword(event.target.value)}
+              onPressEnter={applyFilters}
             />
+            <Button
+              type="primary"
+              icon={<SearchOutlined />}
+              onClick={applyFilters}
+            >
+              筛选
+            </Button>
           </Space>
         }
       >
-        <Table<LimitOverride>
-          rowKey="id"
+        <Table<LimitSubject>
+          rowKey={(row) => `${row.subject_type}:${row.subject_value}`}
           loading={loading}
           columns={columns}
           dataSource={rows}
-          scroll={{ x: 1450 }}
+          scroll={{ x: 1500 }}
           pagination={{
             current: page,
             pageSize,
             total,
             showSizeChanger: true,
-            pageSizeOptions: [20, 50, 100],
-            showTotal: (count) => `共 ${count} 条`,
+            pageSizeOptions: [10, 20, 50],
+            showTotal: (count) => `共 ${count} 个主体`,
             onChange: (nextPage, nextPageSize) => {
               setPage(
                 nextPageSize !== pageSize ? 1 : nextPage,
@@ -728,13 +929,51 @@ export default function LimitWhitelistPage() {
               ]}
             />
           </Form.Item>
+          {effectiveSubjectType === 'phone' && (
+            <Form.Item
+              name="subject_value"
+              label="手机号"
+              rules={[{ required: true, message: '请输入手机号' }]}
+            >
+              <Input
+                disabled={!!editing}
+                maxLength={20}
+                placeholder="请输入手机号"
+              />
+            </Form.Item>
+          )}
+          <Form.Item
+            name="valid_range"
+            label="有效期"
+            rules={[
+              { required: true, message: '请选择生效和结束时间' },
+              {
+                validator: async (_, value?: [Dayjs, Dayjs]) => {
+                  if (!value?.[0] || !value?.[1]) {
+                    throw new Error('请选择完整的生效和结束时间');
+                  }
+                  if (value[1].valueOf() <= value[0].valueOf()) {
+                    throw new Error('结束时间必须晚于生效时间');
+                  }
+                  if (value[1].valueOf() <= dayjs().valueOf()) {
+                    throw new Error('结束时间必须晚于当前时间');
+                  }
+                },
+              },
+            ]}
+          >
+            <DatePicker.RangePicker
+              showTime
+              style={{ width: '100%' }}
+              placeholder={['生效时间', '结束时间']}
+            />
+          </Form.Item>
           <Form.Item
             name="rule_codes"
             label="限制项"
             rules={[{ required: true, message: '请选择限制项' }]}
           >
             <Checkbox.Group
-              disabled={!!editing}
               style={{ width: '100%' }}
               onChange={(values) => {
                 if (watchedSubjectType === 'device') {
@@ -746,8 +985,10 @@ export default function LimitWhitelistPage() {
                     );
                     return;
                   }
-                  form.setFieldValue('subject_value', undefined);
-                  setDeviceCandidates([]);
+                  if (!editing) {
+                    form.setFieldValue('subject_value', undefined);
+                    setDeviceCandidates([]);
+                  }
                 }
               }}
             >
@@ -798,13 +1039,10 @@ export default function LimitWhitelistPage() {
               />
             </Checkbox.Group>
           </Form.Item>
+          {effectiveSubjectType === 'device' && (
           <Form.Item
-            label={watchedSubjectType === 'device' ? '选择设备' : '手机号'}
-            extra={
-              watchedSubjectType === 'device'
-                ? '可按手机号、用户 ID、设备型号或设备 ID 搜索；候选设备按最近活跃时间排序。'
-                : undefined
-            }
+            label="选择设备"
+            extra="可按手机号、用户 ID、设备型号或设备 ID 搜索；候选设备按最近活跃时间排序。"
           >
             <Form.Item
               name="subject_value"
@@ -812,16 +1050,13 @@ export default function LimitWhitelistPage() {
               rules={[
                 {
                   required: true,
-                  message:
-                    watchedSubjectType === 'device'
-                      ? '请选择设备'
-                      : '请输入手机号',
+                  message: '请选择设备',
                 },
               ]}
             >
               {editing ? (
                 <Input disabled maxLength={128} />
-              ) : watchedSubjectType === 'device' ? (
+              ) : (
                 <Select
                   showSearch
                   filterOption={false}
@@ -918,8 +1153,6 @@ export default function LimitWhitelistPage() {
                     );
                   }}
                 />
-              ) : (
-                <Input maxLength={20} placeholder="请输入手机号" />
               )}
             </Form.Item>
             {!editing &&
@@ -959,33 +1192,13 @@ export default function LimitWhitelistPage() {
                 </div>
               )}
           </Form.Item>
-          <Form.Item name="starts_at" label="生效时间">
-            <DatePicker showTime style={{ width: '100%' }} placeholder="立即生效" />
-          </Form.Item>
-          <Form.Item
-            name="expires_at"
-            label="失效时间"
-            rules={[
-              { required: true, message: '请选择失效时间' },
-              {
-                validator: async (_, value) => {
-                  if (value && value.valueOf() <= dayjs().valueOf()) {
-                    throw new Error('失效时间必须晚于当前时间');
-                  }
-                },
-              },
-            ]}
-          >
-            <DatePicker
-              showTime
-              style={{ width: '100%' }}
-              placeholder="请选择失效时间"
-            />
-          </Form.Item>
-          <Form.Item name="enabled" label="启用" valuePropName="checked">
-            <Switch />
-          </Form.Item>
-          <Form.Item name="reason" label="配置原因">
+          )}
+          {editing && (
+            <Form.Item name="enabled" label="启用" valuePropName="checked">
+              <Switch />
+            </Form.Item>
+          )}
+          <Form.Item name="reason" label="备注">
             <Input.TextArea maxLength={256} showCount rows={3} />
           </Form.Item>
         </Form>
diff --git a/src/lib/types.ts b/src/lib/types.ts
index e433edf..584b35c 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -957,3 +957,18 @@ export interface LimitOverrideList {
   items: LimitOverride[];
   total: number;
 }
+
+export interface LimitSubject {
+  subject_type: LimitSubjectType;
+  subject_value: string;
+  group_counts: Record<string, number>;
+  total_rules: number;
+  items: LimitOverride[];
+  created_at: string;
+  updated_at: string;
+}
+
+export interface LimitSubjectList {
+  items: LimitSubject[];
+  total: number;
+}
-- 
2.52.0


From f417722c9154f5731773438aea58c97057390b2b Mon Sep 17 00:00:00 2001
From: linkeyu <798648091@qq.com>
Date: Fri, 31 Jul 2026 11:59:55 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E7=99=BD=E5=90=8D=E5=8D=95=E4=B8=BB=E4=BD=93=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E4=B8=8E=E7=BC=96=E8=BE=91=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

手机号与设备 ID 统一为手动录入并禁止推荐，修复跨分类勾选互相清空，补充独立编辑入口及表单告警处理。
---
 src/app/(main)/limit-whitelist/page.tsx | 562 +++++++++---------------
 1 file changed, 206 insertions(+), 356 deletions(-)

diff --git a/src/app/(main)/limit-whitelist/page.tsx b/src/app/(main)/limit-whitelist/page.tsx
index 8add99b..6e737b0 100644
--- a/src/app/(main)/limit-whitelist/page.tsx
+++ b/src/app/(main)/limit-whitelist/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import {
   Alert,
   App,
@@ -27,7 +27,6 @@ import dayjs, { type Dayjs } from 'dayjs';
 
 import { api, errMsg } from '@/lib/api';
 import type {
-  LimitDeviceCandidate,
   LimitOverride,
   LimitRule,
   LimitSubject,
@@ -56,7 +55,7 @@ interface OverrideFormValue {
   subject_value: string;
   rule_codes: string[];
   enabled?: boolean;
-  valid_range?: [Dayjs, Dayjs] | null;
+  valid_range?: [number, number] | null;
   reason?: string;
 }
 
@@ -72,7 +71,8 @@ interface WhitelistFilters {
   ruleCode?: string;
 }
 
-const asIso = (value?: Dayjs | null) => (value ? value.toISOString() : null);
+const asIso = (value?: number | null) =>
+  value ? dayjs(value).toISOString() : null;
 const showTime = (value: string | null) =>
   value ? dayjs(value).format('YYYY-MM-DD HH:mm') : '-';
 const normalizeSubjectValue = (
@@ -83,6 +83,90 @@ const normalizeSubjectValue = (
     ? value.replace(/\D/g, '')
     : value.trim();
 
+interface RuleSelectorProps {
+  value?: string[];
+  onChange?: (value: string[]) => void;
+  rules: LimitRule[];
+  subjectType: LimitSubjectType;
+  activeGroup: string;
+  onActiveGroupChange: (group: string) => void;
+  onIncompatibleDeviceScope: () => void;
+}
+
+function RuleSelector({
+  value = [],
+  onChange,
+  rules,
+  subjectType,
+  activeGroup,
+  onActiveGroupChange,
+  onIncompatibleDeviceScope,
+}: RuleSelectorProps) {
+  const selectedDeviceScopes = new Set(value.map(deviceSourceScope));
+
+  return (
+    <Tabs
+      size="small"
+      activeKey={activeGroup}
+      onChange={onActiveGroupChange}
+      items={RULE_GROUPS.map((group) => {
+        const groupRules = rules.filter((rule) => rule.group === group);
+        const groupCodeSet = new Set(groupRules.map((rule) => rule.code));
+        const groupValues = value.filter((code) => groupCodeSet.has(code));
+        return {
+          key: group,
+          label: `${group}${groupValues.length ? ` (${groupValues.length})` : ''}`,
+          children: (
+            <Checkbox.Group
+              value={groupValues}
+              onChange={(values) => {
+                const otherGroupCodes = value.filter(
+                  (code) => !groupCodeSet.has(code),
+                );
+                const nextCodes = [
+                  ...otherGroupCodes,
+                  ...(values as string[]),
+                ];
+                if (
+                  subjectType === 'device' &&
+                  new Set(nextCodes.map(deviceSourceScope)).size > 1
+                ) {
+                  onIncompatibleDeviceScope();
+                  return;
+                }
+                onChange?.(nextCodes);
+              }}
+            >
+              <Space direction="vertical" size={10}>
+                {groupRules.map((rule) => {
+                  const deviceScope = deviceSourceScope(rule.code);
+                  const incompatibleDeviceScope =
+                    subjectType === 'device' &&
+                    selectedDeviceScopes.size >= 1 &&
+                    !value.includes(rule.code) &&
+                    !selectedDeviceScopes.has(deviceScope);
+                  return (
+                    <Checkbox
+                      key={rule.code}
+                      value={rule.code}
+                      disabled={
+                        !rule.subject_types.includes(subjectType) ||
+                        incompatibleDeviceScope
+                      }
+                    >
+                      {rule.label}
+                    </Checkbox>
+                  );
+                })}
+              </Space>
+            </Checkbox.Group>
+          ),
+        };
+      })}
+    />
+  );
+}
+
 export default function LimitWhitelistPage() {
   const { message, modal } = App.useApp();
   const [rules, setRules] = useState<LimitRule[]>([]);
@@ -99,70 +183,24 @@ export default function LimitWhitelistPage() {
   });
   const [editing, setEditing] = useState<LimitSubject | null>(null);
   const [editorOpen, setEditorOpen] = useState(false);
+  const [subjectInputSession, setSubjectInputSession] = useState(0);
+  const [editorRuleCodes, setEditorRuleCodes] = useState<string[]>([]);
+  const [ruleSelectionError, setRuleSelectionError] = useState(false);
   const [saving, setSaving] = useState(false);
   const [togglingSubject, setTogglingSubject] = useState<string | null>(null);
   const [createPreset, setCreatePreset] = useState<CreatePreset | null>(null);
-  const [deviceCandidates, setDeviceCandidates] = useState<
-    LimitDeviceCandidate[]
-  >([]);
-  const [deviceSearching, setDeviceSearching] = useState(false);
   const [globalGroup, setGlobalGroup] = useState(RULE_GROUPS[0]);
   const [editorRuleGroup, setEditorRuleGroup] = useState(RULE_GROUPS[0]);
-  const deviceSearchTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
   const [globalRule, setGlobalRule] = useState<LimitRule | null>(null);
   const [globalValue, setGlobalValue] = useState<number | null>(null);
   const [globalSaving, setGlobalSaving] = useState(false);
   const [form] = Form.useForm<OverrideFormValue>();
-  const watchedRuleCodes = Form.useWatch('rule_codes', form) || [];
   const watchedSubjectType = Form.useWatch('subject_type', form);
-  const watchedSubjectValue = Form.useWatch('subject_value', form);
   const effectiveSubjectType =
     watchedSubjectType ||
     editing?.subject_type ||
     createPreset?.subject_type ||
     'phone';
-  const candidateRuleCode = useMemo(() => {
-    if (watchedSubjectType === 'device') {
-      const scopes = new Set(watchedRuleCodes.map(deviceSourceScope));
-      if (scopes.size !== 1) return undefined;
-    }
-    return createPreset?.rule_code &&
-      watchedRuleCodes.includes(createPreset.rule_code)
-      ? createPreset.rule_code
-      : watchedRuleCodes[0];
-  }, [createPreset?.rule_code, watchedRuleCodes, watchedSubjectType]);
-  const selectedDeviceCandidate = useMemo(
-    () =>
-      deviceCandidates.find(
-        (candidate) => candidate.device_id === watchedSubjectValue,
-      ),
-    [deviceCandidates, watchedSubjectValue],
-  );
-
-  const loadDeviceCandidates = useCallback(
-    async (ruleCode: string, search = '') => {
-      setDeviceSearching(true);
-      try {
-        const response = await api.get<LimitDeviceCandidate[]>(
-          '/admin/api/limit-whitelist/device-candidates',
-          {
-            params: {
-              rule_code: ruleCode,
-              keyword: search.trim() || undefined,
-              limit: 30,
-            },
-          },
-        );
-        setDeviceCandidates(response.data);
-      } catch (error) {
-        setDeviceCandidates([]);
-        message.error(errMsg(error, '设备候选加载失败'));
-      } finally {
-        setDeviceSearching(false);
-      }
-    },
-    [message],
-  );
 
   const load = useCallback(async () => {
     setLoading(true);
@@ -204,9 +242,11 @@ export default function LimitWhitelistPage() {
 
   const openCreate = () => {
     setCreatePreset(null);
-    setDeviceCandidates([]);
     setEditing(null);
     setEditorRuleGroup(RULE_GROUPS[0]);
+    setEditorRuleCodes([]);
+    setRuleSelectionError(false);
+    setSubjectInputSession((value) => value + 1);
     setEditorOpen(true);
   };
 
@@ -216,6 +256,9 @@ export default function LimitWhitelistPage() {
       (group) => (row.group_counts[group] || 0) > 0,
     );
     setEditorRuleGroup(firstSelectedGroup || RULE_GROUPS[0]);
+    setEditorRuleCodes(row.items.map((item) => item.rule_code));
+    setRuleSelectionError(false);
+    setSubjectInputSession((value) => value + 1);
     setEditorOpen(true);
   };
 
@@ -245,6 +288,9 @@ export default function LimitWhitelistPage() {
     );
     setEditorRuleGroup(presetRule?.group || RULE_GROUPS[0]);
     setEditing(null);
+    setEditorRuleCodes([createPreset.rule_code]);
+    setRuleSelectionError(false);
+    setSubjectInputSession((value) => value + 1);
     setEditorOpen(true);
   }, [createPreset, editorOpen, rules]);
 
@@ -263,10 +309,12 @@ export default function LimitWhitelistPage() {
       return {
         subject_type: editing.subject_type,
         subject_value: editing.subject_value,
-        rule_codes: editing.items.map((item) => item.rule_code),
         enabled: editing.items.every((item) => item.enabled),
         valid_range: expiresAt
-          ? [startsAt[0] ? dayjs(startsAt[0]) : dayjs(), dayjs(expiresAt)]
+          ? [
+              startsAt[0] ? dayjs(startsAt[0]).valueOf() : Date.now(),
+              dayjs(expiresAt).valueOf(),
+            ]
           : null,
         reason: reasons.size === 1 ? Array.from(reasons)[0] : '',
       };
@@ -275,58 +323,15 @@ export default function LimitWhitelistPage() {
       return {
         subject_type: createPreset.subject_type,
         subject_value: createPreset.subject_value,
-        rule_codes: [createPreset.rule_code],
-        valid_range: [dayjs(), dayjs().add(1, 'month')],
+        valid_range: [Date.now(), dayjs().add(1, 'month').valueOf()],
       };
     }
     return {
       subject_type: 'phone',
-      rule_codes: [],
-      valid_range: [dayjs(), dayjs().add(1, 'month')],
+      valid_range: [Date.now(), dayjs().add(1, 'month').valueOf()],
     };
   }, [createPreset, editing, editorOpen]);
 
-  useEffect(() => {
-    if (
-      !editorOpen ||
-      editing ||
-      watchedSubjectType !== 'device' ||
-      !candidateRuleCode
-    ) {
-      return;
-    }
-    void loadDeviceCandidates(
-      candidateRuleCode,
-      createPreset?.subject_value || '',
-    );
-  }, [
-    createPreset?.subject_value,
-    editing,
-    editorOpen,
-    loadDeviceCandidates,
-    candidateRuleCode,
-    watchedSubjectType,
-  ]);
-
-  useEffect(
-    () => () => {
-      if (deviceSearchTimer.current) {
-        clearTimeout(deviceSearchTimer.current);
-      }
-    },
-    [],
-  );
-
-  const searchDevices = (value: string) => {
-    if (!candidateRuleCode) return;
-    if (deviceSearchTimer.current) {
-      clearTimeout(deviceSearchTimer.current);
-    }
-    deviceSearchTimer.current = setTimeout(() => {
-      void loadDeviceCandidates(candidateRuleCode, value);
-    }, 300);
-  };
-
   const saveOverride = async () => {
     let value: OverrideFormValue;
     try {
@@ -334,6 +339,12 @@ export default function LimitWhitelistPage() {
     } catch {
       return;
     }
+    if (editorRuleCodes.length === 0) {
+      setRuleSelectionError(true);
+      message.error('请选择解除限制项');
+      return;
+    }
+    value.rule_codes = editorRuleCodes;
     const normalizedSubjectValue = normalizeSubjectValue(
       value.subject_type,
       value.subject_value,
@@ -342,7 +353,7 @@ export default function LimitWhitelistPage() {
       message.error(
         value.subject_type === 'phone'
           ? '请输入有效手机号'
-          : '请选择有效设备',
+          : '请输入有效设备 ID',
       );
       return;
     }
@@ -523,18 +534,12 @@ export default function LimitWhitelistPage() {
       render: (_, row) => (
         <Space size={8}>
           {row.subject_type === 'device' && <Tag color="cyan">设备</Tag>}
-          <Button
-            type="link"
-            style={{ height: 'auto', padding: 0, textAlign: 'left' }}
-            onClick={() => openEdit(row)}
-          >
-            {row.subject_value}
-          </Button>
+          <Text>{row.subject_value}</Text>
         </Space>
       ),
     },
     {
-      title: '限制项',
+      title: '解除限制项',
       key: 'rule',
       render: (_, row) => {
         const groupCounts = Object.fromEntries(
@@ -548,7 +553,7 @@ export default function LimitWhitelistPage() {
             trigger={['hover', 'click']}
             placement="topLeft"
             mouseEnterDelay={0.15}
-            title="限制项明细"
+            title="解除限制项明细"
             content={
               <div
                 style={{
@@ -754,6 +759,21 @@ export default function LimitWhitelistPage() {
         );
       },
     },
+    {
+      title: '编辑',
+      key: 'edit',
+      width: 90,
+      fixed: 'right',
+      render: (_, row) => (
+        <Button
+          type="link"
+          icon={<EditOutlined />}
+          onClick={() => openEdit(row)}
+        >
+          编辑
+        </Button>
+      ),
+    },
   ];
 
   return (
@@ -820,7 +840,7 @@ export default function LimitWhitelistPage() {
               allowClear
               showSearch
               optionFilterProp="label"
-              placeholder="限制项"
+              placeholder="解除限制项"
               style={{ width: 240 }}
               value={ruleFilter}
               onChange={setRuleFilter}
@@ -852,7 +872,7 @@ export default function LimitWhitelistPage() {
           loading={loading}
           columns={columns}
           dataSource={rows}
-          scroll={{ x: 1500 }}
+          scroll={{ x: 1590 }}
           pagination={{
             current: page,
             pageSize,
@@ -892,6 +912,7 @@ export default function LimitWhitelistPage() {
           form={form}
           layout="vertical"
           preserve={false}
+          autoComplete="off"
           initialValues={editorInitialValues}
         >
           <Form.Item
@@ -902,15 +923,15 @@ export default function LimitWhitelistPage() {
             <Select
               disabled={!!editing}
               onChange={(value: LimitSubjectType) => {
-                form.setFieldValue('subject_value', undefined);
-                setDeviceCandidates([]);
+                setSubjectInputSession((session) => session + 1);
+                form.resetFields(['subject_value']);
                 const compatibleCodes = new Set(
                   rules
                     .filter((rule) => rule.subject_types.includes(value))
                     .map((rule) => rule.code),
                 );
-                let nextCodes = (form.getFieldValue('rule_codes') || []).filter(
-                  (code: string) => compatibleCodes.has(code),
+                let nextCodes = editorRuleCodes.filter((code) =>
+                  compatibleCodes.has(code),
                 );
                 if (
                   value === 'device' &&
@@ -918,10 +939,11 @@ export default function LimitWhitelistPage() {
                 ) {
                   nextCodes = [];
                   void message.warning(
-                    '比价设备与短信/登录设备来自不同数据源，请重新选择同一类限制项',
+                    '比价设备与短信/登录设备来自不同数据源，请重新选择同一类解除限制项',
                   );
                 }
-                form.setFieldValue('rule_codes', nextCodes);
+                setEditorRuleCodes(nextCodes);
+                setRuleSelectionError(false);
               }}
               options={[
                 { value: 'phone', label: '手机号' },
@@ -929,33 +951,63 @@ export default function LimitWhitelistPage() {
               ]}
             />
           </Form.Item>
-          {effectiveSubjectType === 'phone' && (
-            <Form.Item
-              name="subject_value"
-              label="手机号"
-              rules={[{ required: true, message: '请输入手机号' }]}
-            >
-              <Input
-                disabled={!!editing}
-                maxLength={20}
-                placeholder="请输入手机号"
-              />
-            </Form.Item>
-          )}
+          <Form.Item
+            name="subject_value"
+            label={effectiveSubjectType === 'phone' ? '手机号' : '设备 ID'}
+            rules={[
+              {
+                required: true,
+                message:
+                  effectiveSubjectType === 'phone'
+                    ? '请输入手机号'
+                    : '请输入设备 ID',
+              },
+            ]}
+          >
+            <Input
+              key={`${effectiveSubjectType}-${subjectInputSession}`}
+              id={`limit-whitelist-${effectiveSubjectType}-${subjectInputSession}`}
+              name={`limit-whitelist-${effectiveSubjectType}-${subjectInputSession}`}
+              disabled={!!editing}
+              autoComplete="off"
+              aria-label={
+                effectiveSubjectType === 'phone' ? '手机号' : '设备 ID'
+              }
+              aria-autocomplete="none"
+              data-lpignore="true"
+              data-1p-ignore="true"
+              maxLength={effectiveSubjectType === 'phone' ? 20 : 128}
+              placeholder={
+                effectiveSubjectType === 'phone'
+                  ? '请输入手机号'
+                  : '请输入设备 ID'
+              }
+            />
+          </Form.Item>
           <Form.Item
             name="valid_range"
             label="有效期"
+            getValueProps={(value?: [number, number] | null) => ({
+              value: value
+                ? [dayjs(value[0]), dayjs(value[1])]
+                : null,
+            })}
+            getValueFromEvent={(value: [Dayjs, Dayjs] | null) =>
+              value
+                ? [value[0].valueOf(), value[1].valueOf()]
+                : null
+            }
             rules={[
               { required: true, message: '请选择生效和结束时间' },
               {
-                validator: async (_, value?: [Dayjs, Dayjs]) => {
+                validator: async (_, value?: [number, number]) => {
                   if (!value?.[0] || !value?.[1]) {
                     throw new Error('请选择完整的生效和结束时间');
                   }
-                  if (value[1].valueOf() <= value[0].valueOf()) {
+                  if (value[1] <= value[0]) {
                     throw new Error('结束时间必须晚于生效时间');
                   }
-                  if (value[1].valueOf() <= dayjs().valueOf()) {
+                  if (value[1] <= Date.now()) {
                     throw new Error('结束时间必须晚于当前时间');
                   }
                 },
@@ -969,230 +1021,28 @@ export default function LimitWhitelistPage() {
             />
           </Form.Item>
           <Form.Item
-            name="rule_codes"
-            label="限制项"
-            rules={[{ required: true, message: '请选择限制项' }]}
+            label="解除限制项"
+            required
+            validateStatus={ruleSelectionError ? 'error' : undefined}
+            help={ruleSelectionError ? '请选择解除限制项' : undefined}
           >
-            <Checkbox.Group
-              style={{ width: '100%' }}
-              onChange={(values) => {
-                if (watchedSubjectType === 'device') {
-                  const nextCodes = values as string[];
-                  if (new Set(nextCodes.map(deviceSourceScope)).size > 1) {
-                    form.setFieldValue('rule_codes', watchedRuleCodes);
-                    void message.warning(
-                      '比价设备与短信/登录设备来自不同数据源，不能在同一白名单中混选',
-                    );
-                    return;
-                  }
-                  if (!editing) {
-                    form.setFieldValue('subject_value', undefined);
-                    setDeviceCandidates([]);
-                  }
-                }
+            <RuleSelector
+              value={editorRuleCodes}
+              onChange={(value) => {
+                setEditorRuleCodes(value);
+                setRuleSelectionError(false);
               }}
-            >
-              <Tabs
-                size="small"
-                activeKey={editorRuleGroup}
-                onChange={setEditorRuleGroup}
-                items={RULE_GROUPS.map((group) => {
-                  const groupRules = rules.filter(
-                    (rule) => rule.group === group,
-                  );
-                  const selectedCount = groupRules.filter((rule) =>
-                    watchedRuleCodes.includes(rule.code),
-                  ).length;
-                  const selectedDeviceScopes = new Set(
-                    watchedRuleCodes.map(deviceSourceScope),
-                  );
-                  return {
-                    key: group,
-                    label: `${group}${selectedCount ? ` (${selectedCount})` : ''}`,
-                    children: (
-                      <Space direction="vertical" size={10}>
-                        {groupRules.map((rule) => {
-                          const deviceScope = deviceSourceScope(rule.code);
-                          const incompatibleDeviceScope =
-                            watchedSubjectType === 'device' &&
-                            selectedDeviceScopes.size >= 1 &&
-                            !watchedRuleCodes.includes(rule.code) &&
-                            !selectedDeviceScopes.has(deviceScope);
-                          return (
-                            <Checkbox
-                              key={rule.code}
-                              value={rule.code}
-                              disabled={
-                                !rule.subject_types.includes(
-                                  watchedSubjectType || 'phone',
-                                ) || incompatibleDeviceScope
-                              }
-                            >
-                              {rule.label}
-                            </Checkbox>
-                          );
-                        })}
-                      </Space>
-                    ),
-                  };
-                })}
-              />
-            </Checkbox.Group>
+              rules={rules}
+              subjectType={effectiveSubjectType}
+              activeGroup={editorRuleGroup}
+              onActiveGroupChange={setEditorRuleGroup}
+              onIncompatibleDeviceScope={() => {
+                void message.warning(
+                  '比价设备与短信/登录设备来自不同数据源，不能在同一白名单中混选',
+                );
+              }}
+            />
           </Form.Item>
-          {effectiveSubjectType === 'device' && (
-          <Form.Item
-            label="选择设备"
-            extra="可按手机号、用户 ID、设备型号或设备 ID 搜索；候选设备按最近活跃时间排序。"
-          >
-            <Form.Item
-              name="subject_value"
-              noStyle
-              rules={[
-                {
-                  required: true,
-                  message: '请选择设备',
-                },
-              ]}
-            >
-              {editing ? (
-                <Input disabled maxLength={128} />
-              ) : (
-                <Select
-                  showSearch
-                  filterOption={false}
-                  loading={deviceSearching}
-                  disabled={!candidateRuleCode}
-                  placeholder={
-                    candidateRuleCode
-                      ? '输入手机号、用户 ID、设备型号或设备 ID'
-                      : '请先选择限制项'
-                  }
-                  onSearch={searchDevices}
-                  onOpenChange={(open) => {
-                    if (
-                      open &&
-                      candidateRuleCode &&
-                      deviceCandidates.length === 0
-                    ) {
-                      void loadDeviceCandidates(candidateRuleCode);
-                    }
-                  }}
-                  notFoundContent={
-                    deviceSearching ? '正在搜索设备…' : '未找到匹配设备'
-                  }
-                  options={deviceCandidates.map((candidate) => ({
-                    value: candidate.device_id,
-                    label: candidate.device_id,
-                  }))}
-                  labelRender={({ value, label }) => {
-                    const candidate = deviceCandidates.find(
-                      (item) => item.device_id === value,
-                    );
-                    if (!candidate) return label;
-                    return (
-                      <Space size={6}>
-                        <Text
-                          ellipsis={{ tooltip: candidate.device_id }}
-                          style={{ maxWidth: 320 }}
-                        >
-                          {candidate.device_id}
-                        </Text>
-                        <Tag color="blue" style={{ marginInlineEnd: 0 }}>
-                          {candidate.source_label}
-                        </Tag>
-                      </Space>
-                    );
-                  }}
-                  optionRender={(option) => {
-                    const candidate = deviceCandidates.find(
-                      (item) => item.device_id === option.value,
-                    );
-                    if (!candidate) return option.label;
-                    const owner =
-                      [
-                        candidate.phone,
-                        candidate.user_id
-                          ? `用户 #${candidate.user_id}`
-                          : null,
-                        candidate.username || candidate.nickname,
-                        candidate.device_model,
-                      ]
-                        .filter(Boolean)
-                        .join(' · ') || '暂未关联用户或机型';
-                    return (
-                      <div style={{ paddingBlock: 4 }}>
-                        <Space size={6}>
-                          <Text strong>{candidate.device_id}</Text>
-                          <Tag color="blue" style={{ marginInlineEnd: 0 }}>
-                            {candidate.source_label}
-                          </Tag>
-                        </Space>
-                        <div
-                          style={{
-                            display: 'flex',
-                            justifyContent: 'space-between',
-                            gap: 12,
-                            marginTop: 3,
-                          }}
-                        >
-                          <Text
-                            type="secondary"
-                            ellipsis={{ tooltip: owner }}
-                            style={{ minWidth: 0, fontSize: 12 }}
-                          >
-                            {owner}
-                          </Text>
-                          <Text
-                            type="secondary"
-                            style={{ flexShrink: 0, fontSize: 12 }}
-                          >
-                            最近活跃 {showTime(candidate.last_active_at)}
-                          </Text>
-                        </div>
-                      </div>
-                    );
-                  }}
-                />
-              )}
-            </Form.Item>
-            {!editing &&
-              watchedSubjectType === 'device' &&
-              selectedDeviceCandidate && (
-                <div
-                  style={{
-                    display: 'grid',
-                    gridTemplateColumns: '1fr 1fr',
-                    gap: '4px 16px',
-                    marginTop: 8,
-                    padding: '10px 12px',
-                    border: '1px solid #f0f0f0',
-                    borderRadius: 6,
-                    background: '#fafafa',
-                  }}
-                >
-                  <Text type="secondary">
-                    关联用户：
-                    <Text>
-                      {selectedDeviceCandidate.phone ||
-                        selectedDeviceCandidate.username ||
-                        selectedDeviceCandidate.nickname ||
-                        '未关联'}
-                    </Text>
-                  </Text>
-                  <Text type="secondary">
-                    设备型号：
-                    <Text>{selectedDeviceCandidate.device_model || '-'}</Text>
-                  </Text>
-                  <Text type="secondary" style={{ gridColumn: '1 / -1' }}>
-                    最近活跃：
-                    <Text>
-                      {showTime(selectedDeviceCandidate.last_active_at)}
-                    </Text>
-                  </Text>
-                </div>
-              )}
-          </Form.Item>
-          )}
           {editing && (
             <Form.Item name="enabled" label="启用" valuePropName="checked">
               <Switch />
-- 
2.52.0


From 776682fe0f3b157563830c015a80cd5d51b42b31 Mon Sep 17 00:00:00 2001
From: linkeyu <798648091@qq.com>
Date: Fri, 31 Jul 2026 14:38:31 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E8=AE=BE=E5=A4=87=E7=99=BD=E5=90=8D=E5=8D=95=E8=B7=A8?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除设备来源分组造成的互斥逻辑，保留规则主体类型校验，允许同一设备字符串选择多个业务分类。
---
 src/app/(main)/limit-whitelist/page.tsx | 40 ++-----------------------
 1 file changed, 2 insertions(+), 38 deletions(-)

diff --git a/src/app/(main)/limit-whitelist/page.tsx b/src/app/(main)/limit-whitelist/page.tsx
index 6e737b0..0b0b336 100644
--- a/src/app/(main)/limit-whitelist/page.tsx
+++ b/src/app/(main)/limit-whitelist/page.tsx
@@ -37,8 +37,6 @@ import type {
 const { Text, Title } = Typography;
 
 const RULE_GROUPS = ['比价', '短信与登录', '广告', '引导与账号', '风控免告警'];
-const deviceSourceScope = (ruleCode: string) =>
-  ruleCode === 'compare.start.daily' ? 'comparison' : 'auth';
 
 const STATUS_META: Record<
   LimitOverride['status'],
@@ -90,7 +88,6 @@ interface RuleSelectorProps {
   subjectType: LimitSubjectType;
   activeGroup: string;
   onActiveGroupChange: (group: string) => void;
-  onIncompatibleDeviceScope: () => void;
 }
 
 function RuleSelector({
@@ -100,10 +97,7 @@ function RuleSelector({
   subjectType,
   activeGroup,
   onActiveGroupChange,
-  onIncompatibleDeviceScope,
 }: RuleSelectorProps) {
-  const selectedDeviceScopes = new Set(value.map(deviceSourceScope));
-
   return (
     <Tabs
       size="small"
@@ -127,32 +121,16 @@ function RuleSelector({
                   ...otherGroupCodes,
                   ...(values as string[]),
                 ];
-                if (
-                  subjectType === 'device' &&
-                  new Set(nextCodes.map(deviceSourceScope)).size > 1
-                ) {
-                  onIncompatibleDeviceScope();
-                  return;
-                }
                 onChange?.(nextCodes);
               }}
             >
               <Space direction="vertical" size={10}>
                 {groupRules.map((rule) => {
-                  const deviceScope = deviceSourceScope(rule.code);
-                  const incompatibleDeviceScope =
-                    subjectType === 'device' &&
-                    selectedDeviceScopes.size >= 1 &&
-                    !value.includes(rule.code) &&
-                    !selectedDeviceScopes.has(deviceScope);
                   return (
                     <Checkbox
                       key={rule.code}
                       value={rule.code}
-                      disabled={
-                        !rule.subject_types.includes(subjectType) ||
-                        incompatibleDeviceScope
-                      }
+                      disabled={!rule.subject_types.includes(subjectType)}
                     >
                       {rule.label}
                     </Checkbox>
@@ -930,18 +908,9 @@ export default function LimitWhitelistPage() {
                     .filter((rule) => rule.subject_types.includes(value))
                     .map((rule) => rule.code),
                 );
-                let nextCodes = editorRuleCodes.filter((code) =>
+                const nextCodes = editorRuleCodes.filter((code) =>
                   compatibleCodes.has(code),
                 );
-                if (
-                  value === 'device' &&
-                  new Set(nextCodes.map(deviceSourceScope)).size > 1
-                ) {
-                  nextCodes = [];
-                  void message.warning(
-                    '比价设备与短信/登录设备来自不同数据源，请重新选择同一类解除限制项',
-                  );
-                }
                 setEditorRuleCodes(nextCodes);
                 setRuleSelectionError(false);
               }}
@@ -1036,11 +1005,6 @@ export default function LimitWhitelistPage() {
               subjectType={effectiveSubjectType}
               activeGroup={editorRuleGroup}
               onActiveGroupChange={setEditorRuleGroup}
-              onIncompatibleDeviceScope={() => {
-                void message.warning(
-                  '比价设备与短信/登录设备来自不同数据源，不能在同一白名单中混选',
-                );
-              }}
             />
           </Form.Item>
           {editing && (
-- 
2.52.0


From be6fa0aa9eafd253eadf1c87808cefc354cf44fe Mon Sep 17 00:00:00 2001
From: linkeyu <798648091@qq.com>
Date: Fri, 31 Jul 2026 14:57:38 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=98=8E?=
 =?UTF-8?q?=E7=A1=AE=E7=99=BD=E5=90=8D=E5=8D=95=E4=B8=BB=E4=BD=93=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将主体类型与手机号或设备 ID 分列展示，补充类型筛选，并移除白名单配置标题后的主体数量。
---
 src/app/(main)/limit-whitelist/page.tsx | 29 +++++++++++++++----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/app/(main)/limit-whitelist/page.tsx b/src/app/(main)/limit-whitelist/page.tsx
index 0b0b336..785a2fd 100644
--- a/src/app/(main)/limit-whitelist/page.tsx
+++ b/src/app/(main)/limit-whitelist/page.tsx
@@ -506,16 +506,21 @@ export default function LimitWhitelistPage() {
 
   const columns: ColumnsType<LimitSubject> = [
     {
-      title: '主体',
-      key: 'subject',
-      width: 300,
-      render: (_, row) => (
-        <Space size={8}>
-          {row.subject_type === 'device' && <Tag color="cyan">设备</Tag>}
-          <Text>{row.subject_value}</Text>
-        </Space>
+      title: '类型',
+      dataIndex: 'subject_type',
+      width: 110,
+      render: (value: LimitSubjectType) => (
+        <Tag color={value === 'device' ? 'cyan' : 'blue'}>
+          {value === 'device' ? '设备 ID' : '手机号'}
+        </Tag>
       ),
     },
+    {
+      title: '手机号 / 设备 ID',
+      dataIndex: 'subject_value',
+      width: 220,
+      render: (value: string) => <Text>{value}</Text>,
+    },
     {
       title: '解除限制项',
       key: 'rule',
@@ -790,7 +795,7 @@ export default function LimitWhitelistPage() {
       <Card
         title={
           <Space size={12}>
-            <span>{`白名单配置（${total} 个主体）`}</span>
+            <span>白名单配置</span>
             <Button
               type="primary"
               size="small"
@@ -805,13 +810,13 @@ export default function LimitWhitelistPage() {
           <Space wrap>
             <Select
               allowClear
-              placeholder="主体类型"
+              placeholder="类型"
               style={{ width: 120 }}
               value={subjectType}
               onChange={setSubjectType}
               options={[
                 { value: 'phone', label: '手机号' },
-                { value: 'device', label: '设备' },
+                { value: 'device', label: '设备 ID' },
               ]}
             />
             <Select
@@ -850,7 +855,7 @@ export default function LimitWhitelistPage() {
           loading={loading}
           columns={columns}
           dataSource={rows}
-          scroll={{ x: 1590 }}
+          scroll={{ x: 1700 }}
           pagination={{
             current: page,
             pageSize,
-- 
2.52.0


From 9e150c64aa50c2da1b376b1259a6cecb3e702d39 Mon Sep 17 00:00:00 2001
From: linkeyu <798648091@qq.com>
Date: Fri, 31 Jul 2026 15:01:56 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=99=BD?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E8=8F=9C=E5=8D=95=E6=9B=B4=E5=90=8D=E4=B8=BA?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

菜单名称调整为限制策略，页面标题同步为限制策略与白名单，并更新相关配置提示，准确表达全局阈值与白名单管理能力。
---
 src/app/(main)/config/GuideVideoConfig.tsx | 2 +-
 src/app/(main)/layout.tsx                  | 4 ++--
 src/app/(main)/limit-whitelist/page.tsx    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/(main)/config/GuideVideoConfig.tsx b/src/app/(main)/config/GuideVideoConfig.tsx
index cb721fd..c6cd7d8 100644
--- a/src/app/(main)/config/GuideVideoConfig.tsx
+++ b/src/app/(main)/config/GuideVideoConfig.tsx
@@ -151,7 +151,7 @@ function SceneConfig({ scene }: { scene: Scene }) {
         次在等候浮层广告位播放本视频并奖励金币。次数按账号、按功能分别计算；
         开播即计次，播完或中途关闭均发放当次配置的金币。
         {scene === 'coupon' &&
-          '领券引导视频的播放次数上限请在「监控审计 → 白名单」中调整。'}
+          '领券引导视频的播放次数上限请在「监控审计 → 限制策略」中调整。'}
       </p>
       {loading || !cfg ? (
         <Spin style={{ display: 'block', margin: '24px 0' }} />
diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx
index 3826e98..44a555a 100644
--- a/src/app/(main)/layout.tsx
+++ b/src/app/(main)/layout.tsx
@@ -4,6 +4,7 @@ import { useEffect, useRef, useState } from 'react';
 import { usePathname, useRouter } from 'next/navigation';
 import {
   BarChartOutlined,
+  ControlOutlined,
   DashboardOutlined,
   DatabaseOutlined,
   FileSearchOutlined,
@@ -18,7 +19,6 @@ import {
   ProfileOutlined,
   SafetyCertificateOutlined,
   SecurityScanOutlined,
-  StopOutlined,
   SettingOutlined,
   ShareAltOutlined,
   TeamOutlined,
@@ -106,7 +106,7 @@ const NAV_GROUPS: NavGroup[] = [
       { key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
       { key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
       { key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
-      { key: '/limit-whitelist', icon: <StopOutlined />, label: '白名单' },
+      { key: '/limit-whitelist', icon: <ControlOutlined />, label: '限制策略' },
     ],
   },
 ];
diff --git a/src/app/(main)/limit-whitelist/page.tsx b/src/app/(main)/limit-whitelist/page.tsx
index 785a2fd..dc21a67 100644
--- a/src/app/(main)/limit-whitelist/page.tsx
+++ b/src/app/(main)/limit-whitelist/page.tsx
@@ -764,7 +764,7 @@ export default function LimitWhitelistPage() {
       <Space align="start" style={{ width: '100%', marginBottom: 16 }}>
         <div>
           <Title level={2} style={{ marginBottom: 4 }}>
-            白名单
+            限制策略与白名单
           </Title>
           <Text type="secondary">
             统一管理限制全局值，并按手机号或设备设置临时白名单。
-- 
2.52.0


From 08a3bcb683dbe62671f0686a6a0116d09edbb13d Mon Sep 17 00:00:00 2001
From: linkeyu <798648091@qq.com>
Date: Fri, 31 Jul 2026 16:50:27 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E9=99=90=E5=88=B6=E7=AD=96=E7=95=A5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

统一白名单时间口径并接入带乱序保护的分页列表；优化风控页路由跳转、无手机号禁用提示及后端分组计数复用。
---
 src/app/(main)/limit-whitelist/page.tsx | 103 ++++++++++++------------
 src/app/(main)/risk-monitor/page.tsx    |  24 +++---
 src/lib/usePagedList.ts                 |   9 ++-
 3 files changed, 71 insertions(+), 65 deletions(-)

diff --git a/src/app/(main)/limit-whitelist/page.tsx b/src/app/(main)/limit-whitelist/page.tsx
index dc21a67..f720e76 100644
--- a/src/app/(main)/limit-whitelist/page.tsx
+++ b/src/app/(main)/limit-whitelist/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import {
   Alert,
   App,
@@ -26,6 +26,8 @@ import { EditOutlined, PlusOutlined, SearchOutlined } from '@ant-design/icons';
 import dayjs, { type Dayjs } from 'dayjs';
 
 import { api, errMsg } from '@/lib/api';
+import { formatUtcTime, utcDayjs } from '@/lib/format';
+import { usePagedList } from '@/lib/usePagedList';
 import type {
   LimitOverride,
   LimitRule,
@@ -71,8 +73,7 @@ interface WhitelistFilters {
 
 const asIso = (value?: number | null) =>
   value ? dayjs(value).toISOString() : null;
-const showTime = (value: string | null) =>
-  value ? dayjs(value).format('YYYY-MM-DD HH:mm') : '-';
+const showTime = (value: string | null) => formatUtcTime(value);
 const normalizeSubjectValue = (
   subjectType: LimitSubjectType,
   value: string,
@@ -148,11 +149,6 @@ function RuleSelector({
 export default function LimitWhitelistPage() {
   const { message, modal } = App.useApp();
   const [rules, setRules] = useState<LimitRule[]>([]);
-  const [rows, setRows] = useState<LimitSubject[]>([]);
-  const [total, setTotal] = useState(0);
-  const [page, setPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
-  const [loading, setLoading] = useState(true);
   const [keyword, setKeyword] = useState('');
   const [subjectType, setSubjectType] = useState<LimitSubjectType | undefined>();
   const [ruleFilter, setRuleFilter] = useState<string | undefined>();
@@ -180,37 +176,45 @@ export default function LimitWhitelistPage() {
     createPreset?.subject_type ||
     'phone';
 
-  const load = useCallback(async () => {
-    setLoading(true);
-    try {
-      const [ruleResponse, overrideResponse] = await Promise.all([
-        api.get<LimitRule[]>('/admin/api/limit-whitelist/rules'),
-        api.get<LimitSubjectList>('/admin/api/limit-whitelist/subjects', {
-          params: {
-            keyword: appliedFilters.keyword.trim() || undefined,
-            subject_type: appliedFilters.subjectType,
-            rule_code: appliedFilters.ruleCode,
-            offset: (page - 1) * pageSize,
-            limit: pageSize,
-          },
-        }),
-      ]);
-      setRules(ruleResponse.data);
-      setRows(overrideResponse.data.items);
-      setTotal(overrideResponse.data.total);
-    } catch (error) {
-      message.error(errMsg(error, '白名单数据加载失败'));
-    } finally {
-      setLoading(false);
-    }
-  }, [appliedFilters, message, page, pageSize]);
+  const subjectFilters = useMemo(
+    () => ({
+      keyword: appliedFilters.keyword.trim() || undefined,
+      subject_type: appliedFilters.subjectType,
+      rule_code: appliedFilters.ruleCode,
+    }),
+    [appliedFilters],
+  );
+  const {
+    items: rows,
+    total,
+    page,
+    pageSize,
+    loading,
+    onChange: onPageChange,
+    reload: reloadSubjects,
+  } = usePagedList<LimitSubject>(
+    '/admin/api/limit-whitelist/subjects',
+    subjectFilters,
+    10,
+    'offset',
+  );
 
   useEffect(() => {
-    void load();
-  }, [load]);
+    let active = true;
+    void api
+      .get<LimitRule[]>('/admin/api/limit-whitelist/rules')
+      .then((response) => {
+        if (active) setRules(response.data);
+      })
+      .catch((error) => {
+        if (active) message.error(errMsg(error, '限制规则加载失败'));
+      });
+    return () => {
+      active = false;
+    };
+  }, [message]);
 
   const applyFilters = () => {
-    setPage(1);
     setAppliedFilters({
       keyword,
       subjectType,
@@ -290,8 +294,8 @@ export default function LimitWhitelistPage() {
         enabled: editing.items.every((item) => item.enabled),
         valid_range: expiresAt
           ? [
-              startsAt[0] ? dayjs(startsAt[0]).valueOf() : Date.now(),
-              dayjs(expiresAt).valueOf(),
+              startsAt[0] ? utcDayjs(startsAt[0]).valueOf() : Date.now(),
+              utcDayjs(expiresAt).valueOf(),
             ]
           : null,
         reason: reasons.size === 1 ? Array.from(reasons)[0] : '',
@@ -417,7 +421,7 @@ export default function LimitWhitelistPage() {
       if (new URLSearchParams(window.location.search).get('create') === '1') {
         window.history.replaceState({}, '', window.location.pathname);
       }
-      await load();
+      await reloadSubjects();
     } catch (error) {
       message.error(errMsg(error));
     } finally {
@@ -434,7 +438,10 @@ export default function LimitWhitelistPage() {
       });
       message.success('全局限制已更新，业务接口即时读取新值');
       setGlobalRule(null);
-      await load();
+      const response = await api.get<LimitRule[]>(
+        '/admin/api/limit-whitelist/rules',
+      );
+      setRules(response.data);
     } catch (error) {
       message.error(errMsg(error));
     } finally {
@@ -452,10 +459,10 @@ export default function LimitWhitelistPage() {
         enabled,
       });
       message.success(enabled ? '白名单已启用' : '白名单已停用');
-      await load();
+      await reloadSubjects();
     } catch (error) {
       message.error(errMsg(error, '白名单启用状态更新失败'));
-      await load();
+      await reloadSubjects();
     } finally {
       setTogglingSubject(null);
     }
@@ -525,12 +532,7 @@ export default function LimitWhitelistPage() {
       title: '解除限制项',
       key: 'rule',
       render: (_, row) => {
-        const groupCounts = Object.fromEntries(
-          RULE_GROUPS.map((group) => [
-            group,
-            row.items.filter((item) => item.rule_group === group).length,
-          ]),
-        );
+        const groupCounts = row.group_counts;
         return (
           <Popover
             trigger={['hover', 'click']}
@@ -863,12 +865,7 @@ export default function LimitWhitelistPage() {
             showSizeChanger: true,
             pageSizeOptions: [10, 20, 50],
             showTotal: (count) => `共 ${count} 个主体`,
-            onChange: (nextPage, nextPageSize) => {
-              setPage(
-                nextPageSize !== pageSize ? 1 : nextPage,
-              );
-              setPageSize(nextPageSize);
-            },
+            onChange: onPageChange,
           }}
         />
       </Card>
diff --git a/src/app/(main)/risk-monitor/page.tsx b/src/app/(main)/risk-monitor/page.tsx
index f0e5b74..272f2fe 100644
--- a/src/app/(main)/risk-monitor/page.tsx
+++ b/src/app/(main)/risk-monitor/page.tsx
@@ -24,6 +24,7 @@ import {
   RightOutlined,
 } from '@ant-design/icons';
 import dayjs from 'dayjs';
+import { useRouter } from 'next/navigation';
 import { api, errMsg } from '@/lib/api';
 import { formatUtcTime, utcDayjs } from '@/lib/format';
 import type {
@@ -272,6 +273,7 @@ function DetailTable({
 }
 
 export default function RiskMonitorPage() {
+  const router = useRouter();
   const { message, modal } = App.useApp();
   const [summary, setSummary] = useState<RiskMonitorSummary | null>(null);
   const [lists, setLists] = useState<Partial<Record<RiskKind, RiskIncidentPage>>>({});
@@ -627,9 +629,9 @@ export default function RiskMonitorPage() {
         subject_value: subjectValue,
         rule_code: ruleCode[row.kind],
       });
-      window.location.assign(`/limit-whitelist?${params.toString()}`);
+      router.push(`/limit-whitelist?${params.toString()}`);
     },
-    [message],
+    [message, router],
   );
 
   const columns = useCallback(
@@ -642,9 +644,15 @@ export default function RiskMonitorPage() {
         width: 280,
         render: (_: unknown, row: RiskIncidentItem) => {
           const open = expanded.has(row.incident_id);
-          const canAddToWhitelist =
-            row.kind === 'compare' ||
-            !row.subject_id.startsWith('legacy-ip:');
+          const whitelistUnavailableReason =
+            row.kind === 'compare'
+              ? row.phone
+                ? undefined
+                : '该风险记录没有关联手机号，暂时无法加入白名单'
+              : row.subject_id.startsWith('legacy-ip:')
+                ? '旧客户端未上报真实设备 ID，无法加入设备白名单'
+                : undefined;
+          const canAddToWhitelist = !whitelistUnavailableReason;
           return (
             <span className={styles.actionGroup}>
               <Button
@@ -657,11 +665,7 @@ export default function RiskMonitorPage() {
                 {open ? '收起' : '展开'}
               </Button>
               <Tooltip
-                title={
-                  canAddToWhitelist
-                    ? undefined
-                    : '旧客户端未上报真实设备 ID，无法加入设备白名单'
-                }
+                title={whitelistUnavailableReason}
               >
                 <span>
                   <Button
diff --git a/src/lib/usePagedList.ts b/src/lib/usePagedList.ts
index 00cad8f..697a390 100644
--- a/src/lib/usePagedList.ts
+++ b/src/lib/usePagedList.ts
@@ -15,6 +15,7 @@ export function usePagedList<T>(
   url: string,
   filters: Record<string, unknown>,
   initialPageSize = 20,
+  offsetParam: 'cursor' | 'offset' = 'cursor',
 ) {
   const [items, setItems] = useState<T[]>([]);
   const [total, setTotal] = useState(0);
@@ -31,7 +32,11 @@ export function usePagedList<T>(
       requestSeq.current = seq;
       setLoading(true);
       try {
-        const params = { ...JSON.parse(filtersKey), limit: ps, cursor: (p - 1) * ps };
+        const params = {
+          ...JSON.parse(filtersKey),
+          limit: ps,
+          [offsetParam]: (p - 1) * ps,
+        };
         const { data } = await api.get<CursorPage<T>>(url, { params });
         if (requestSeq.current !== seq) return; // 丢弃过期响应(快速切页/筛选)
         setItems(data.items);
@@ -40,7 +45,7 @@ export function usePagedList<T>(
         if (requestSeq.current === seq) setLoading(false);
       }
     },
-    [url, filtersKey],
+    [url, filtersKey, offsetParam],
   );
 
   // 筛选变化:回第 1 页重载
-- 
2.52.0