From e3c2253f7b660df5945772ee09fc71bce9cff3fe Mon Sep 17 00:00:00 2001
From: "David P.G" <pgw1315@163.com>
Date: Sun, 27 Jul 2025 22:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=97=B6=E9=80=89=E6=8B=A9=E9=80=9A=E8=AE=AF=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=EF=BC=8C=E7=95=8C=E9=9D=A2=E4=B9=9F=E8=B7=9F=E7=9D=80?=
 =?UTF-8?q?=E8=B7=9F=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ValueConverts/EnumDescriptionConverter.cs |  2 +-
 .../ValueConverts/NullableBooleanConverter.cs |  3 +-
 .../ViewModels/Items/DeviceItemViewModel.cs   |  5 +++
 DMS.WPF/Views/Dialogs/ConfirmDialog.xaml      |  1 -
 DMS.WPF/Views/Dialogs/DeviceDialog.xaml       | 36 ++++++++++---------
 DMS.WPF/Views/Dialogs/IsActiveDialog.xaml     |  4 +--
 DMS.WPF/Views/Dialogs/MqttDialog.xaml         |  4 +--
 DMS.WPF/Views/Dialogs/PollLevelDialog.xaml    |  4 +--
 DMS.WPF/Views/Dialogs/VarDataDialog.xaml      |  4 +--
 DMS.WPF/Views/Dialogs/VarTableDialog.xaml     |  1 -
 DMS.WPF/Views/MqttServerDetailView.xaml       |  4 +--
 DMS.WPF/Views/VariableTableView.xaml          |  4 +--
 12 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/DMS.WPF/ValueConverts/EnumDescriptionConverter.cs b/DMS.WPF/ValueConverts/EnumDescriptionConverter.cs
index 92f72c5..71248bd 100644
--- a/DMS.WPF/ValueConverts/EnumDescriptionConverter.cs
+++ b/DMS.WPF/ValueConverts/EnumDescriptionConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace DMS.ValueConverts;
+namespace DMS.WPF.ValueConverts;
 
 public class EnumDescriptionConverter : IValueConverter
 {
diff --git a/DMS.WPF/ValueConverts/NullableBooleanConverter.cs b/DMS.WPF/ValueConverts/NullableBooleanConverter.cs
index c9786fc..680df23 100644
--- a/DMS.WPF/ValueConverts/NullableBooleanConverter.cs
+++ b/DMS.WPF/ValueConverts/NullableBooleanConverter.cs
@@ -1,8 +1,7 @@
-using System;
 using System.Globalization;
 using System.Windows.Data;
 
-namespace DMS.ValueConverts
+namespace DMS.WPF.ValueConverts
 {
     public class NullableBooleanConverter : IValueConverter
     {
diff --git a/DMS.WPF/ViewModels/Items/DeviceItemViewModel.cs b/DMS.WPF/ViewModels/Items/DeviceItemViewModel.cs
index 6078198..8a29df2 100644
--- a/DMS.WPF/ViewModels/Items/DeviceItemViewModel.cs
+++ b/DMS.WPF/ViewModels/Items/DeviceItemViewModel.cs
@@ -54,6 +54,11 @@ public partial class DeviceItemViewModel : ObservableObject
     [ObservableProperty]
     private string _status;
 
+    partial void OnProtocolChanged(ProtocolType oldValue, ProtocolType newValue)
+    {
+        
+    }
+
     public ObservableCollection<VariableTableItemViewModel> VariableTables { get; set; } = new();
 
     public DeviceItemViewModel(DeviceDto dto)
diff --git a/DMS.WPF/Views/Dialogs/ConfirmDialog.xaml b/DMS.WPF/Views/Dialogs/ConfirmDialog.xaml
index b807cc5..56344cb 100644
--- a/DMS.WPF/Views/Dialogs/ConfirmDialog.xaml
+++ b/DMS.WPF/Views/Dialogs/ConfirmDialog.xaml
@@ -6,7 +6,6 @@
                   xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
                   xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
                   xmlns:vmd="clr-namespace:DMS.WPF.ViewModels.Dialogs"
-                  xmlns:vc="clr-namespace:DMS.ValueConverts"
                   xmlns:ex="clr-namespace:DMS.Extensions"
                   xmlns:en="clr-namespace:DMS.Core.Enums"
                   Title="{Binding Title}"
diff --git a/DMS.WPF/Views/Dialogs/DeviceDialog.xaml b/DMS.WPF/Views/Dialogs/DeviceDialog.xaml
index fb46847..58f0c26 100644
--- a/DMS.WPF/Views/Dialogs/DeviceDialog.xaml
+++ b/DMS.WPF/Views/Dialogs/DeviceDialog.xaml
@@ -6,10 +6,10 @@
                   xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
                   xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
                   xmlns:vmd="clr-namespace:DMS.WPF.ViewModels.Dialogs"
-                  xmlns:vc="clr-namespace:DMS.ValueConverts"
                   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"
@@ -34,6 +34,7 @@
         <ex:EnumBindingSource x:Key="cpuType"
                               EnumType="{x:Type enums:CpuType}" />
         <vc:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
+        <vc:EnumToStringConverter x:Key="EnumToStringConverter" />
 
 
     </ui:ContentDialog.Resources>
@@ -61,17 +62,17 @@
                      Text="{Binding Device.IpAddress, UpdateSourceTrigger=PropertyChanged}" />
 
             <!-- 设备类型 -->
-            <!-- <TextBlock Text="设备类型" -->
-            <!--            HorizontalAlignment="Left" -->
-            <!--            Style="{StaticResource TextBlockSubTitle}" /> -->
-            <!-- <ComboBox SelectedItem="{Binding Device}" -->
-            <!--           ItemsSource="{Binding Source={StaticResource deviceType} }"> -->
-            <!--     <ComboBox.ItemTemplate> -->
-            <!--         <DataTemplate> -->
-            <!--             <TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" /> -->
-            <!--         </DataTemplate> -->
-            <!--     </ComboBox.ItemTemplate> -->
-            <!-- </ComboBox> -->
+            <TextBlock Text="设备类型"
+                       HorizontalAlignment="Left"
+                       Style="{StaticResource TextBlockSubTitle}" />
+            <ComboBox SelectedItem="{Binding Device}"
+                      ItemsSource="{Binding Source={StaticResource deviceType} }">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
 
             <CheckBox FontSize="16"
                       Content="是否添加默认变量表"
@@ -101,7 +102,7 @@
             <TextBlock Text="设备通信协议"
                        HorizontalAlignment="Left"
                        Style="{StaticResource TextBlockSubTitle}" />
-            <ComboBox SelectedItem="{Binding Device.Protocol}"
+            <ComboBox x:Name="ProtocolComboBox" SelectedItem="{Binding Device.Protocol}"
                       ItemsSource="{Binding Source={StaticResource protocolType} }">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
@@ -109,14 +110,15 @@
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
-
+            
             <!-- S7 Specific Properties -->
-            <StackPanel x:Name="S7PropertiesPanel" Visibility="Visible" Background="LightGray">
+            <StackPanel x:Name="S7PropertiesPanel" Background="LightGray">
                 <StackPanel.Style>
                     <Style TargetType="StackPanel">
+                        <Setter Property="Visibility" Value="Collapsed" />
                         <Style.Triggers>
-                            <DataTrigger Binding="{Binding Device.Protocol}"
-                                         Value="{x:Static enums:ProtocolType.S7}">
+                            <DataTrigger Binding="{Binding ElementName=ProtocolComboBox, Path=SelectedItem, Converter={StaticResource EnumToStringConverter}}"
+                                         Value="S7">
                                 <Setter Property="Visibility" Value="Visible" />
                             </DataTrigger>
                         </Style.Triggers>
diff --git a/DMS.WPF/Views/Dialogs/IsActiveDialog.xaml b/DMS.WPF/Views/Dialogs/IsActiveDialog.xaml
index e203b91..9dffdff 100644
--- a/DMS.WPF/Views/Dialogs/IsActiveDialog.xaml
+++ b/DMS.WPF/Views/Dialogs/IsActiveDialog.xaml
@@ -5,7 +5,7 @@
                         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                         xmlns:controls="http://schemas.inkore.net/lib/ui/wpf/modern"
                         xmlns:vm="clr-namespace:DMS.WPF.ViewModels.Dialogs"
-                        xmlns:vc="clr-namespace:DMS.ValueConverts"
+                        xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
                         mc:Ignorable="d"
                         d:DataContext="{d:DesignInstance vm:IsActiveDialogViewModel}"
                         Title="修改激活状态"
@@ -14,7 +14,7 @@
                         PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
                         SecondaryButtonClick="ContentDialog_SecondaryButtonClick">
     <controls:ContentDialog.Resources>
-        <vc:NullableBooleanConverter x:Key="NullableBooleanConverter" />
+        <valueConverts:NullableBooleanConverter x:Key="NullableBooleanConverter" />
     </controls:ContentDialog.Resources>
     <Grid>
         <StackPanel Orientation="Vertical" Margin="10">
diff --git a/DMS.WPF/Views/Dialogs/MqttDialog.xaml b/DMS.WPF/Views/Dialogs/MqttDialog.xaml
index 525e171..7030ad1 100644
--- a/DMS.WPF/Views/Dialogs/MqttDialog.xaml
+++ b/DMS.WPF/Views/Dialogs/MqttDialog.xaml
@@ -6,10 +6,10 @@
                   xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
                   xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
                   xmlns:vmd="clr-namespace:DMS.WPF.ViewModels.Dialogs"
-                  xmlns:vc="clr-namespace:DMS.ValueConverts"
                   xmlns:ex="clr-namespace:DMS.Extensions"
                   xmlns:en="clr-namespace:DMS.Core.Enums"
                   xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
+                  xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
                   Title="{Binding Title}"
                   CloseButtonText="取消"
                   DefaultButton="Primary"
@@ -20,7 +20,7 @@
     <ui:ContentDialog.Resources>
         <ex:EnumBindingSource x:Key="mqttPlatform"
                               EnumType="{x:Type enums:MqttPlatform}" />
-        <vc:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
+        <valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
     </ui:ContentDialog.Resources>
 
     <Grid Width="480"
diff --git a/DMS.WPF/Views/Dialogs/PollLevelDialog.xaml b/DMS.WPF/Views/Dialogs/PollLevelDialog.xaml
index 8b33595..e6b9dbf 100644
--- a/DMS.WPF/Views/Dialogs/PollLevelDialog.xaml
+++ b/DMS.WPF/Views/Dialogs/PollLevelDialog.xaml
@@ -6,14 +6,14 @@
              xmlns:enums="clr-namespace:DMS.Core.Enums"
              xmlns:extensions="clr-namespace:DMS.Extensions"
              xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
-             xmlns:vc="clr-namespace:DMS.ValueConverts"
+             xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
              mc:Ignorable="d"
              Title="修改轮询频率"
              PrimaryButtonText="确定"
              CloseButtonText="取消"
              d:DesignHeight="150" d:DesignWidth="300">
     <ui:ContentDialog.Resources>
-        <vc:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
+        <valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
     </ui:ContentDialog.Resources>
     <Grid>
         <ComboBox 
diff --git a/DMS.WPF/Views/Dialogs/VarDataDialog.xaml b/DMS.WPF/Views/Dialogs/VarDataDialog.xaml
index 25553b3..996d85a 100644
--- a/DMS.WPF/Views/Dialogs/VarDataDialog.xaml
+++ b/DMS.WPF/Views/Dialogs/VarDataDialog.xaml
@@ -6,11 +6,11 @@
                   xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
                   xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
                   xmlns:vmd="clr-namespace:DMS.WPF.ViewModels.Dialogs"
-                  xmlns:vc="clr-namespace:DMS.ValueConverts"
                   xmlns:ex="clr-namespace:DMS.Extensions"
                   xmlns:en="clr-namespace:DMS.Core.Enums"
                   xmlns:sockets="clr-namespace:System.Net.Sockets;assembly=System.Net.Sockets"
                   xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
+                  xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
                   Title="{Binding Title}"
                   CloseButtonText="取消"
                   DefaultButton="Primary"
@@ -19,7 +19,7 @@
                   d:DataContext="{d:DesignInstance vmd:VarDataDialogViewModel}"
                   mc:Ignorable="d">
     <ui:ContentDialog.Resources>
-        <vc:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
+        <valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
     </ui:ContentDialog.Resources>
 
     <Grid Margin="10" Width="480">
diff --git a/DMS.WPF/Views/Dialogs/VarTableDialog.xaml b/DMS.WPF/Views/Dialogs/VarTableDialog.xaml
index 9250f51..80f0607 100644
--- a/DMS.WPF/Views/Dialogs/VarTableDialog.xaml
+++ b/DMS.WPF/Views/Dialogs/VarTableDialog.xaml
@@ -6,7 +6,6 @@
                   xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
                   xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
                   xmlns:vmd="clr-namespace:DMS.WPF.ViewModels.Dialogs"
-                  xmlns:vc="clr-namespace:DMS.ValueConverts"
                   xmlns:ex="clr-namespace:DMS.Extensions"
                   xmlns:en="clr-namespace:DMS.Core.Enums"
                   Title="{Binding Title}"
diff --git a/DMS.WPF/Views/MqttServerDetailView.xaml b/DMS.WPF/Views/MqttServerDetailView.xaml
index 3f29204..54ad307 100644
--- a/DMS.WPF/Views/MqttServerDetailView.xaml
+++ b/DMS.WPF/Views/MqttServerDetailView.xaml
@@ -6,13 +6,13 @@
              xmlns:viewmodels="clr-namespace:DMS.WPF.ViewModels"
              xmlns:models="clr-namespace:DMS.Core.Models;assembly=DMS.Core"
              xmlns:iNKORE="clr-namespace:iNKORE.UI.WPF.Modern.Controls;assembly=iNKORE.UI.WPF.Modern"
-             xmlns:converters="clr-namespace:DMS.ValueConverts"
              xmlns:extensions="clr-namespace:DMS.Extensions"
              xmlns:enums="clr-namespace:DMS.Core.Enums"
+             xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
-        <converters:EnumDescriptionConverter x:Key="EnumDescriptionConverter"/>
+        <valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter"/>
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
diff --git a/DMS.WPF/Views/VariableTableView.xaml b/DMS.WPF/Views/VariableTableView.xaml
index c483967..1bc6b0a 100644
--- a/DMS.WPF/Views/VariableTableView.xaml
+++ b/DMS.WPF/Views/VariableTableView.xaml
@@ -8,11 +8,11 @@
              xmlns:vm="clr-namespace:DMS.WPF.ViewModels"
              xmlns:controls="http://schemas.inkore.net/lib/ui/wpf/modern"
              mc:Ignorable="d"
-             xmlns:vc="clr-namespace:DMS.ValueConverts"
              xmlns:ex="clr-namespace:DMS.Extensions"
              xmlns:en="clr-namespace:DMS.Core.Enums"
              xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
              xmlns:global="clr-namespace:;assembly=DMS.Core"
+             xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
              Loaded="VariableTableView_OnLoaded"
              d:DataContext="{d:DesignInstance vm:VariableTableViewModel}"
              d:DesignHeight="600"
@@ -23,7 +23,7 @@
                               EnumType="{x:Type enums:SignalType}" />
         <ex:EnumBindingSource x:Key="protocolType"
                               EnumType="{x:Type enums:ProtocolType}" />
-        <vc:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
+        <valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
         <ex:EnumBindingSource x:Key="pollLevelType"
                               EnumType="{x:Type enums:PollLevelType}" />
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />