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

将所有的VariableData改为Variable,将DataVariables改为Variables,修复了变量添加MQTT服务器后，服务器列表不更新的问题

Browse Source
This commit is contained in:
David P.G
2025-07-17 20:13:21 +08:00
parent 6b21c387d5
commit 018fe7c9d0
44 changed files with 410 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ViewModels/Dialogs/OpcUaImportDialogViewModel.cs
View File

@@ -21,9 +21,9 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
private ObservableCollection<OpcUaNode> _opcUaNodes;
[ObservableProperty]
private ObservableCollection<VariableData> _selectedNodeVariables;
private ObservableCollection<Variable> _selectedNodeVariables;
public List<VariableData> SelectedVariables { get; set; }=new List<VariableData>();
public List<Variable> SelectedVariables { get; set; }=new List<Variable>();
[ObservableProperty]
private bool _selectAllVariables;
@@ -36,7 +36,7 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
public OpcUaImportDialogViewModel()
{
OpcUaNodes = new ObservableCollection<OpcUaNode>();
SelectedNodeVariables = new ObservableCollection<VariableData>();
SelectedNodeVariables = new ObservableCollection<Variable>();
// Automatically connect when the ViewModel is created
ConnectCommand.Execute(null);
@@ -141,7 +141,7 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
{
// 如果是变量节点，直接显示它
SelectedNodeVariables.Clear();
SelectedNodeVariables.Add(new VariableData
SelectedNodeVariables.Add(new Variable
{
Name = node.DisplayName,
NodeId = node.NodeId.ToString(),
@@ -230,7 +230,7 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
dataType = _session.NodeCache.GetDisplayText(dataTypeNodeId);
}
SelectedNodeVariables.Add(new VariableData
SelectedNodeVariables.Add(new Variable
{
Name = opcUaNode.DisplayName,
OpcUaNodeId = opcUaNode.NodeId.ToString(),
@@ -254,8 +254,8 @@ public partial class OpcUaImportDialogViewModel : ObservableObject
}
}
public ObservableCollection<VariableData> GetSelectedVariables()
public ObservableCollection<Variable> GetSelectedVariables()
{
return new ObservableCollection<VariableData>(SelectedVariables);
return new ObservableCollection<Variable>(SelectedVariables);
}
}