From 9cffb57b588349983b45e58ac50a8a75aa1dde97 Mon Sep 17 00:00:00 2001 From: "David P.G" Date: Thu, 17 Jul 2025 11:17:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ViewModels/VariableTableViewModel.cs | 35 ++++++++++------------------ 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/ViewModels/VariableTableViewModel.cs b/ViewModels/VariableTableViewModel.cs index 2b2bf5a..f49b964 100644 --- a/ViewModels/VariableTableViewModel.cs +++ b/ViewModels/VariableTableViewModel.cs @@ -779,38 +779,27 @@ partial class VariableTableViewModel : ViewModelBase if (addedCount > 0) { - //跟新已经加载的变量的Mqtt服务器 + // 更新已经加载的变量的Mqtt服务器和Mqtt服务器的变量表 foreach (var variable in validVariables) { - if (variable.Mqtts==null) + // 更新变量的 Mqtts 集合 + if (variable.Mqtts == null) { - variable.Mqtts=new List(); + variable.Mqtts = new List(); } - // 判断不存在再添加 - - var ids = variable.Mqtts.Select(m => m.Id) - .ToList(); - if (!ids.Contains(selectedMqtt.Id)) + if (!variable.Mqtts.Any(m => m.Id == selectedMqtt.Id)) { variable.Mqtts.Add(selectedMqtt); } - - } - - //将变量添加到Mqtt服务器的变量表中 - if (selectedMqtt.VariableDatas==null) - { - - selectedMqtt.VariableDatas=new List(); - } - foreach (var variable in validVariables) - { - var ids = selectedMqtt.VariableDatas.Select(v => v.Id) - .ToList(); - if (!ids.Contains(variable.Id)) + // 更新 Mqtt 服务器的 VariableDatas 集合 + if (selectedMqtt.VariableDatas == null) { - variable.Mqtts.Add(selectedMqtt); + selectedMqtt.VariableDatas = new List(); + } + if (!selectedMqtt.VariableDatas.Any(v => v.Id == variable.Id)) + { + selectedMqtt.VariableDatas.Add(variable); } } // 刷新界面以反映更改