diff --git a/src/components/app-ui.tsx b/src/components/app-ui.tsx index 48af8bf..c4c2944 100644 --- a/src/components/app-ui.tsx +++ b/src/components/app-ui.tsx @@ -27,6 +27,8 @@ import type { } from "@/lib/thread-execution-conflict"; import { describeThreadConversationExecutionConflict, + labelForProjectConflictAllowPolicy, + labelForProjectConflictState, labelForThreadConversationExecutionConflictDecision, summarizeThreadConversationExecutionDecisionResult, } from "@/lib/thread-execution-conflict-ui"; @@ -85,14 +87,15 @@ export function buildDeviceWorkspaceDetailCards(workspace: DeviceWorkspaceView) }, conflicts: { title: "异常项目 / 文件夹冲突", + headerHint: primaryPolicy ? "已接入,可直接调整" : "当前没有异常项目", scopeLabel: "仅作用于当前异常项目 / 文件夹", actions: ["禁止", "允许本次", "永久放行"], items: { device: `设备:${selectedDevice?.name ?? selectedDevice?.id ?? "未知设备"}`, folderKey: `文件夹:${primaryPolicy?.folderKey ?? "暂无"}`, projectId: `项目:${primaryPolicy?.projectId ?? "暂无"}`, - allowPolicy: `当前策略:${primaryPolicy?.allowPolicy ?? "暂无"}`, - conflictState: `冲突态:${primaryPolicy?.conflictState ?? "暂无"}`, + allowPolicy: `当前策略:${labelForProjectConflictAllowPolicy(primaryPolicy?.allowPolicy ?? null)}`, + conflictState: `冲突态:${labelForProjectConflictState(primaryPolicy?.conflictState ?? null)}`, }, }, }; @@ -714,7 +717,7 @@ export function DeviceEditorCard({