完成OpcUaService对数据类型的读取

DMS.WPF/ViewModels/Dialogs/ImportOpcUaDialogViewModel.cs

@@ -116,15 +116,9 @@ public partial class ImportOpcUaDialogViewModel : DialogViewModelBase<List<Varia
 
 
 
-    private bool _isLoadingNodeVariables = false;
     
     public async Task LoadNodeVariables(OpcUaNodeItemViewModel node)
     {
-        // 防止重复加载
-        if (_isLoadingNodeVariables)
-            return;
-            
-        _isLoadingNodeVariables = true;
         
         try
         {
@@ -158,6 +152,7 @@ public partial class ImportOpcUaDialogViewModel : DialogViewModelBase<List<Varia
                         Name = children.DisplayName, // 修正：使用子节点的显示名称
                         OpcUaNodeId = children.NodeId.ToString(),
                         Protocol = ProtocolType.OpcUa,
+                        CSharpDataType=children.DataType,
                         IsActive = true // 默认选中
                     });
                 }
@@ -172,10 +167,6 @@ public partial class ImportOpcUaDialogViewModel : DialogViewModelBase<List<Varia
             NlogHelper.Error($"加载 OPC UA 节点变量失败: {node.NodeId} - {ex.Message}", ex);
             NotificationHelper.ShowError($"加载 OPC UA 节点变量失败: {node.NodeId} - {ex.Message}", ex);
         }
-        finally
-        {
-            _isLoadingNodeVariables = false;
-        }
     }
 
 

DMS.WPF/ViewModels/Items/OpcUaNodeItemViewModel.cs

@@ -23,6 +23,9 @@ namespace DMS.WPF.ViewModels.Items
         [ObservableProperty]
         private object? _value;
 
+        [ObservableProperty]
+        private string? _dataType;
+
         [ObservableProperty]
         private OpcUaNodeItemViewModel? _parentNode;
 

DMS.WPF/Views/Dialogs/ImportOpcUaDialog.xaml

@@ -101,21 +101,10 @@
                 </Style>
             </DataGrid.Style>
             <DataGrid.Columns>
-                <DataGridTemplateColumn>
-                    <DataGridTemplateColumn.HeaderTemplate>
-                        <DataTemplate>
-                            <CheckBox IsChecked="{Binding DataContext.SelectAllVariables, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
-                        </DataTemplate>
-                    </DataGridTemplateColumn.HeaderTemplate>
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <CheckBox IsChecked="{Binding IsSelect, UpdateSourceTrigger=PropertyChanged}" />
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
                 <DataGridTextColumn Binding="{Binding Name}" Header="名称" />
+                <DataGridTextColumn Binding="{Binding CSharpDataType}" Header="数据类型" />
                 <DataGridTextColumn Binding="{Binding OpcUaNodeId}" Header="节点ID" />
-                <DataGridTextColumn Binding="{Binding SignalType}" Header="数据类型" />
+
             </DataGrid.Columns>
         </DataGrid>
     </Grid>

DMS.WPF/Views/Dialogs/ImportOpcUaDialog.xaml.cs

@@ -16,8 +16,8 @@ namespace DMS.WPF.Views.Dialogs;
 /// </summary>
 public partial class ImportOpcUaDialog : ContentDialog
 {
-    private const int ContentAreaMaxWidth = 1200;
-    private const int ContentAreaMaxHeight = 800;
+    private const int ContentAreaMaxWidth = 1300;
+    private const int ContentAreaMaxHeight = 900;