From c8be7022cc164e08297549348f013510c6c74057 Mon Sep 17 00:00:00 2001
From: adamyu <adamyxt@outook.com>
Date: Tue, 23 Jun 2026 12:38:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=90=9B=20fix(ui):=20=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AE=E3=80=8C=E4=BB=BB=E5=8A=A1=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E3=80=8D=E4=B8=8B=E6=8B=89=E6=98=BE=E7=A4=BA=E5=8F=AF?=
 =?UTF-8?q?=E8=AF=BB=E5=90=8D=E8=80=8C=E9=9D=9E=20ULID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

下拉原绑 AvailableTaskIds(ULID 列表)。改为 AvailableTasks(TaskPick: Id+Display),
下拉显 DisplayName、按 Id 过滤(TaskFilter 仍是 id,RowsView 过滤不变)。名字载入后(LoadTaskNamesAsync)
回填下拉项显示名。接上次「任务列显名」,补齐筛选面。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 src/Dc.App/ViewModels/LiveDataViewModel.cs | 16 ++++++++++++----
 src/Dc.App/Views/LiveDataView.xaml         |  6 ++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/Dc.App/ViewModels/LiveDataViewModel.cs b/src/Dc.App/ViewModels/LiveDataViewModel.cs
index ccb345f..bac5576 100644
--- a/src/Dc.App/ViewModels/LiveDataViewModel.cs
+++ b/src/Dc.App/ViewModels/LiveDataViewModel.cs
@@ -82,7 +82,8 @@ internal void DebounceTickForTest()
     private volatile LiveFlushStats _statsSnapshot = new(0, 0, 0, 0, 0);
 
     public ObservableCollection<LiveDataRowViewModel> Rows { get; } = new();
-    public ObservableCollection<string> AvailableTaskIds { get; } = new();
+    // 任务筛选下拉项:Id + 可读名(Display)。下拉显名、按 Id 过滤(TaskFilter 仍是 id,RowsView 不变)。
+    public ObservableCollection<TaskPick> AvailableTasks { get; } = new();
     public ICollectionView RowsView { get; }
 
     private bool _running;
@@ -140,8 +141,14 @@ private async Task LoadTaskNamesAsync()
         try
         {
             _taskNames = await TaskNames.LoadAsync(_dbFactory);
-            // 回填已存在行的可读名(行可能先于名字加载就创建)。Start 在 UI 线程,await 续回 UI 线程,改 Rows 安全。
+            // 回填已存在行的可读名(行可能先于名字加载就创建)。Start 在 UI 线程,await 续回 UI 线程,改集合安全。
             foreach (var row in Rows) row.TaskName = ResolveTaskName(row.TaskId);
+            // 同步刷新任务筛选下拉的显示名(此前以 id 兜底加入)
+            for (var i = 0; i < AvailableTasks.Count; i++)
+            {
+                var name = ResolveTaskName(AvailableTasks[i].Id);
+                if (AvailableTasks[i].Display != name) AvailableTasks[i] = new TaskPick(AvailableTasks[i].Id, name);
+            }
         }
         catch { /* 名字解析失败不影响数据流,列回退显示 id */ }
     }
@@ -239,7 +246,8 @@ private LiveFlushStats ComputeFlushStats()
 
     private void Apply(string taskId, TagValue v, int rawCount)
     {
-        if (!AvailableTaskIds.Contains(taskId)) AvailableTaskIds.Add(taskId);
+        if (AvailableTasks.All(t => t.Id != taskId))
+            AvailableTasks.Add(new TaskPick(taskId, ResolveTaskName(taskId)));
 
         var key = $"{taskId}::{v.Item}";
         if (!_rowIndex.TryGetValue(key, out var row))
@@ -269,7 +277,7 @@ private void Clear()
         _searchDebounce?.Stop(); // 清空后避免挂起的防抖回调刷新已清集合
         _rowIndex.Clear();
         Rows.Clear();
-        AvailableTaskIds.Clear();
+        AvailableTasks.Clear();
         RowCount = 0;
 
         // 重置 flush 统计累计器，避免清空后陈旧统计（ring 数组无需清零，count=0 即 n=0）
diff --git a/src/Dc.App/Views/LiveDataView.xaml b/src/Dc.App/Views/LiveDataView.xaml
index 0d5c830..fd5313e 100644
--- a/src/Dc.App/Views/LiveDataView.xaml
+++ b/src/Dc.App/Views/LiveDataView.xaml
@@ -32,8 +32,10 @@
                                VerticalAlignment="Center"
                                Margin="0,0,6,0" />
                     <ComboBox Width="220"
-                              ItemsSource="{Binding AvailableTaskIds}"
-                              SelectedItem="{Binding TaskFilter}"
+                              ItemsSource="{Binding AvailableTasks}"
+                              DisplayMemberPath="Display"
+                              SelectedValuePath="Id"
+                              SelectedValue="{Binding TaskFilter}"
                               VerticalAlignment="Center" />
                     <Button Content="清除"
                                 Margin="6,0,0,0"

From 1eeefd0319e17d6a57fe3fb19242184853621a88 Mon Sep 17 00:00:00 2001
From: adamyu <adamyxt@outook.com>
Date: Tue, 23 Jun 2026 12:38:04 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E2=9C=A8=20feat(app):=20=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8A=A0=20Tag=20=E5=90=8E=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=B7=B3=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=B9=B6=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BrowseViewModel 加可选 onTagsAdded(taskId) 回调;批量加 Tag 成功后调用。组合根接线:
TaskWorkspaceViewModel.RequestSelect(taskId) 设待选 + ShellViewModel 导航到工作台,
LoadAsync 优先选中该任务 → 发现→配置→看数据 一条线。BrowseViewModel 不依赖具体 VM(回调解耦)。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 src/Dc.App/Composition/ServiceRegistration.cs        | 11 ++++++++++-
 src/Dc.App/ViewModels/BrowseViewModel.cs             | 10 ++++++++--
 .../ViewModels/Workspace/TaskWorkspaceViewModel.cs   | 12 +++++++++---
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/Dc.App/Composition/ServiceRegistration.cs b/src/Dc.App/Composition/ServiceRegistration.cs
index ce913c6..2d8ed3f 100644
--- a/src/Dc.App/Composition/ServiceRegistration.cs
+++ b/src/Dc.App/Composition/ServiceRegistration.cs
@@ -244,7 +244,16 @@ public static IServiceCollection AddDcApp(this IServiceCollection services, stri
                 .NavigateCommand.Execute(key),
             showNavigateCta: true,
             dbFactory: sp.GetRequiredService<IDbContextFactory<DcDbContext>>()));
-        services.AddSingleton<BrowseViewModel>();
+        services.AddSingleton<BrowseViewModel>(sp => new BrowseViewModel(
+            sp.GetServices<IOpcBrowserFactory>(),
+            sp.GetRequiredService<IDbContextFactory<DcDbContext>>(),
+            sp.GetRequiredService<Dc.App.Services.ITaskEditorDialog>(),
+            // 批量加 Tag 后:选中目标任务 + 跳到「采集任务」(发现→配置→看数据 一条线)。
+            onTagsAdded: taskId =>
+            {
+                sp.GetRequiredService<Dc.App.ViewModels.Workspace.TaskWorkspaceViewModel>().RequestSelect(taskId);
+                sp.GetRequiredService<Dc.App.ViewModels.Shell.ShellViewModel>().NavigateCommand.Execute("workspace");
+            }));
         services.AddSingleton<DiagnosticsViewModel>(sp => new DiagnosticsViewModel(
             sp.GetRequiredService<TaskOrchestrator>(),
             navigate: key => sp.GetRequiredService<Dc.App.ViewModels.Shell.ShellViewModel>()
diff --git a/src/Dc.App/ViewModels/BrowseViewModel.cs b/src/Dc.App/ViewModels/BrowseViewModel.cs
index dfe230a..df24b3f 100644
--- a/src/Dc.App/ViewModels/BrowseViewModel.cs
+++ b/src/Dc.App/ViewModels/BrowseViewModel.cs
@@ -18,6 +18,7 @@ public partial class BrowseViewModel : ObservableObject, IAsyncDisposable
     // 可空:导航页注入(走 DI)→ 启用批量「加为 Tag」;Tag 编辑器内嵌的单点取用对话框传 null → 不启用。
     private readonly IDbContextFactory<DcDbContext>? _dbFactory;
     private readonly ITaskEditorDialog? _taskEditor;
+    private readonly Action<string>? _onTagsAdded; // 批量加 Tag 后回调(taskId):由组合根接「选中该任务+跳工作台」
     private IOpcBrowser? _browser;
     private readonly Stack<(string? Id, string Name)> _path = new();
 
@@ -56,11 +57,13 @@ public partial class BrowseViewModel : ObservableObject, IAsyncDisposable
     public BrowseViewModel(
         IEnumerable<IOpcBrowserFactory> browserFactories,
         IDbContextFactory<DcDbContext>? dbFactory = null,
-        ITaskEditorDialog? taskEditor = null)
+        ITaskEditorDialog? taskEditor = null,
+        Action<string>? onTagsAdded = null)
     {
         _factories = browserFactories.ToDictionary(f => f.Protocol);
         _dbFactory = dbFactory;
         _taskEditor = taskEditor;
+        _onTagsAdded = onTagsAdded;
         // 暴露注册的所有协议；DI 顺序 = UA, DA → UI 下拉同序
         AvailableProtocols = _factories.Keys.ToArray();
         if (_dbFactory is not null) _ = LoadTasksAsync();
@@ -165,8 +168,11 @@ private async Task AddCheckedAsTagsAsync(string taskId, string taskDisplay)
         var skipped = picked.Count - toAdd.Count;
         var msg = $"已添加 {toAdd.Count} 个 Tag 到「{taskDisplay}」"
             + (skipped > 0 ? $",跳过 {skipped} 个重复 Item" : "")
-            + "。去「采集任务」启动即可采集。";
+            + "。即将跳到「采集任务」,启动即可采集。";
         MessageDialog.Show("加为 Tag", msg, MessageDialogKind.Success);
+
+        // 跳到采集任务并选中目标任务(发现→配置→看数据 一条线);组合根接线,BrowseViewModel 不依赖具体 VM。
+        if (toAdd.Count > 0) _onTagsAdded?.Invoke(taskId);
     }
 
     // 浏览到的数据类型名(UA: Float/Double/...; 或选项 DisplayName)→ Tag.DataType 码;认不出落 0(默认/自动)。
diff --git a/src/Dc.App/ViewModels/Workspace/TaskWorkspaceViewModel.cs b/src/Dc.App/ViewModels/Workspace/TaskWorkspaceViewModel.cs
index 6b7beb4..3a1d272 100644
--- a/src/Dc.App/ViewModels/Workspace/TaskWorkspaceViewModel.cs
+++ b/src/Dc.App/ViewModels/Workspace/TaskWorkspaceViewModel.cs
@@ -214,11 +214,17 @@ public async Task LoadAsync()
 
         FilteredTasks.Refresh();
 
-        // 重建后恢复选中：按 TaskId 找回对应新行（启动/停止/刷新都经此处）
-        if (prevSelectedId is not null)
-            SelectedTask = AllTasks.FirstOrDefault(r => r.TaskId == prevSelectedId);
+        // 优先用外部请求的选中(浏览批量加 Tag 后跳回工作台);否则恢复原选中（启动/停止/刷新都经此处）。
+        var targetId = _pendingSelectId ?? prevSelectedId;
+        _pendingSelectId = null;
+        if (targetId is not null)
+            SelectedTask = AllTasks.FirstOrDefault(r => r.TaskId == targetId);
     }
 
+    private string? _pendingSelectId;
+    /// <summary>请求下次 LoadAsync 时选中该任务(浏览批量加 Tag 后跳回工作台用)。</summary>
+    public void RequestSelect(string taskId) => _pendingSelectId = taskId;
+
     private static string ProtocolLabel(byte type) => type switch
     {
         1 => "DA",

From 60d5717cfded51e333f2145bd36ff9f861555ce3 Mon Sep 17 00:00:00 2001
From: adamyu <adamyxt@outook.com>
Date: Tue, 23 Jun 2026 12:38:04 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E2=9C=A8=20feat(app):=20Tag/=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=BC=96=E8=BE=91=E5=99=A8=E7=BB=9F=E4=B8=80=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=8F=8D=E9=A6=88(=E5=AE=9E=E6=97=B6=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=20+=20=E5=86=85=E8=81=94=E7=BA=A2=E5=AD=97)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

对齐任务编辑器:无效时保存按钮禁用 + 底部内联红字提示首条错误,不再「点了才弹错」。
复用各自 Validate(),相关字段变化即 Revalidate(CanSave/ValidationError);TagEditor 含
公式输入行 SelectedTag 变化也触发(订阅行 PropertyChanged,重建时退订旧行)。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../ViewModels/ConfigEntryEditorViewModel.cs  | 13 +++++++
 src/Dc.App/ViewModels/TagEditorViewModel.cs   | 35 +++++++++++++++++--
 src/Dc.App/Views/ConfigEntryEditorWindow.xaml | 15 +++++---
 src/Dc.App/Views/TagEditorWindow.xaml         | 16 ++++++---
 4 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/src/Dc.App/ViewModels/ConfigEntryEditorViewModel.cs b/src/Dc.App/ViewModels/ConfigEntryEditorViewModel.cs
index f4f35b8..16e574f 100644
--- a/src/Dc.App/ViewModels/ConfigEntryEditorViewModel.cs
+++ b/src/Dc.App/ViewModels/ConfigEntryEditorViewModel.cs
@@ -8,6 +8,9 @@ public partial class ConfigEntryEditorViewModel : ObservableObject
     [ObservableProperty] private string _title;
     [ObservableProperty] private string _key = string.Empty;
     [ObservableProperty] private string _value = string.Empty;
+    // 实时校验:无错才可保存 + 首条错误内联红字(对齐任务/Tag 编辑器)。
+    [ObservableProperty] private bool _canSave;
+    [ObservableProperty] private string _validationError = string.Empty;
 
     public string? OriginalId { get; }
     public bool KeyIsReadOnly => OriginalId is not null;
@@ -25,6 +28,16 @@ public ConfigEntryEditorViewModel(ConfigEntry? existing)
             _key = existing.Key;
             _value = existing.Value;
         }
+        Revalidate();
+    }
+
+    partial void OnKeyChanged(string value) => Revalidate();
+
+    private void Revalidate()
+    {
+        var errs = Validate();
+        CanSave = errs.Count == 0;
+        ValidationError = errs.Count == 0 ? string.Empty : errs[0];
     }
 
     public IReadOnlyList<string> Validate()
diff --git a/src/Dc.App/ViewModels/TagEditorViewModel.cs b/src/Dc.App/ViewModels/TagEditorViewModel.cs
index 7752c2f..80fe0a4 100644
--- a/src/Dc.App/ViewModels/TagEditorViewModel.cs
+++ b/src/Dc.App/ViewModels/TagEditorViewModel.cs
@@ -28,6 +28,10 @@ public partial class TagEditorViewModel : ObservableObject
     [ObservableProperty] private string _expression = string.Empty;
     [ObservableProperty] private string _outputUnit = string.Empty;
 
+    // 实时校验:无错才可保存(对齐任务编辑器),首条错误内联红字提示。
+    [ObservableProperty] private bool _canSave;
+    [ObservableProperty] private string _validationError = string.Empty;
+
     public ObservableCollection<InputBindingRow> InputBindings { get; } = new();
     public ObservableCollection<Tag> AvailableInputTags { get; } = new();
 
@@ -113,6 +117,7 @@ public TagEditorViewModel(
                 {
                     SelectedTag = AvailableInputTags.FirstOrDefault(t => t.Id == input.SourceTagId)
                 };
+                row.PropertyChanged += OnInputRowChanged;
                 InputBindings.Add(row);
             }
         }
@@ -120,6 +125,20 @@ public TagEditorViewModel(
         {
             RebuildInputBindings();
         }
+        Revalidate(); // 初始态:新建真实 Tag(Item 空)→ 保存禁用,直到填合法
+    }
+
+    // 实时校验:复用 Validate(),无错才可保存,首条错误内联提示。
+    private void Revalidate()
+    {
+        var errs = Validate();
+        CanSave = errs.Count == 0;
+        ValidationError = errs.Count == 0 ? string.Empty : errs[0];
+    }
+
+    private void OnInputRowChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(InputBindingRow.SelectedTag)) Revalidate();
     }
 
     public bool CanBrowse => _browseDialog is not null;
@@ -169,19 +188,26 @@ partial void OnSelectedGroupRowChanged(GroupRow? value)
         // 分组定 → TaskId 定 → 刷新可选输入 Tag(同任务真实,排除自身虚拟)。
         OnPropertyChanged(nameof(Group));
         RefreshAvailableInputTags();
+        Revalidate();
     }
 
     partial void OnIsVirtualChanged(bool value)
     {
-        if (value) RebuildInputBindings();
-        else InputBindings.Clear();
+        if (value) RebuildInputBindings(); // 内部 Revalidate
+        else { InputBindings.Clear(); Revalidate(); }
     }
 
     partial void OnExpressionChanged(string value)
     {
-        if (IsVirtual) RebuildInputBindings();
+        if (IsVirtual) RebuildInputBindings(); // 内部 Revalidate
     }
 
+    // 实时校验:这些字段变化即重算可保存性。
+    partial void OnItemChanged(string value) => Revalidate();
+    partial void OnScaleFactorChanged(string value) => Revalidate();
+    partial void OnOffsetChanged(string value) => Revalidate();
+    partial void OnFormulaNameChanged(string value) => Revalidate();
+
     private void RefreshAvailableInputTags()
     {
         AvailableInputTags.Clear();
@@ -195,13 +221,16 @@ private void RebuildInputBindings()
     {
         var aliases = ExtractAliases(Expression);
         var prevByAlias = InputBindings.ToDictionary(r => r.Alias, r => r.SelectedTag, StringComparer.OrdinalIgnoreCase);
+        foreach (var r in InputBindings) r.PropertyChanged -= OnInputRowChanged; // 退订旧行,避免重复触发
         InputBindings.Clear();
         foreach (var alias in aliases)
         {
             var row = new InputBindingRow(alias);
             if (prevByAlias.TryGetValue(alias, out var sel)) row.SelectedTag = sel;
+            row.PropertyChanged += OnInputRowChanged;
             InputBindings.Add(row);
         }
+        Revalidate();
     }
 
     public IReadOnlyList<string> Validate()
diff --git a/src/Dc.App/Views/ConfigEntryEditorWindow.xaml b/src/Dc.App/Views/ConfigEntryEditorWindow.xaml
index 011d7b4..6f50b78 100644
--- a/src/Dc.App/Views/ConfigEntryEditorWindow.xaml
+++ b/src/Dc.App/Views/ConfigEntryEditorWindow.xaml
@@ -25,10 +25,17 @@
             </Border>
             <Border DockPanel.Dock="Bottom" Padding="14,14"
                     BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}" BorderThickness="0,1,0,0">
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Button Content="取消" Margin="0,0,8,0" IsCancel="True" Style="{StaticResource DcBtnGhostSm}" />
-                    <Button Content="保存" Click="OnSaveClick" IsDefault="True" Style="{StaticResource DcBtnPrimarySm}" />
-                </StackPanel>
+                <DockPanel LastChildFill="False">
+                    <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center"
+                               Text="{Binding ValidationError}"
+                               Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+                               FontSize="12" TextTrimming="CharacterEllipsis" MaxWidth="280" />
+                    <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
+                        <Button Content="取消" Margin="0,0,8,0" IsCancel="True" Style="{StaticResource DcBtnGhostSm}" />
+                        <Button Content="保存" Click="OnSaveClick" IsDefault="True"
+                                IsEnabled="{Binding CanSave}" Style="{StaticResource DcBtnPrimarySm}" />
+                    </StackPanel>
+                </DockPanel>
             </Border>
             <StackPanel Margin="20,18">
                 <Grid>
diff --git a/src/Dc.App/Views/TagEditorWindow.xaml b/src/Dc.App/Views/TagEditorWindow.xaml
index f2471fa..7482b6b 100644
--- a/src/Dc.App/Views/TagEditorWindow.xaml
+++ b/src/Dc.App/Views/TagEditorWindow.xaml
@@ -29,10 +29,18 @@
             <Border DockPanel.Dock="Bottom" Padding="14,14"
                     BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
                     BorderThickness="0,1,0,0">
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Button Content="取消" Margin="0,0,8,0" IsCancel="True" Style="{StaticResource DcBtnGhostSm}" />
-                    <Button Content="保存" Click="OnSaveClick" IsDefault="True" Style="{StaticResource DcBtnPrimarySm}" />
-                </StackPanel>
+                <DockPanel LastChildFill="False">
+                    <!-- 实时校验:首条错误内联红字,保存按钮随 CanSave 禁用 -->
+                    <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center"
+                               Text="{Binding ValidationError}"
+                               Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+                               FontSize="12" TextTrimming="CharacterEllipsis" MaxWidth="320" />
+                    <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
+                        <Button Content="取消" Margin="0,0,8,0" IsCancel="True" Style="{StaticResource DcBtnGhostSm}" />
+                        <Button Content="保存" Click="OnSaveClick" IsDefault="True"
+                                IsEnabled="{Binding CanSave}" Style="{StaticResource DcBtnPrimarySm}" />
+                    </StackPanel>
+                </DockPanel>
             </Border>
             <StackPanel Margin="20,18">
                 <!-- 虚拟开关(所有模式可见) -->

From 58a8596442dd1e3d3c7962c20504c0a26321f48e Mon Sep 17 00:00:00 2001
From: adamyu <adamyxt@outook.com>
Date: Tue, 23 Jun 2026 12:57:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E2=9C=A8=20feat(app):=20Tag=20=E7=A9=BA?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BB=20CTA=E3=80=8C=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=B7=BB=E5=8A=A0=20Tag=E3=80=8D(=E5=8F=91?=
 =?UTF-8?q?=E7=8E=B0=E4=BC=98=E5=85=88)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

任务 0 Tag 时空状态原只给「新建 Tag」。改为双 CTA:主「浏览节点添加 Tag」→ 切到浏览页
(发现→批量加 Tag 主路径),次「手动新建」→ 原 NewCommand。EmptyState 控件加可选
SecondaryActionText/SecondaryActionCommand(幽灵按钮,空则不显);TagsViewModel 加可选
navigate 注入 + BrowseNodesCommand,组合根接 Shell 导航到 "browse"。

真机:新建 0-Tag 任务→Tag 页显双 CTA→点「浏览节点添加 Tag」跳到浏览页 ✓;App.Tests 142/142。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 src/Dc.App/Composition/ServiceRegistration.cs |  9 ++++++++-
 src/Dc.App/Controls/EmptyState.cs             | 17 +++++++++++++++++
 src/Dc.App/Theme/Tokens.xaml                  | 17 +++++++++++++++++
 src/Dc.App/ViewModels/TagsViewModel.cs        |  9 ++++++++-
 src/Dc.App/Views/TagsView.xaml                | 10 ++++++----
 5 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/src/Dc.App/Composition/ServiceRegistration.cs b/src/Dc.App/Composition/ServiceRegistration.cs
index 2d8ed3f..4291c3e 100644
--- a/src/Dc.App/Composition/ServiceRegistration.cs
+++ b/src/Dc.App/Composition/ServiceRegistration.cs
@@ -236,7 +236,14 @@ public static IServiceCollection AddDcApp(this IServiceCollection services, stri
             _ => System.Windows.Application.Current?.Dispatcher
                  ?? System.Windows.Threading.Dispatcher.CurrentDispatcher);
         services.AddSingleton<GroupsViewModel>();
-        services.AddSingleton<TagsViewModel>();
+        services.AddSingleton<TagsViewModel>(sp => new TagsViewModel(
+            sp.GetRequiredService<IDbContextFactory<DcDbContext>>(),
+            sp.GetRequiredService<ITagEditorDialog>(),
+            sp.GetRequiredService<ITagExcelService>(),
+            sp.GetRequiredService<IFilePicker>(),
+            sp.GetRequiredService<TaskOrchestrator>(),
+            // 空状态「浏览节点添加 Tag」CTA → 切到浏览页(发现→批量加 Tag 主路径)
+            navigate: key => sp.GetRequiredService<Dc.App.ViewModels.Shell.ShellViewModel>().NavigateCommand.Execute(key)));
         services.AddSingleton<LiveDataViewModel>(sp => new LiveDataViewModel(
             sp.GetRequiredService<TaskOrchestrator>(),
             System.Windows.Application.Current?.Dispatcher ?? System.Windows.Threading.Dispatcher.CurrentDispatcher,
diff --git a/src/Dc.App/Controls/EmptyState.cs b/src/Dc.App/Controls/EmptyState.cs
index c817339..81dd821 100644
--- a/src/Dc.App/Controls/EmptyState.cs
+++ b/src/Dc.App/Controls/EmptyState.cs
@@ -55,4 +55,21 @@ public ICommand? ActionCommand
         get => (ICommand?)GetValue(ActionCommandProperty);
         set => SetValue(ActionCommandProperty, value);
     }
+
+    // 可选次操作（幽灵按钮）。SecondaryActionText 为空时不显示。
+    public static readonly DependencyProperty SecondaryActionTextProperty = DependencyProperty.Register(
+        nameof(SecondaryActionText), typeof(string), typeof(EmptyState), new PropertyMetadata(null));
+    public string? SecondaryActionText
+    {
+        get => (string?)GetValue(SecondaryActionTextProperty);
+        set => SetValue(SecondaryActionTextProperty, value);
+    }
+
+    public static readonly DependencyProperty SecondaryActionCommandProperty = DependencyProperty.Register(
+        nameof(SecondaryActionCommand), typeof(ICommand), typeof(EmptyState), new PropertyMetadata(null));
+    public ICommand? SecondaryActionCommand
+    {
+        get => (ICommand?)GetValue(SecondaryActionCommandProperty);
+        set => SetValue(SecondaryActionCommandProperty, value);
+    }
 }
diff --git a/src/Dc.App/Theme/Tokens.xaml b/src/Dc.App/Theme/Tokens.xaml
index 508fa0c..b1573b0 100644
--- a/src/Dc.App/Theme/Tokens.xaml
+++ b/src/Dc.App/Theme/Tokens.xaml
@@ -421,6 +421,23 @@
                                 </Style>
                             </Button.Style>
                         </Button>
+                        <Button Content="{TemplateBinding SecondaryActionText}"
+                                Command="{TemplateBinding SecondaryActionCommand}"
+                                Margin="0,8,0,0" HorizontalAlignment="Center"
+                                MinWidth="120">
+                            <Button.Style>
+                                <Style TargetType="Button" BasedOn="{StaticResource DcBtnGhost}">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding SecondaryActionText, RelativeSource={RelativeSource AncestorType={x:Type controls:EmptyState}}}" Value="{x:Null}">
+                                            <Setter Property="Visibility" Value="Collapsed" />
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding SecondaryActionText, RelativeSource={RelativeSource AncestorType={x:Type controls:EmptyState}}}" Value="">
+                                            <Setter Property="Visibility" Value="Collapsed" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Button.Style>
+                        </Button>
                     </StackPanel>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/Dc.App/ViewModels/TagsViewModel.cs b/src/Dc.App/ViewModels/TagsViewModel.cs
index 9fc2881..5c10348 100644
--- a/src/Dc.App/ViewModels/TagsViewModel.cs
+++ b/src/Dc.App/ViewModels/TagsViewModel.cs
@@ -20,6 +20,7 @@ public partial class TagsViewModel : ObservableObject, IEmbeddableTagPanel
     private readonly ITagExcelService _excel;
     private readonly IFilePicker _filePicker;
     private readonly TaskOrchestrator _orchestrator;
+    private readonly Action<string>? _navigate; // 导航到其它页(空状态「浏览节点」CTA → "browse")
 
     [ObservableProperty] private string _title = "Tag 管理";
     [ObservableProperty] private bool _isLoading;
@@ -55,16 +56,22 @@ public TagsViewModel(
         ITagEditorDialog editor,
         ITagExcelService excel,
         IFilePicker filePicker,
-        TaskOrchestrator orchestrator)
+        TaskOrchestrator orchestrator,
+        Action<string>? navigate = null)
     {
         _dbFactory = dbFactory;
         _editor = editor;
         _excel = excel;
         _filePicker = filePicker;
         _orchestrator = orchestrator;
+        _navigate = navigate;
         _ = LoadAsync();
     }
 
+    // 空状态主 CTA:跳到「浏览节点」(发现→批量加 Tag 主路径)。
+    [RelayCommand]
+    private void BrowseNodes() => _navigate?.Invoke("browse");
+
     private bool IsTaskRunning(string taskId) =>
         _orchestrator.RunningTaskIds.Contains(taskId);
 
diff --git a/src/Dc.App/Views/TagsView.xaml b/src/Dc.App/Views/TagsView.xaml
index c593f0f..def4670 100644
--- a/src/Dc.App/Views/TagsView.xaml
+++ b/src/Dc.App/Views/TagsView.xaml
@@ -119,13 +119,15 @@
                 </DataGrid.Columns>
             </DataGrid>
 
-            <!-- 空状态对准「这个任务还没有 Tag」(而非旧的「无分组」):直接给「新建 Tag」入口。 -->
+            <!-- 空状态对准「这个任务还没有 Tag」:主 CTA 走发现主路径「浏览节点」,次 CTA 手动新建。 -->
             <controls:EmptyState
                 Icon="TagMultiple24"
                 Title="这个任务还没有 Tag"
-                Hint="点「新建」添加采集点位;后续也可在「浏览节点」里勾选多个点位一键批量加入。"
-                ActionText="新建 Tag"
-                ActionCommand="{Binding NewCommand}"
+                Hint="到「浏览节点」勾选多个点位一键批量加入,或手动新建单个采集点位。"
+                ActionText="浏览节点添加 Tag"
+                ActionCommand="{Binding BrowseNodesCommand}"
+                SecondaryActionText="手动新建"
+                SecondaryActionCommand="{Binding NewCommand}"
                 Visibility="{Binding Tags.Count, Converter={StaticResource CountToVis}}" />
         </Grid>
     </Grid>