diff --git a/Changelog.md b/Changelog.md index 6bd4e1dac..7b7d5f569 100644 --- a/Changelog.md +++ b/Changelog.md @@ -67,7 +67,7 @@ - 优化连接、规则和日志筛选:切换页面后保留过滤条件 - 优化全局模式代理列表:仅显示 `GLOBAL` 节点,选中其中的策略组时才显示该组 - 优化设置页开关和选项所在行的鼠标悬停高亮,便于对应说明与控件 -- 优化首页「当前节点」卡片:代理组列表加入 `fallback` 代理组,切换到 `url-test` 或 `fallback` 代理组时同样联动 `select` 代理组 +- 优化首页「当前节点」卡片:按规则指向的代理组逐级显示和切换实际生效的节点,切换到 `url-test` 或 `fallback` 代理组时同样联动 `select` 代理组 **🍎 macOS** diff --git a/src/components/home/current-proxy-card.tsx b/src/components/home/current-proxy-card.tsx index 4dee5b8d4..884533408 100644 --- a/src/components/home/current-proxy-card.tsx +++ b/src/components/home/current-proxy-card.tsx @@ -54,6 +54,7 @@ import { useClashConfigData, useCoreDataStatus, useProxiesData, + useRulesData, } from '@/providers/app-data-context' import { followProxyGroup } from '@/services/cmds' import delayManager from '@/services/delay' @@ -63,7 +64,9 @@ import { isInteractableMember, memberDetails, resolveMember, + type InteractableProxyMemberOccurrence, type ProxyGroupView, + type ProxyViewV1, type ResolvedProxyMember, } from '@/types/proxy-view' import { debugLog } from '@/utils/debug' @@ -118,7 +121,37 @@ interface ProxyOption { disabled: boolean } -type OpenSelect = 'group' | 'proxy' | null +interface RuleEntry { + group: ProxyGroupView + ruleCount: number + isDefault: boolean +} + +interface ChainLevel { + group: Pick + current?: InteractableProxyMemberOccurrence +} + +const SELECTABLE_GROUP_TYPES = ['Selector', 'URLTest', 'Fallback'] + +const ENTRY_SELECT = 'entry' +const levelSelect = (groupName: string) => `level:${groupName}` + +const resolveChain = (view: ProxyViewV1, entry: ProxyGroupView) => { + const levels: ChainLevel[] = [] + let group: ProxyGroupView | undefined = entry + while (group) { + const current = findCurrentGroupMember(view, group) + levels.push({ group, current }) + // A load-balance member has no single active node, so the chain ends on it. + group = + current?.member.kind === 'group' && + SELECTABLE_GROUP_TYPES.includes(current.member.group.type) + ? current.member.group + : undefined + } + return levels +} function convertDelayColor( delayValue: number, @@ -423,13 +456,11 @@ const PersistentSelect = ({ interface PersistentProxySelectProps extends Omit { - value: string - selectedName: string - groupName: string - fixed?: string | null - selectedDelay: number - options: ProxyOption[] - onChange: (value: string) => void + view: ProxyViewV1 + level: ChainLevel + sortType: ProxySortType + latencyTimeout?: number + onChange: (groupName: string, proxyName: string, fixed?: string) => void } const ProxyMenuOption = memo(function ProxyMenuOption({ @@ -445,7 +476,7 @@ const ProxyMenuOption = memo(function ProxyMenuOption({ isFixed: boolean fixedProxyInUsed: boolean delay: number - onChange: (value: string) => void + onChange: (proxyName: string) => void }) { return ( { - if (!option.disabled) onChange(option.value) + if (!option.disabled) onChange(option.name) }} sx={{ display: 'flex', @@ -499,17 +530,49 @@ const ProxyMenuOption = memo(function ProxyMenuOption({ }) const PersistentProxySelect = ({ - groupName, - fixed, - selectedName, - selectedDelay, - options, - value, + view, + level: { group, current }, + sortType, + latencyTimeout, onChange, ...props }: PersistentProxySelectProps) => { + const groupName = group.name + const fixed = group.fixed + const selectedName = current?.member.ref.name ?? '' + const value = current ? optionValue(current.memberIndex, current.member) : '' const fixedProxyInUsed = selectedName === fixed + const delays = useGroupDelays(groupName, current?.member, props.open) + const selectedDelay = + typeof delays === 'number' + ? delays + : current + ? delays.of(current.member) + : -1 + + const options = useMemo(() => { + if (typeof delays === 'number') return [] + const unsorted = group.members.map((memberRef, memberIndex) => { + const member = resolveMember(view, memberRef) + return { + memberIndex, + member, + value: optionValue(memberIndex, member), + name: member.ref.name, + disabled: !isInteractableMember(member), + } + }) + return sortType === 2 + ? unsorted.sort((a, b) => a.name.localeCompare(b.name)) + : sortProxyOptions(unsorted, sortType, delays.of, latencyTimeout) + }, [delays, group.members, latencyTimeout, sortType, view]) + + const handleChange = useCallback( + (proxyName: string) => onChange(groupName, proxyName, fixed), + [fixed, groupName, onChange], + ) + return ( ) }) @@ -571,6 +634,7 @@ export const CurrentProxyCard = () => { const navigate = useNavigate() const theme = useTheme() const { proxyView } = useProxiesData() + const { rules } = useRulesData() const { clashConfig } = useClashConfigData() const { refreshProxy } = useAppRefreshers() const { isCoreDataPending } = useCoreDataStatus() @@ -649,8 +713,8 @@ export const CurrentProxyCard = () => { return savedSortType ? (Number(savedSortType) as ProxySortType) : 0 }) - const [lastGroupName, setLastGroupName] = useState('') - const [openSelect, setOpenSelect] = useState(null) + const [pickedGroupName, setPickedGroupName] = useState('') + const [openSelect, setOpenSelect] = useState(null) const [openSelectMode, setOpenSelectMode] = useState(mode) if (openSelectMode !== mode) { setOpenSelectMode(mode) @@ -661,151 +725,131 @@ export const CurrentProxyCard = () => { const autoCheckInProgressRef = useRef(false) - const selectableGroups = useMemo(() => { + const entries = useMemo(() => { if (!proxyView) return [] - return proxyView.groups.filter( - (group) => - !group.hidden && - ['Selector', 'URLTest', 'Fallback'].includes(group.type), - ) - }, [proxyView]) + const isSelectable = (group: ProxyGroupView) => + !group.hidden && SELECTABLE_GROUP_TYPES.includes(group.type) + const ruleCounts = new Map() + for (const { proxy } of rules) { + ruleCounts.set(proxy, (ruleCounts.get(proxy) ?? 0) + 1) + } + const matchTarget = rules.find(({ type }) => type === 'Match')?.proxy + // The view keeps GLOBAL out of `groups`, yet rules may name it. + const ruleEntries = [ + ...proxyView.groups, + ...(proxyView.global ? [proxyView.global] : []), + ] + .filter(isSelectable) + .flatMap((group) => { + const ruleCount = ruleCounts.get(group.name) + return ruleCount + ? [{ group, ruleCount, isDefault: group.name === matchTarget }] + : [] + }) + // Rules that failed to load, or that name no selectable group, leave nothing to anchor on. + return ruleEntries.length > 0 + ? ruleEntries + : proxyView.groups.filter(isSelectable).map((group) => ({ + group, + ruleCount: 0, + isDefault: false, + })) + }, [proxyView, rules]) const selectedGroupName = useMemo(() => { if (isDirectMode) return 'DIRECT' - if (!proxyView) return lastGroupName + if (!proxyView) return '' if (isGlobalMode) return proxyView.global?.name ?? 'GLOBAL' - const hasGroup = (name: string | null) => - !!name && selectableGroups.some((group) => group.name === name) - if (hasGroup(lastGroupName)) return lastGroupName + const hasEntry = (name: string | null) => + !!name && entries.some(({ group }) => group.name === name) + if (hasEntry(pickedGroupName)) return pickedGroupName const savedGroup = readProfileScopedItem(STORAGE_KEY_GROUP) - if (hasGroup(savedGroup)) return savedGroup! + if (hasEntry(savedGroup)) return savedGroup! - const primaryKeywords = ['auto', 'select', 'proxy', '节点选择', '自动选择'] - const primaryGroup = - selectableGroups.find((group) => - primaryKeywords.some((keyword) => - group.name.toLowerCase().includes(keyword.toLowerCase()), - ), - ) ?? selectableGroups[0] - return primaryGroup?.name ?? '' + const defaultEntry = + entries.find(({ isDefault }) => isDefault) ?? + entries.reduce( + (most, entry) => + most && most.ruleCount >= entry.ruleCount ? most : entry, + undefined, + ) + return defaultEntry?.group.name ?? '' }, [ + entries, isDirectMode, isGlobalMode, - lastGroupName, + pickedGroupName, proxyView, readProfileScopedItem, - selectableGroups, - ]) - // Keep the shown group, auto picks included, until it leaves the profile. - if (proxyView && lastGroupName !== selectedGroupName) { - setLastGroupName(selectedGroupName) - } - - const selectedGroup = useMemo(() => { - if (!proxyView || isDirectMode) return null - if (isGlobalMode) return proxyView.global - return ( - selectableGroups.find(({ name }) => name === selectedGroupName) ?? null - ) - }, [ - isDirectMode, - isGlobalMode, - proxyView, - selectableGroups, - selectedGroupName, ]) - const optionsForGroup = useCallback( - (group: ProxyGroupView | null): ProxyOption[] => - proxyView && group - ? group.members.map((memberRef, memberIndex) => { - const member = resolveMember(proxyView, memberRef) - return { - memberIndex, - member, - value: optionValue(memberIndex, member), - name: member.ref.name, - disabled: !isInteractableMember(member), - } - }) - : [], - [proxyView], - ) + const selectedEntry = + isGlobalMode || isDirectMode + ? undefined + : entries.find(({ group }) => group.name === selectedGroupName) + const selectedGroup = isGlobalMode ? proxyView?.global : selectedEntry?.group - const unsortedProxyOptions = useMemo( - () => optionsForGroup(selectedGroup), - [optionsForGroup, selectedGroup], - ) - - const currentOption = useMemo(() => { - if (!proxyView) return undefined + const levels = useMemo(() => { + if (!proxyView) return [] if (isDirectMode) { const node = proxyView.direct == null ? undefined : getRecord(proxyView, proxyView.direct) return node - ? ({ - memberIndex: 0, - member: { - kind: 'node', - ref: { kind: 'node', name: node.name, recordId: node.recordId }, - node, + ? [ + { + group: { name: 'DIRECT', members: [] }, + current: { + memberIndex: 0, + member: { + kind: 'node', + ref: { + kind: 'node', + name: node.name, + recordId: node.recordId, + }, + node, + }, + }, }, - } satisfies Pick) - : undefined + ] + : [] } - return selectedGroup - ? findCurrentGroupMember(proxyView, selectedGroup) - : undefined + return selectedGroup ? resolveChain(proxyView, selectedGroup) : [] }, [isDirectMode, proxyView, selectedGroup]) + // A chain deeper than two groups shares one row above the node list so the card stays three rows tall. + const levelRows = + levels.length > 2 + ? [levels.slice(0, -1), levels.slice(-1)] + : levels.map((level) => [level]) + const leafLevel = levels.at(-1) + const leafGroupName = leafLevel?.group.name ?? '' const handleGroupChange = useCallback( (newGroupName: string) => { if (isGlobalMode || isDirectMode) return - setLastGroupName(newGroupName) + setPickedGroupName(newGroupName) writeProfileScopedItem(STORAGE_KEY_GROUP, newGroupName) void followProxyGroup(newGroupName) }, [isDirectMode, isGlobalMode, writeProfileScopedItem], ) - const handleProxyChange = useCallback( - (value: string) => { - if (isDirectMode) return - const option = unsortedProxyOptions.find( - (candidate) => candidate.value === value, - ) - if (!selectedGroup || !option || !isInteractableMember(option.member)) { - return - } - const nextName = option.member.ref.name - // The profile selection is the durable source across core restarts and run modes. - select(selectedGroup.name, nextName, selectedGroup.fixed!) - }, - [isDirectMode, select, selectedGroup, unsortedProxyOptions], - ) - const goToProxies = useCallback(() => { navigate('/proxies') }, [navigate]) - const currentMember = currentOption?.member + const currentMember = leafLevel?.current?.member const currentProxy = currentMember ? memberDetails(currentMember) : undefined const selectedProxyName = currentMember?.ref.name ?? '' - const delays = useGroupDelays( - selectedGroupName, + const currentDelay = useGroupDelays( + leafGroupName, currentMember, - openSelect === 'proxy', - ) - const currentDelay = - typeof delays === 'number' - ? delays - : currentMember - ? delays.of(currentMember) - : -1 + false, + ) as number const signalInfo = currentProxy && selectedGroupName @@ -820,18 +864,11 @@ export const CurrentProxyCard = () => { if (autoCheckInProgressRef.current) return if (isDirectMode) return - const groupName = selectedGroupName + const groupName = leafGroupName const proxyName = selectedProxyName + const proxyMember = currentMember - if (!groupName || !proxyName) return - - const proxyMember = currentOption?.member - if (!proxyMember || !isInteractableMember(proxyMember)) { - debugLog( - `[CurrentProxyCard] 自动延迟检测跳过,组: ${groupName}, 节点: ${proxyName} 未找到`, - ) - return - } + if (!groupName || !proxyMember) return autoCheckInProgressRef.current = true @@ -856,7 +893,7 @@ export const CurrentProxyCard = () => { useEffect(() => { if (isDirectMode) return if (!autoDelayEnabled) return - if (!selectedGroupName || !selectedProxyName) return + if (!leafGroupName || !selectedProxyName) return let disposed = false let intervalTimer: ReturnType | null = null @@ -883,7 +920,7 @@ export const CurrentProxyCard = () => { }, [ autoDelayIntervalMs, isDirectMode, - selectedGroupName, + leafGroupName, selectedProxyName, autoDelayEnabled, ]) @@ -894,16 +931,21 @@ export const CurrentProxyCard = () => { localStorage.setItem(STORAGE_KEY_SORT_TYPE, newSortType.toString()) }, [sortType]) + // The button keeps an open list open, so it tests the list being looked at. + const delayLevel = + levels.find(({ group }) => openSelect === levelSelect(group.name)) ?? + leafLevel + const handleCheckDelay = useLockFn(async () => { - const groupName = selectedGroupName - if (!groupName || isDirectMode) return + if (!proxyView || !delayLevel || isDirectMode) return + const groupName = delayLevel.group.name debugLog(`[CurrentProxyCard] 开始测试所有延迟,组: ${groupName}`) const timeout = verge?.default_latency_timeout || 10000 - const interactable = unsortedProxyOptions - .map(({ member }) => member) + const interactable = delayLevel.group.members + .map((member) => resolveMember(proxyView, member)) .filter(isInteractableMember) .filter(({ ref }) => ref.name !== 'DIRECT' && ref.name !== 'REJECT') @@ -925,35 +967,14 @@ export const CurrentProxyCard = () => { refreshProxy() }) - const nameSortedProxyOptions = useMemo( - () => - !isDirectMode && openSelect === 'proxy' && sortType === 2 - ? [...unsortedProxyOptions].sort((a, b) => a.name.localeCompare(b.name)) - : unsortedProxyOptions, - [isDirectMode, openSelect, sortType, unsortedProxyOptions], - ) - const proxyOptions = useMemo( - () => - isDirectMode || openSelect !== 'proxy' || typeof delays === 'number' - ? [] - : sortType === 2 - ? nameSortedProxyOptions - : sortProxyOptions( - unsortedProxyOptions, - sortType, - delays.of, - defaultLatencyTimeout!, - ), - [ - delays, - nameSortedProxyOptions, - isDirectMode, - openSelect, - unsortedProxyOptions, - sortType, - defaultLatencyTimeout, - ], - ) + const entrySummary = ({ ruleCount, isDefault }: RuleEntry) => { + const count = t('home.components.currentProxy.labels.ruleCount', { + count: ruleCount, + }) + return isDefault + ? `${t('home.components.currentProxy.labels.defaultRoute')} · ${count}` + : count + } const getSortIcon = (): React.ReactElement => { switch (sortType) { @@ -1007,7 +1028,7 @@ export const CurrentProxyCard = () => { size="small" color="inherit" onClick={handleCheckDelay} - disabled={isDirectMode || unsortedProxyOptions.length === 0} + disabled={isDirectMode || !delayLevel?.group.members.length} aria-label={t( 'home.components.currentProxy.actions.refreshDelay', )} @@ -1117,48 +1138,101 @@ export const CurrentProxyCard = () => { /> )} - + {selectedGroupName}} - open={openSelect === 'group'} + label={t( + selectedEntry?.ruleCount + ? 'home.components.currentProxy.labels.ruleTarget' + : 'home.components.currentProxy.labels.group', + )} + displayValue={ + + + {selectedGroupName} + + {!!selectedEntry?.ruleCount && ( + + {entrySummary(selectedEntry)} + + )} + + } + open={openSelect === ENTRY_SELECT} disabled={isGlobalMode || isDirectMode} keepOpenRef={delayButtonRef} - onOpenChange={(open) => setOpenSelect(open ? 'group' : null)} + onOpenChange={(open) => setOpenSelect(open ? ENTRY_SELECT : null)} renderOptions={() => - selectableGroups.map((group) => ( - handleGroupChange(group.name)} - > - {group.name} - - )) + entries.map((entry) => { + const { group, ruleCount } = entry + const activeName = resolveChain(proxyView!, group).at(-1) + ?.current?.member.ref.name + return ( + handleGroupChange(group.name)} + sx={{ gap: 1 }} + > + + {group.name} + {activeName && ( + + → {activeName} + + )} + + {ruleCount > 0 && ( + + {entrySummary(entry)} + + )} + + ) + }) } /> + {levelRows.map((row) => ( + + {row.map((level) => ( + + + setOpenSelect( + open ? levelSelect(level.group.name) : null, + ) + } + onChange={select} + /> + + ))} + + ))} - - setOpenSelect(open ? 'proxy' : null)} - onChange={handleProxyChange} - /> ) : ( diff --git a/src/locales/ar/home.json b/src/locales/ar/home.json index 4bf03590f..2ada84b28 100644 --- a/src/locales/ar/home.json +++ b/src/locales/ar/home.json @@ -98,6 +98,9 @@ "directMode": "الوضع المباشر", "group": "Group", "proxy": "Proxy", + "ruleTarget": "Rule Target", + "defaultRoute": "Default", + "ruleCount": "{{count}} rules", "noActiveNode": "No active proxy node" }, "status": { diff --git a/src/locales/de/home.json b/src/locales/de/home.json index 4bcaf99c4..a8489f567 100644 --- a/src/locales/de/home.json +++ b/src/locales/de/home.json @@ -98,6 +98,9 @@ "directMode": "Direktmodus", "group": "Proxy-Gruppe", "proxy": "Knoten", + "ruleTarget": "Regelziel", + "defaultRoute": "Standard", + "ruleCount": "{{count}} Regeln", "noActiveNode": "Kein aktiver Proxy-Knoten" }, "status": { diff --git a/src/locales/en/home.json b/src/locales/en/home.json index e4ec3b6a7..a361ad92a 100644 --- a/src/locales/en/home.json +++ b/src/locales/en/home.json @@ -98,6 +98,9 @@ "directMode": "Direct Mode", "group": "Group", "proxy": "Proxy", + "ruleTarget": "Rule Target", + "defaultRoute": "Default", + "ruleCount": "{{count}} rules", "noActiveNode": "No active proxy node" }, "status": { diff --git a/src/locales/es/home.json b/src/locales/es/home.json index 5c3611623..4054987d0 100644 --- a/src/locales/es/home.json +++ b/src/locales/es/home.json @@ -98,6 +98,9 @@ "directMode": "Direct Mode", "group": "Grupo de proxy", "proxy": "Nodo", + "ruleTarget": "Destino de reglas", + "defaultRoute": "Predeterminado", + "ruleCount": "{{count}} reglas", "noActiveNode": "No hay nodos de proxy activos" }, "status": { diff --git a/src/locales/fa/home.json b/src/locales/fa/home.json index 468522ab9..5103c7a81 100644 --- a/src/locales/fa/home.json +++ b/src/locales/fa/home.json @@ -98,6 +98,9 @@ "directMode": "حالت مستقیم", "group": "Group", "proxy": "Proxy", + "ruleTarget": "Rule Target", + "defaultRoute": "Default", + "ruleCount": "{{count}} rules", "noActiveNode": "No active proxy node" }, "status": { diff --git a/src/locales/id/home.json b/src/locales/id/home.json index 5bfb7dc60..2f408c639 100644 --- a/src/locales/id/home.json +++ b/src/locales/id/home.json @@ -98,6 +98,9 @@ "directMode": "Mode Langsung", "group": "Group", "proxy": "Proxy", + "ruleTarget": "Rule Target", + "defaultRoute": "Default", + "ruleCount": "{{count}} rules", "noActiveNode": "No active proxy node" }, "status": { diff --git a/src/locales/jp/home.json b/src/locales/jp/home.json index 96f8b426e..a485ddf3b 100644 --- a/src/locales/jp/home.json +++ b/src/locales/jp/home.json @@ -98,6 +98,9 @@ "directMode": "直接接続モード", "group": "プロキシグループ", "proxy": "ノード", + "ruleTarget": "ルールの宛先", + "defaultRoute": "デフォルト", + "ruleCount": "{{count}} 件のルール", "noActiveNode": "アクティブなプロキシノードがありません。" }, "status": { diff --git a/src/locales/ko/home.json b/src/locales/ko/home.json index d81852344..83ea6b53f 100644 --- a/src/locales/ko/home.json +++ b/src/locales/ko/home.json @@ -98,6 +98,9 @@ "directMode": "직접 모드", "group": "그룹", "proxy": "프록시", + "ruleTarget": "규칙 대상", + "defaultRoute": "기본", + "ruleCount": "규칙 {{count}}개", "noActiveNode": "활성 프록시 노드 없음" }, "status": { diff --git a/src/locales/pt/home.json b/src/locales/pt/home.json index 8df3dcc77..6d0a6fb68 100644 --- a/src/locales/pt/home.json +++ b/src/locales/pt/home.json @@ -98,6 +98,9 @@ "directMode": "Modo direto", "group": "Grupo", "proxy": "Proxy", + "ruleTarget": "Destino das regras", + "defaultRoute": "Padrão", + "ruleCount": "{{count}} regras", "noActiveNode": "Nenhum nó de proxy ativo" }, "status": { diff --git a/src/locales/ru/home.json b/src/locales/ru/home.json index d46e3d227..e7374871b 100644 --- a/src/locales/ru/home.json +++ b/src/locales/ru/home.json @@ -98,6 +98,9 @@ "directMode": "Прямой режим", "group": "Группа", "proxy": "Прокси", + "ruleTarget": "Цель правил", + "defaultRoute": "По умолчанию", + "ruleCount": "Правил: {{count}}", "noActiveNode": "Нет активного прокси" }, "status": { diff --git a/src/locales/tr/home.json b/src/locales/tr/home.json index 845b2e961..2e97a4a02 100644 --- a/src/locales/tr/home.json +++ b/src/locales/tr/home.json @@ -98,6 +98,9 @@ "directMode": "Doğrudan Mod", "group": "Grup", "proxy": "Vekil", + "ruleTarget": "Kural Hedefi", + "defaultRoute": "Varsayılan", + "ruleCount": "{{count}} kural", "noActiveNode": "Aktif vekil düğümü yok" }, "status": { diff --git a/src/locales/tt/home.json b/src/locales/tt/home.json index b04be2af3..375544ed4 100644 --- a/src/locales/tt/home.json +++ b/src/locales/tt/home.json @@ -98,6 +98,9 @@ "directMode": "Туры режим", "group": "Group", "proxy": "Proxy", + "ruleTarget": "Rule Target", + "defaultRoute": "Default", + "ruleCount": "{{count}} rules", "noActiveNode": "No active proxy node" }, "status": { diff --git a/src/locales/zh/home.json b/src/locales/zh/home.json index dd73294a0..071879edf 100644 --- a/src/locales/zh/home.json +++ b/src/locales/zh/home.json @@ -98,6 +98,9 @@ "directMode": "直连模式", "group": "代理组", "proxy": "节点", + "ruleTarget": "规则入口", + "defaultRoute": "默认", + "ruleCount": "{{count}} 条规则", "noActiveNode": "暂无激活的代理节点" }, "status": { diff --git a/src/locales/zhtw/home.json b/src/locales/zhtw/home.json index 3c7c4be92..e134b2fdb 100644 --- a/src/locales/zhtw/home.json +++ b/src/locales/zhtw/home.json @@ -98,6 +98,9 @@ "directMode": "直連模式", "group": "代理組", "proxy": "節點", + "ruleTarget": "規則入口", + "defaultRoute": "預設", + "ruleCount": "{{count}} 條規則", "noActiveNode": "暫無作用中的代理節點" }, "status": { diff --git a/src/types/generated/i18n-keys.ts b/src/types/generated/i18n-keys.ts index 0b0c31fad..4444480a2 100644 --- a/src/types/generated/i18n-keys.ts +++ b/src/types/generated/i18n-keys.ts @@ -82,6 +82,9 @@ export const translationKeys = [ 'home.components.currentProxy.labels.directMode', 'home.components.currentProxy.labels.group', 'home.components.currentProxy.labels.proxy', + 'home.components.currentProxy.labels.ruleTarget', + 'home.components.currentProxy.labels.defaultRoute', + 'home.components.currentProxy.labels.ruleCount', 'home.components.currentProxy.labels.noActiveNode', 'home.components.currentProxy.status.testing', 'home.components.currentProxy.status.untested', diff --git a/src/types/generated/i18n-resources.ts b/src/types/generated/i18n-resources.ts index 60e224ba9..ed1a2bdc2 100644 --- a/src/types/generated/i18n-resources.ts +++ b/src/types/generated/i18n-resources.ts @@ -69,11 +69,14 @@ export interface TranslationResources { refreshDelay: string } labels: { + defaultRoute: string directMode: string globalMode: string group: string noActiveNode: string proxy: string + ruleCount: string + ruleTarget: string } status: { error: string