From 172aa8042a84ff734994fe3f689b6af025c1918f Mon Sep 17 00:00:00 2001
From: "David P.G" <pgw1315@163.com>
Date: Sun, 24 Aug 2025 12:33:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86S7=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=A0=B9=E6=8D=AE=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E5=88=87=E6=8D=A2S7=E5=9C=B0=E5=9D=80=E5=92=8COpcUa?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DMS.WPF/Views/Dialogs/VariableDialog.xaml | 36 +++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/DMS.WPF/Views/Dialogs/VariableDialog.xaml b/DMS.WPF/Views/Dialogs/VariableDialog.xaml
index b4bf781..11c7e89 100644
--- a/DMS.WPF/Views/Dialogs/VariableDialog.xaml
+++ b/DMS.WPF/Views/Dialogs/VariableDialog.xaml
@@ -22,6 +22,7 @@
 
     <ui:ContentDialog.Resources>
         <valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
+        <valueConverts:EnumToStringConverter x:Key="EnumToStringConverter" />
         <ex:EnumBindingSource x:Key="ProtocolType" EnumType="{x:Type en:ProtocolType}" />
         <ex:EnumBindingSource x:Key="SignalType" EnumType="{x:Type enums:SignalType}" />
         <ex:EnumBindingSource x:Key="PollLevelType" EnumType="{x:Type enums:PollLevelType}" />
@@ -52,12 +53,43 @@
                         hc:InfoElement.Title="变量名称:"
                         Text="{Binding Variable.Name, UpdateSourceTrigger=PropertyChanged}" />
 
+                    <!-- S7 Address Field - Visible when Protocol is S7 -->
                     <hc:TextBox
                         Grid.Row="0"
                         Grid.Column="2"
                         MinWidth="150"
-                        hc:InfoElement.Title="节点ID:"
-                        Text="{Binding Variable.OpcUaNodeId, UpdateSourceTrigger=PropertyChanged}" />
+                        hc:InfoElement.Title="S7地址:"
+                        Text="{Binding Variable.S7Address, UpdateSourceTrigger=PropertyChanged}">
+                        <hc:TextBox.Style>
+                            <Style TargetType="hc:TextBox" BasedOn="{StaticResource {x:Type hc:TextBox}}">
+                                <Setter Property="Visibility" Value="Collapsed" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Variable.Protocol, Converter={StaticResource EnumToStringConverter}}" Value="S7">
+                                        <Setter Property="Visibility" Value="Visible" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </hc:TextBox.Style>
+                    </hc:TextBox>
+
+                    <!-- OPC UA Node ID Field - Visible when Protocol is OpcUa -->
+                    <hc:TextBox
+                        Grid.Row="0"
+                        Grid.Column="2"
+                        MinWidth="150"
+                        hc:InfoElement.Title="OpcUa节点ID:"
+                        Text="{Binding Variable.OpcUaNodeId, UpdateSourceTrigger=PropertyChanged}">
+                        <hc:TextBox.Style>
+                            <Style TargetType="hc:TextBox" BasedOn="{StaticResource {x:Type hc:TextBox}}">
+                                <Setter Property="Visibility" Value="Collapsed" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Variable.Protocol, Converter={StaticResource EnumToStringConverter}}" Value="OpcUa">
+                                        <Setter Property="Visibility" Value="Visible" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </hc:TextBox.Style>
+                    </hc:TextBox>
 
                     <hc:ComboBox
                         Grid.Row="1"