From c618d967df01eb8d26a2d30cb21efe7705053e88 Mon Sep 17 00:00:00 2001
From: "David P.G" <pgw1315@163.com>
Date: Sat, 23 Aug 2025 20:58:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E7=9A=84=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialogs/DeviceDialogViewModel.cs          |  5 ++---
 DMS.WPF/Views/Dialogs/DeviceDialog.xaml       | 20 ++++++-------------
 DMS.WPF/Views/Dialogs/VariableDialog.xaml     | 11 ++--------
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/DMS.WPF/ViewModels/Dialogs/DeviceDialogViewModel.cs b/DMS.WPF/ViewModels/Dialogs/DeviceDialogViewModel.cs
index 5c2368b..4fb9498 100644
--- a/DMS.WPF/ViewModels/Dialogs/DeviceDialogViewModel.cs
+++ b/DMS.WPF/ViewModels/Dialogs/DeviceDialogViewModel.cs
@@ -29,14 +29,13 @@ public partial class DeviceDialogViewModel : DialogViewModelBase<DeviceItemViewM
     }
 
     [RelayCommand]
-    private async Task Save()
+    private async Task PrimaryButton()
     {
-        // Here you can add validation logic before closing.
         await Close(Device);
     }
 
     [RelayCommand]
-    private async Task Cancel()
+    private async Task CancleButton()
     {
         await Close(null);
     }
diff --git a/DMS.WPF/Views/Dialogs/DeviceDialog.xaml b/DMS.WPF/Views/Dialogs/DeviceDialog.xaml
index 6e06cba..b33920e 100644
--- a/DMS.WPF/Views/Dialogs/DeviceDialog.xaml
+++ b/DMS.WPF/Views/Dialogs/DeviceDialog.xaml
@@ -8,24 +8,16 @@
                   xmlns:vmd="clr-namespace:DMS.WPF.ViewModels.Dialogs"
                   xmlns:ex="clr-namespace:DMS.Extensions"
                   xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
-                  xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                   xmlns:vc="clr-namespace:DMS.WPF.ValueConverts"
                   Title="{Binding Title}"
                   CloseButtonText="取消"
                   DefaultButton="Primary"
                   PrimaryButtonText="{Binding PrimaryButText}"
+                  PrimaryButtonCommand="{Binding PrimaryButtonCommand}"
+                   CloseButtonCommand="{Binding CancleButtonCommand}"
                   d:DataContext="{d:DesignInstance vmd:DeviceDialogViewModel}"
                   mc:Ignorable="d">
 
-    <i:Interaction.Triggers>
-        <i:EventTrigger EventName="PrimaryButtonClick">
-            <i:InvokeCommandAction Command="{Binding SaveCommand}" />
-        </i:EventTrigger>
-        <i:EventTrigger EventName="CloseButtonClick">
-            <i:InvokeCommandAction Command="{Binding CancelCommand}" />
-        </i:EventTrigger>
-    </i:Interaction.Triggers>
-
     <ui:ContentDialog.Resources>
         <ex:EnumBindingSource x:Key="DeviceType"
                               EnumType="{x:Type enums:DeviceType}" />
@@ -114,7 +106,7 @@
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
-            
+
             <StackPanel  Background="LightGray">
                 <StackPanel.Style>
                     <Style TargetType="StackPanel">
@@ -131,9 +123,9 @@
                            HorizontalAlignment="Left"
                            Style="{StaticResource TextBlockSubTitle}" />
                 <TextBox Text="{Binding Device.OpcUaServerUrl}"/>
-                </StackPanel>
-            
-            
+            </StackPanel>
+
+
             <!-- S7 Specific Properties -->
             <StackPanel x:Name="S7PropertiesPanel" Background="LightGray">
                 <StackPanel.Style>
diff --git a/DMS.WPF/Views/Dialogs/VariableDialog.xaml b/DMS.WPF/Views/Dialogs/VariableDialog.xaml
index 15abdcf..ad5cebf 100644
--- a/DMS.WPF/Views/Dialogs/VariableDialog.xaml
+++ b/DMS.WPF/Views/Dialogs/VariableDialog.xaml
@@ -10,23 +10,16 @@
                   xmlns:en="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
                   xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
                   xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
-                  xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                   Title="{Binding Title}"
                   CloseButtonText="取消"
                   DefaultButton="Primary"
                   PrimaryButtonText="{Binding PrimaryButText}"
+                  PrimaryButtonCommand="{Binding PrimaryButtonCommand}"
+                  CloseButtonCommand="{Binding CancleButtonCommand}"
                   Background="#fff"
                   d:DataContext="{d:DesignInstance vmd:VariableDialogViewModel}"
                   mc:Ignorable="d">
     
-    <i:Interaction.Triggers>
-        <i:EventTrigger EventName="PrimaryButtonClick">
-            <i:InvokeCommandAction Command="{Binding PrimaryButtonCommand}" />
-        </i:EventTrigger>
-        <i:EventTrigger EventName="CloseButtonClick">
-            <i:InvokeCommandAction Command="{Binding CancleButtonCommand}" />
-        </i:EventTrigger>
-    </i:Interaction.Triggers>
     <ui:ContentDialog.Resources>
         <valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
     </ui:ContentDialog.Resources>