xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加了S7地址并添加了根据协议切换S7地址和OpcUa地址

Browse Source
This commit is contained in:
David P.G
2025-08-24 12:33:05 +08:00
parent 8cd876c67d
commit 172aa8042a
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
DMS.WPF/Views/Dialogs/VariableDialog.xaml
View File

@@ -22,6 +22,7 @@
<ui:ContentDialog.Resources> <ui:ContentDialog.Resources>
<valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" /> <valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
<valueConverts:EnumToStringConverter x:Key="EnumToStringConverter" />
<ex:EnumBindingSource x:Key="ProtocolType" EnumType="{x:Type en:ProtocolType}" /> <ex:EnumBindingSource x:Key="ProtocolType" EnumType="{x:Type en:ProtocolType}" />
<ex:EnumBindingSource x:Key="SignalType" EnumType="{x:Type enums:SignalType}" /> <ex:EnumBindingSource x:Key="SignalType" EnumType="{x:Type enums:SignalType}" />
<ex:EnumBindingSource x:Key="PollLevelType" EnumType="{x:Type enums:PollLevelType}" /> <ex:EnumBindingSource x:Key="PollLevelType" EnumType="{x:Type enums:PollLevelType}" />
@@ -52,12 +53,43 @@
hc:InfoElement.Title="变量名称:" hc:InfoElement.Title="变量名称:"
Text="{Binding Variable.Name, UpdateSourceTrigger=PropertyChanged}" /> Text="{Binding Variable.Name, UpdateSourceTrigger=PropertyChanged}" />
<!-- S7 Address Field - Visible when Protocol is S7 -->
<hc:TextBox <hc:TextBox
Grid.Row="0" Grid.Row="0"
Grid.Column="2" Grid.Column="2"
MinWidth="150" MinWidth="150"
hc:InfoElement.Title="节点ID:" hc:InfoElement.Title="S7地址:"
Text="{Binding Variable.OpcUaNodeId, UpdateSourceTrigger=PropertyChanged}" /> 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 <hc:ComboBox
Grid.Row="1" Grid.Row="1"