fix: 维护模式重复进入失败与按钮灰死 + Broker 并发验证用例

wenxiangchao

3 天以前 b544d5cccd76735e034c8055918a50927b437474

 HMI.ParameterManage/ParameterModal.xaml.cs

@@ -73,13 +73,15 @@

        private bool ValidateForm()
        {
            bool flag = FormGroupHelper.ValidateForm(formPanel, new Dictionary<string, object> {
            var cache = new Dictionary<string, object> {
                { "FgValue",GetTargetValue()}
            });
            };
            bool flag = FormGroupHelper.ValidateForm(formPanel, cache);
            if (flag)
            {
                Data.Name = TbName.Text;
                Data.Type = CbType.Text;
                Data.IsArray = CbIsArray.IsChecked == true;
                Data.Value = GetTargetValue();
                Data.Unit = TbUnit.Text;
                Data.Description = TbDescription.Text;
@@ -94,6 +96,7 @@
            Data = data;
            TbName.Text = Data.Name;
            CbType.SelectedValue = Data.Type;
            CbIsArray.IsChecked = Data.IsArray;
            CbGroup.ItemsSource = groups;
            UpdateWindow(Data.Type);
            UpdateForm(Data);
@@ -106,11 +109,12 @@

        private string GetTargetValue()
        {
            if (CbType.Text == "Int" || Data.Type == "Double")
            var type = CbType.Text;
            if (type == "Int" || type == "Double")
            {
                return NiNumberValue.Text;
            }
            else if (CbType.Text == "Bool")
            else if (type == "Bool")
            {
                return CbBoolValue.Text;
            }