From 0a8fcbf4dfeba9db42119ae56b32e50dfcd8e4fa Mon Sep 17 00:00:00 2001
From: WenJY <WenJY@mesnac.com>
Date: Fri, 12 Jun 2026 17:06:48 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=88=A0=E9=99=A4=E6=97=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A1=AE=E8=AE=A4=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/Base/CrudPageViewModel.cs      |  6 ++-
 .../ViewModels/Device/DeviceInfoViewModel.cs  |  4 +-
 .../ViewModels/Path/PathInfoViewModel.cs      |  4 +-
 .../ViewModels/Task/TaskQueueViewModel.cs     |  4 +-
 Sln.Wcs.UI/Views/Base/ConfirmDialog.axaml     | 50 +++++++++++++++++++
 Sln.Wcs.UI/Views/Base/ConfirmDialog.axaml.cs  | 31 ++++++++++++
 .../Views/Device/DeviceInfoListView.axaml.cs  |  4 +-
 .../Views/Path/PathInfoListView.axaml.cs      |  4 +-
 .../Views/Task/TaskQueueListView.axaml.cs     |  4 +-
 9 files changed, 101 insertions(+), 10 deletions(-)
 create mode 100644 Sln.Wcs.UI/Views/Base/ConfirmDialog.axaml
 create mode 100644 Sln.Wcs.UI/Views/Base/ConfirmDialog.axaml.cs

diff --git a/Sln.Wcs.UI/ViewModels/Base/CrudPageViewModel.cs b/Sln.Wcs.UI/ViewModels/Base/CrudPageViewModel.cs
index 69f3aac..f35f9c0 100644
--- a/Sln.Wcs.UI/ViewModels/Base/CrudPageViewModel.cs
+++ b/Sln.Wcs.UI/ViewModels/Base/CrudPageViewModel.cs
@@ -108,9 +108,13 @@ public abstract partial class CrudPageViewModel<T> : ObservableObject, ICrudPage
     }
 
     [RelayCommand]
-    private void Delete()
+    private async System.Threading.Tasks.Task Delete()
     {
         if (SelectedItem is null) return;
+        var dialog = new Views.Base.ConfirmDialog();
+        var ok = await dialog.ShowDialog("确定要删除该条记录吗？此操作不可恢复。", GetMainWindow());
+        if (!ok) return;
+
         var prop = typeof(T).GetProperty("objId") ?? typeof(T).GetProperty("ObjId");
         if (prop is null) return;
         var id = prop.GetValue(SelectedItem);
diff --git a/Sln.Wcs.UI/ViewModels/Device/DeviceInfoViewModel.cs b/Sln.Wcs.UI/ViewModels/Device/DeviceInfoViewModel.cs
index 93e965b..962cee9 100644
--- a/Sln.Wcs.UI/ViewModels/Device/DeviceInfoViewModel.cs
+++ b/Sln.Wcs.UI/ViewModels/Device/DeviceInfoViewModel.cs
@@ -86,8 +86,10 @@ public partial class DeviceInfoViewModel : CrudPageViewModel<BaseDeviceInfo>
         }
     }
 
-    public void DeleteParam(BaseDeviceParam param)
+    public async System.Threading.Tasks.Task DeleteParamAsync(BaseDeviceParam param)
     {
+        var dlg = new Sln.Wcs.UI.Views.Base.ConfirmDialog();
+        if (!await dlg.ShowDialog("确定要删除该参数吗？", GetMainWindow())) return;
         _paramService.DeleteById(param.objId);
         LoadParams();
     }
diff --git a/Sln.Wcs.UI/ViewModels/Path/PathInfoViewModel.cs b/Sln.Wcs.UI/ViewModels/Path/PathInfoViewModel.cs
index ff0fd69..386297c 100644
--- a/Sln.Wcs.UI/ViewModels/Path/PathInfoViewModel.cs
+++ b/Sln.Wcs.UI/ViewModels/Path/PathInfoViewModel.cs
@@ -86,8 +86,10 @@ public partial class PathInfoViewModel : CrudPageViewModel<BasePathInfo>
         }
     }
 
-    public void DeleteDetail(BasePathDetails detail)
+    public async System.Threading.Tasks.Task DeleteDetailAsync(BasePathDetails detail)
     {
+        var dlg = new Sln.Wcs.UI.Views.Base.ConfirmDialog();
+        if (!await dlg.ShowDialog("确定要删除该明细吗？", GetMainWindow())) return;
         _detailService.DeleteById(detail.objId);
         LoadDetails();
     }
diff --git a/Sln.Wcs.UI/ViewModels/Task/TaskQueueViewModel.cs b/Sln.Wcs.UI/ViewModels/Task/TaskQueueViewModel.cs
index 5c036ad..496c0a0 100644
--- a/Sln.Wcs.UI/ViewModels/Task/TaskQueueViewModel.cs
+++ b/Sln.Wcs.UI/ViewModels/Task/TaskQueueViewModel.cs
@@ -92,8 +92,10 @@ public partial class TaskQueueViewModel : CrudPageViewModel<LiveTaskQueue>
         }
     }
 
-    public void DeleteDetail(LiveTaskDetail detail)
+    public async System.Threading.Tasks.Task DeleteDetailAsync(LiveTaskDetail detail)
     {
+        var dlg = new Sln.Wcs.UI.Views.Base.ConfirmDialog();
+        if (!await dlg.ShowDialog("确定要删除该明细吗？", GetMainWindow())) return;
         _detailService.DeleteById(detail.objId);
         LoadDetails();
     }
diff --git a/Sln.Wcs.UI/Views/Base/ConfirmDialog.axaml b/Sln.Wcs.UI/Views/Base/ConfirmDialog.axaml
new file mode 100644
index 0000000..dc6e08e
--- /dev/null
+++ b/Sln.Wcs.UI/Views/Base/ConfirmDialog.axaml
@@ -0,0 +1,50 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:Class="Sln.Wcs.UI.Views.Base.ConfirmDialog"
+        x:CompileBindings="False"
+        Title="确认操作"
+        SizeToContent="WidthAndHeight"
+        MaxWidth="380"
+        WindowStartupLocation="CenterOwner"
+        CanResize="False"
+        Background="Transparent"
+        ExtendClientAreaToDecorationsHint="True"
+        ExtendClientAreaChromeHints="PreferSystemChrome"
+        SystemDecorations="Full">
+
+    <Border Background="{DynamicResource SurfaceBgBrush}" CornerRadius="10"
+            BorderBrush="{DynamicResource AccentBgBrush}" BorderThickness="1">
+        <Grid RowDefinitions="Auto,*,Auto" Margin="0" MinWidth="300">
+            <!-- Title -->
+            <Border Grid.Row="0" Padding="20,14" CornerRadius="10,10,0,0"
+                    Background="{DynamicResource CardBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+                <StackPanel Orientation="Horizontal" Spacing="10">
+                    <Rectangle Width="3" Height="18" Fill="#FFB74D" RadiusX="2" RadiusY="2" />
+                    <TextBlock x:Name="TitleText" Text="确认操作" FontSize="15" FontWeight="SemiBold" Foreground="{DynamicResource PrimaryTextBrush}" />
+                </StackPanel>
+            </Border>
+
+            <!-- Message -->
+            <StackPanel Grid.Row="1" Margin="24,20,24,16">
+                <TextBlock x:Name="MessageText" Text="" FontSize="13"
+                           Foreground="{DynamicResource SecondaryTextBrush}" TextWrapping="Wrap" />
+            </StackPanel>
+
+            <!-- Buttons -->
+            <Border Grid.Row="2" Padding="20,12" CornerRadius="0,0,10,10"
+                    Background="{DynamicResource PageBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="10">
+                    <Button x:Name="CancelBtn" Content="取 消"
+                            FontSize="12" Padding="24,8"
+                            Background="{DynamicResource PrimaryBgBrush}" Foreground="{DynamicResource SecondaryTextBrush}"
+                            BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                            CornerRadius="4" />
+                    <Button x:Name="ConfirmBtn" Content="确 认"
+                            FontSize="12" Padding="24,8"
+                            Background="{DynamicResource DangerBtnBrush}" Foreground="White"
+                            CornerRadius="4" />
+                </StackPanel>
+            </Border>
+        </Grid>
+    </Border>
+</Window>
diff --git a/Sln.Wcs.UI/Views/Base/ConfirmDialog.axaml.cs b/Sln.Wcs.UI/Views/Base/ConfirmDialog.axaml.cs
new file mode 100644
index 0000000..dd344e4
--- /dev/null
+++ b/Sln.Wcs.UI/Views/Base/ConfirmDialog.axaml.cs
@@ -0,0 +1,31 @@
+using System.Threading.Tasks;
+using Avalonia.Controls;
+
+namespace Sln.Wcs.UI.Views.Base;
+
+public partial class ConfirmDialog : Window
+{
+    private TaskCompletionSource<bool>? _tcs;
+
+    public ConfirmDialog()
+    {
+        InitializeComponent();
+        CancelBtn.Click += (_, _) => CloseWith(false);
+        ConfirmBtn.Click += (_, _) => CloseWith(true);
+    }
+
+    public Task<bool> ShowDialog(string message, Window owner, string title = "确认操作")
+    {
+        TitleText.Text = title;
+        MessageText.Text = message;
+        _tcs = new TaskCompletionSource<bool>();
+        ShowDialog(owner);
+        return _tcs.Task;
+    }
+
+    private void CloseWith(bool result)
+    {
+        _tcs?.TrySetResult(result);
+        Close();
+    }
+}
diff --git a/Sln.Wcs.UI/Views/Device/DeviceInfoListView.axaml.cs b/Sln.Wcs.UI/Views/Device/DeviceInfoListView.axaml.cs
index bc70b72..84524f2 100644
--- a/Sln.Wcs.UI/Views/Device/DeviceInfoListView.axaml.cs
+++ b/Sln.Wcs.UI/Views/Device/DeviceInfoListView.axaml.cs
@@ -65,10 +65,10 @@ public partial class DeviceInfoListView : UserControl
             await vm.EditParamAsync(param);
     }
 
-    private void ParamDelete_Click(object? sender, RoutedEventArgs e)
+    private async void ParamDelete_Click(object? sender, RoutedEventArgs e)
     {
         if (sender is Button btn && btn.Tag is Sln.Wcs.Model.Domain.BaseDeviceParam param && DataContext is DeviceInfoViewModel vm)
-            vm.DeleteParam(param);
+            await vm.DeleteParamAsync(param);
     }
 
     private async System.Threading.Tasks.Task AnimateSlideIn()
diff --git a/Sln.Wcs.UI/Views/Path/PathInfoListView.axaml.cs b/Sln.Wcs.UI/Views/Path/PathInfoListView.axaml.cs
index 83cdb91..afc594c 100644
--- a/Sln.Wcs.UI/Views/Path/PathInfoListView.axaml.cs
+++ b/Sln.Wcs.UI/Views/Path/PathInfoListView.axaml.cs
@@ -65,10 +65,10 @@ public partial class PathInfoListView : UserControl
             await vm.EditDetailAsync(detail);
     }
 
-    private void DetailDelete_Click(object? sender, RoutedEventArgs e)
+    private async void DetailDelete_Click(object? sender, RoutedEventArgs e)
     {
         if (sender is Button btn && btn.Tag is Sln.Wcs.Model.Domain.BasePathDetails detail && DataContext is PathInfoViewModel vm)
-            vm.DeleteDetail(detail);
+            await vm.DeleteDetailAsync(detail);
     }
 
     private async System.Threading.Tasks.Task AnimateSlideIn()
diff --git a/Sln.Wcs.UI/Views/Task/TaskQueueListView.axaml.cs b/Sln.Wcs.UI/Views/Task/TaskQueueListView.axaml.cs
index 3db4c85..537b93c 100644
--- a/Sln.Wcs.UI/Views/Task/TaskQueueListView.axaml.cs
+++ b/Sln.Wcs.UI/Views/Task/TaskQueueListView.axaml.cs
@@ -65,10 +65,10 @@ public partial class TaskQueueListView : UserControl
             await vm.EditDetailAsync(detail);
     }
 
-    private void DetailDelete_Click(object? sender, RoutedEventArgs e)
+    private async void DetailDelete_Click(object? sender, RoutedEventArgs e)
     {
         if (sender is Button btn && btn.Tag is Sln.Wcs.Model.Domain.LiveTaskDetail detail && DataContext is TaskQueueViewModel vm)
-            vm.DeleteDetail(detail);
+            await vm.DeleteDetailAsync(detail);
     }
 
     private async System.Threading.Tasks.Task AnimateSlideIn()