From 8d0e784d640a7cc942acc56975a411e18ea034cf Mon Sep 17 00:00:00 2001 From: dushixiang Date: Sun, 25 Jan 2026 20:48:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E6=8E=A2?= =?UTF-8?q?=E9=92=88=E5=88=97=E8=A1=A8=E4=BB=A3=E7=A0=81=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/admin/pages/AlertRecords/index.tsx | 6 +++--- web/src/admin/pages/DDNS/DDNSModal.tsx | 12 ++++++----- web/src/admin/pages/Monitors/MonitorModal.tsx | 6 +++--- .../admin/pages/Settings/PublicIPConfig.tsx | 20 +++++++++---------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/web/src/admin/pages/AlertRecords/index.tsx b/web/src/admin/pages/AlertRecords/index.tsx index 0d54018..d0b1146 100644 --- a/web/src/admin/pages/AlertRecords/index.tsx +++ b/web/src/admin/pages/AlertRecords/index.tsx @@ -8,8 +8,8 @@ import type {AlertRecord} from '@/types'; import dayjs from 'dayjs'; import {getErrorMessage} from '@/lib/utils'; import {PageHeader} from '@admin/components'; -import {getAgentPaging} from '@/api/agent.ts'; import {useQuery, useQueryClient} from '@tanstack/react-query'; +import {listAgentsByAdmin} from "@/api/agent.ts"; const AlertRecordList = () => { const {message: messageApi, modal} = App.useApp(); @@ -24,7 +24,7 @@ const AlertRecordList = () => { const {data: agentsData} = useQuery({ queryKey: ['agents-for-alert-filter'], queryFn: async () => { - const response = await getAgentPaging(1, 1000); + const response = await listAgentsByAdmin(); return response.data; }, }); @@ -90,7 +90,7 @@ const AlertRecordList = () => { }; // 计算探针选项 - const agentOptions = agentsData?.items?.map((agent) => ({ + const agentOptions = agentsData?.map((agent) => ({ label: agent.name || agent.id, value: agent.id, })) || []; diff --git a/web/src/admin/pages/DDNS/DDNSModal.tsx b/web/src/admin/pages/DDNS/DDNSModal.tsx index 7ca6289..e7750e7 100644 --- a/web/src/admin/pages/DDNS/DDNSModal.tsx +++ b/web/src/admin/pages/DDNS/DDNSModal.tsx @@ -3,7 +3,7 @@ import {App, Form, Input, Modal, Select, Switch} from 'antd'; import {createDDNSConfig, getDDNSConfig, updateDDNSConfig} from '@/api/ddns.ts'; import {getDNSProviders} from '@/api/dnsProvider.ts'; import type {CreateDDNSConfigRequest, UpdateDDNSConfigRequest} from '@/types/ddns.ts'; -import {getAgentPaging} from '@/api/agent.ts'; +import {listAgentsByAdmin} from '@/api/agent.ts'; import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'; interface DDNSModalProps { @@ -41,8 +41,8 @@ const DDNSModal = ({open, id, onCancel, onSuccess}: DDNSModalProps) => { const {data: agentsData} = useQuery({ queryKey: ['agents', 'paging'], queryFn: async () => { - const data = await getAgentPaging(1, 1000); - return data.data.items || []; + const data = await listAgentsByAdmin(); + return data.data || []; }, enabled: open && !isEditMode, }); @@ -218,7 +218,8 @@ const DDNSModal = ({open, id, onCancel, onSuccess}: DDNSModalProps) => { - prevValues.enableIpv4 !== currentValues.enableIpv4}> + prevValues.enableIpv4 !== currentValues.enableIpv4}> {() => { const enableIpv4 = form.getFieldValue('enableIpv4'); if (!enableIpv4) { @@ -279,7 +280,8 @@ const DDNSModal = ({open, id, onCancel, onSuccess}: DDNSModalProps) => { - prevValues.enableIpv6 !== currentValues.enableIpv6}> + prevValues.enableIpv6 !== currentValues.enableIpv6}> {() => { const enableIpv6 = form.getFieldValue('enableIpv6'); if (!enableIpv6) { diff --git a/web/src/admin/pages/Monitors/MonitorModal.tsx b/web/src/admin/pages/Monitors/MonitorModal.tsx index 1c19907..5ffb4ce 100644 --- a/web/src/admin/pages/Monitors/MonitorModal.tsx +++ b/web/src/admin/pages/Monitors/MonitorModal.tsx @@ -2,7 +2,7 @@ import {useEffect, useMemo} from 'react'; import {App, Button, Form, Input, InputNumber, Modal, Select, Space, Switch} from 'antd'; import {MinusCircle, PlusCircle} from 'lucide-react'; import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'; -import {getAgentPaging} from '@/api/agent.ts'; +import {listAgentsByAdmin} from '@/api/agent.ts'; import {createMonitor, getMonitor, updateMonitor} from '@/api/monitor.ts'; import type {Agent, MonitorTaskRequest} from '@/types'; import {getErrorMessage} from '@/lib/utils'; @@ -31,8 +31,8 @@ const MonitorModal = ({open, monitorId, onCancel, onSuccess}: MonitorModalProps) } = useQuery({ queryKey: ['agents', 'paging'], queryFn: async () => { - const response = await getAgentPaging(1, 1000); - return response.data.items || []; + const response = await listAgentsByAdmin(); + return response.data || []; }, enabled: open, }); diff --git a/web/src/admin/pages/Settings/PublicIPConfig.tsx b/web/src/admin/pages/Settings/PublicIPConfig.tsx index 99a1c98..08424d7 100644 --- a/web/src/admin/pages/Settings/PublicIPConfig.tsx +++ b/web/src/admin/pages/Settings/PublicIPConfig.tsx @@ -3,7 +3,7 @@ import {App, Button, Card, Form, Input, InputNumber, Radio, Select, Space, Spin, import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'; import type {PublicIPConfig} from '@/api/property'; import {getPublicIPConfig, savePublicIPConfig} from '@/api/property'; -import {getAgentPaging} from '@/api/agent.ts'; +import {listAgentsByAdmin} from '@/api/agent.ts'; import {getErrorMessage} from '@/lib/utils'; import type {Agent} from '@/types'; @@ -44,10 +44,10 @@ const PublicIPConfigComponent = ({defaultIPv4APIs, defaultIPv6APIs}: PublicIPCon const {data: agentsResponse} = useQuery({ queryKey: ['admin', 'agents', 'public-ip'], - queryFn: () => getAgentPaging(1, 1000), + queryFn: () => listAgentsByAdmin(), }); - const agentOptions = (agentsResponse?.data?.items || []).map((agent) => ({ + const agentOptions = (agentsResponse?.data || []).map((agent) => ({ label: formatAgentLabel(agent), value: agent.id, })); @@ -128,7 +128,7 @@ const PublicIPConfigComponent = ({defaultIPv4APIs, defaultIPv6APIs}: PublicIPCon if (isLoading) { return (
- +
); } @@ -145,21 +145,21 @@ const PublicIPConfigComponent = ({defaultIPv4APIs, defaultIPv6APIs}: PublicIPCon
- + - +
- + @@ -196,13 +196,13 @@ const PublicIPConfigComponent = ({defaultIPv4APIs, defaultIPv6APIs}: PublicIPCon name="ipv4ApisText" tooltip="每行一个 HTTP/HTTPS API 地址" > - + - + @@ -239,7 +239,7 @@ const PublicIPConfigComponent = ({defaultIPv4APIs, defaultIPv6APIs}: PublicIPCon name="ipv6ApisText" tooltip="每行一个 HTTP/HTTPS API 地址" > - +