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

Models/Variable.cs

@@ -6,7 +6,7 @@ namespace PMSWPF.Models;
 /// <summary>
 /// 表示变量数据信息。
 /// </summary>
-public partial class VariableData : ObservableObject, IEquatable<VariableData>
+public partial class Variable : ObservableObject, IEquatable<Variable>
 {
     /// <summary>
     /// 变量唯一标识符。
@@ -184,10 +184,10 @@ public partial class VariableData : ObservableObject, IEquatable<VariableData>
 
     public override bool Equals(object? obj)
     {
-        return Equals(obj as VariableData);
+        return Equals(obj as Variable);
     }
 
-    public bool Equals(VariableData? other)
+    public bool Equals(Variable? other)
     {
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;

Models/VariableContext.cs

@@ -2,12 +2,12 @@ using PMSWPF.Models;
 
 namespace PMSWPF.Models
 {
-    public class VariableDataContext
+    public class VariableContext
     {
-        public VariableData Data { get; set; }
+        public Variable Data { get; set; }
         public bool IsHandled { get; set; }
 
-        public VariableDataContext(VariableData data)
+        public VariableContext(Variable data)
         {
             Data = data;
             IsHandled = false; // 默认未处理

Models/VariableMqtt.cs

@@ -14,11 +14,11 @@ public partial class VariableMqtt : ObservableObject
     {
     }
 
-    public VariableMqtt(VariableData? variableData, Mqtt? mqtt)
+    public VariableMqtt(Variable variable, Mqtt mqtt)
     {
-        VariableData = variableData;
+        Variable = variable;
         Mqtt = mqtt;
-        MqttAlias = MqttAlias != String.Empty ? MqttAlias : variableData.Name;
+        MqttAlias = MqttAlias != String.Empty ? MqttAlias : variable.Name;
     }
 
     /// <summary>
@@ -29,7 +29,7 @@ public partial class VariableMqtt : ObservableObject
     /// <summary>
     /// 关联的变量数据ID。
     /// </summary>
-    public int VariableDataId { get; set; }
+    public int VariableId { get; set; }
 
     /// <summary>
     /// 关联的MQTT服务器ID。
@@ -49,13 +49,13 @@ public partial class VariableMqtt : ObservableObject
     {
         get
         {
-            if (VariableData.ProtocolType == ProtocolType.S7)
+            if (Variable.ProtocolType == ProtocolType.S7)
             {
-                return VariableData.S7Address;
+                return Variable.S7Address;
             }
-            else if (VariableData.ProtocolType == ProtocolType.OpcUA)
+            else if (Variable.ProtocolType == ProtocolType.OpcUA)
             {
-                return VariableData.OpcUaNodeId;
+                return Variable.OpcUaNodeId;
             }
 
             return string.Empty;
@@ -75,10 +75,10 @@ public partial class VariableMqtt : ObservableObject
     /// <summary>
     /// 导航属性：关联的变量数据。
     /// </summary>
-    public VariableData? VariableData { get; set; }
+    public Variable Variable { get; set; }
 
     /// <summary>
     /// 导航属性：关联的MQTT服务器。
     /// </summary>
-    public Mqtt? Mqtt { get; set; }
+    public Mqtt Mqtt { get; set; }
 }

Models/VariableTable.cs

@@ -30,17 +30,8 @@ public partial class VariableTable : ObservableObject
     /// 变量表中包含的数据变量列表。
     /// </summary>
     [ObservableProperty]
-    public ObservableCollection<VariableData> dataVariables;
-    // [ObservableProperty]
-    // public ObservableCollection<VariableData> varDataList;
-    //
-    // // 列表改变了的事件
-    // // public event Action<List<VariableData>> OnDataVariableListChanged;
-    // partial void OnDataVariablesChanged(List<VariableData> variableDatas)
-    // {
-    //     VarDataList=new ObservableCollection<VariableData>(variableDatas);
-    // }
-
+    public ObservableCollection<Variable> variables;
+   
     /// <summary>
     /// 变量表的唯一标识符。
     /// </summary>