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

完成从TIA导入变量

Browse Source
This commit is contained in:
David P.G
2025-08-23 09:09:07 +08:00
parent 7e2e01e3cd
commit 32ade95742
10 changed files with 243 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@
mc:Ignorable="d">
<i:Interaction.Triggers>
<i:EventTrigger EventName="PrimaryButtonClick">
<i:InvokeCommandAction Command="{Binding ParimaryButtonCommand}" />
<i:InvokeCommandAction Command="{Binding PrimaryButtonCommand}" />
</i:EventTrigger>
<i:EventTrigger EventName="CloseButtonClick">
<i:InvokeCommandAction Command="{Binding CancleButtonCommand}" />

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

@@ -56,7 +56,7 @@
<DataGrid Grid.Row="1"
Margin="0,10,0,0"
ItemsSource="{Binding Variables}"
ItemsSource="{Binding VariableItemViewModels}"
AutoGenerateColumns="False"
CanUserAddRows="False">
<i:Interaction.Behaviors>
@@ -66,7 +66,7 @@
<Style BasedOn="{StaticResource {x:Type DataGrid}}"
TargetType="DataGrid">
<Style.Triggers>
<DataTrigger Binding="{Binding Variables.Count}"
<DataTrigger Binding="{Binding VariableItemViewModels.Count}"
Value="0">
<Setter Property="Visibility"
Value="Collapsed" />
@@ -77,6 +77,8 @@
<DataGrid.Columns>
<DataGridTextColumn Header="名称"
Binding="{Binding Name}" />
<DataGridTextColumn Header="描述"
Binding="{Binding Description}" />
<DataGridTextColumn Header="数据类型"
Binding="{Binding CSharpDataType}" />
<DataGridTextColumn Header="S7地址"