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

refactor:重构了变量的导入和删除

Browse Source
This commit is contained in:
David P.G
2025-10-25 20:56:23 +08:00
parent 125348486a
commit b59d3d38a7
8 changed files with 111 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DMS.WPF/Views/Dialogs/ImportExcelDialog.xaml
View File

@@ -80,7 +80,7 @@
<DataGridTextColumn Header="描述"
Binding="{Binding Description}" />
<DataGridTextColumn Header="数据类型"
Binding="{Binding CSharpDataType}" />
Binding="{Binding DataType}" />
<DataGridTextColumn Header="S7地址"
Binding="{Binding S7Address}" />
</DataGrid.Columns>

2
DMS.WPF/Views/Dialogs/ImportOpcUaDialog.xaml
View File

@@ -124,7 +124,7 @@
</DataGrid.Style>
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding Name}" Header="名称" />
<DataGridTextColumn Binding="{Binding CSharpDataType}" Header="数据类型" />
<DataGridTextColumn Binding="{Binding DataType}" Header="数据类型" />
<DataGridTextColumn Binding="{Binding OpcUaNodeId}" Header="节点ID" />
</DataGrid.Columns>

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

@@ -24,7 +24,7 @@
<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="CSharpDataType" EnumType="{x:Type enums:DataType}" />
<ex:EnumBindingSource x:Key="DataType" EnumType="{x:Type enums:DataType}" />
</ui:ContentDialog.Resources>
<ScrollViewer VerticalScrollBarVisibility="Auto">
@@ -160,8 +160,8 @@
Margin="0,15,0,0"
hc:InfoElement.Title="数据类型:"
IsEnabled="{Binding IsAddModel}"
ItemsSource="{Binding Source={StaticResource CSharpDataType}}"
SelectedItem="{Binding Variable.CSharpDataType, UpdateSourceTrigger=PropertyChanged}">
ItemsSource="{Binding Source={StaticResource DataType}}"
SelectedItem="{Binding Variable.DataType, UpdateSourceTrigger=PropertyChanged}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" />