From b544d5cccd76735e034c8055918a50927b437474 Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期二, 10 十一月 2026 08:29:04 +0800
Subject: [PATCH] fix: 维护模式重复进入失败与按钮灰死 + Broker 并发验证用例
---
HMI.ParameterManage/ParameterManage.xaml.cs | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 deletions(-)
diff --git a/HMI.ParameterManage/ParameterManage.xaml.cs b/HMI.ParameterManage/ParameterManage.xaml.cs
index 8da173a..23e543f 100644
--- a/HMI.ParameterManage/ParameterManage.xaml.cs
+++ b/HMI.ParameterManage/ParameterManage.xaml.cs
@@ -1,13 +1,16 @@
-锘縰sing System.IO;
+锘縰sing HMI.Base;
+using HMI.Core.Entity;
+using HMI.Core.Manager;
+using HMI.Core.Util;
+using HMI.ParameterManage.Model;
+using HMI.UI.Util;
+using NPOI.POIFS.NIO;
+using NPOI.SS.Formula.Functions;
using System.Linq;
+using System.Text.RegularExpressions;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Markup;
-using HMI.Base;
-using HMI.Core.Util;
-using HMI.ParameterManage.Entity;
-using HMI.ParameterManage.Model;
-using HMI.UI.Util;
namespace HMI.ParameterManage
{
@@ -32,6 +35,7 @@
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
Model.LoadProducts();
+ Model.LoadParameters();
Loaded -= UserControl_Loaded;
}
@@ -42,6 +46,9 @@
{
case "addBtn":
OpenProductDialog(null);
+ break;
+ case "refreshBtn":
+ Model.LoadProducts();
break;
case "editProductBtn":
OpenProductDialog((ProductData)btn.DataContext);
@@ -74,14 +81,15 @@
break;
}
}
+
private void OpenProductDialog(ProductData data)
{
var win = new ProductModal(Model)
{
- Title = data == null ? "鏂板浜у搧" : "缂栬緫浜у搧",
+ Title = data == null ? this.lang("Pm.Product.Add") : this.lang("Pm.Product.Edit"),
Owner = Window.GetWindow(this),
};
- if (win.Open(data ?? new ProductData()) == true)
+ if (win.Open(data ?? new ProductData(), data != null) == true)
{
Model.LoadProducts();
}
@@ -91,23 +99,44 @@
{
if (Model.SelectedProduct == null)
{
- ToastHelper.Warning(Window.GetWindow(this), "璇峰厛閫夋嫨涓�椤逛骇鍝�");
+ ToastHelper.Warning(Window.GetWindow(this), this.lang("Pm.PleaseSelectProduct"));
return;
}
- var win = new ParameterModal(Model)
+ //var win = new ParameterModal(Model)
+ //{
+ // Title = data == null ? this.lang("Pm.Parameter.Add") : this.lang("Pm.Parameter.Edit"),
+ // Owner = Window.GetWindow(this),
+ //};
+ //if (win.Open(Model.SelectedProduct.Name, data ?? new ParameterData { ProductName = Model.SelectedProduct.Name }, Model.groups) == true)
+ //{
+ // Model.LoadParameters();
+ //}
+
+ SettingModal modal = new SettingModal()
{
- Title = data == null ? "鏂板鍙傛暟" : "缂栬緫鍙傛暟",
- Owner = Window.GetWindow(this),
+ Title = data == null ? this.lang("Pm.Parameter.Add") : this.lang("Pm.Parameter.Edit"),
+ Owner = Window.GetWindow(this)
};
- if (win.Open(data ?? new ParameterData { ProductName = Model.SelectedProduct.Name }) == true)
+ var target = data ?? new ParameterData();
+ if (modal.Open(target, Model.Parameters, Model.groups, Model.SelectedProduct.Name) == true)
{
+ //if (index == -1)
+ //{
+ // Datasource.Add(modal.Data);
+ // ParameterManager.SaveCommonParameter(Datasource);
+ //}
+ //else
+ //{
+ // ParameterManager.SaveCommonParameter(Datasource);
+ //}
+ Model.SaveOrUpdateParameter(target);
Model.LoadParameters();
}
}
private void TryDeleteProduct(ProductData data)
{
- if (MsgBoxHelper.WarnMessage(Window.GetWindow(this), $"纭畾瑕佸垹闄や骇鍝乕{data.Name}]鍚楋紵璇ユ搷浣滄棤娉曟挙閿�")
+ if (MsgBoxHelper.WarnMessage(Window.GetWindow(this), this.lang("HMI.MakeSureDeleteSingle", data.Name))
== MessageBoxResult.OK)
{
Model.DeleteProduct(data);
@@ -120,10 +149,10 @@
var temp = Model.Products.Where(p => p.IsSelected).Count();
if (temp <= 0)
{
- this.Warning("璇烽�夋嫨瑕佸垹闄ょ殑浜у搧");
+ this.Warning(this.lang("HMI.NoDeleteData"));
return;
}
- if (MsgBoxHelper.WarnMessage(Window.GetWindow(this), $"纭畾瑕佸垹闄ら�変腑鐨刐{temp}]鏉′骇鍝佸悧锛熻鎿嶄綔鏃犳硶鎾ら攢")
+ if (MsgBoxHelper.WarnMessage(Window.GetWindow(this), this.lang("HMI.MakeSureDeletes", temp))
== MessageBoxResult.OK)
{
Model.DeleteProducts();
@@ -133,7 +162,7 @@
private void TryDeleteParameter(ParameterData data)
{
- if (MsgBoxHelper.WarnMessage(Window.GetWindow(this), $"纭畾瑕佸垹闄ゅ弬鏁癧{data.Name}]鍚楋紵璇ユ搷浣滄棤娉曟挙閿�") == MessageBoxResult.OK)
+ if (MsgBoxHelper.WarnMessage(Window.GetWindow(this), this.lang("HMI.MakeSureDeleteSingle", data.Name)) == MessageBoxResult.OK)
{
Model.DeleteParameter(data);
Model.LoadParameters();
@@ -145,16 +174,15 @@
var temp = Model.Parameters.Where(p => p.IsSelected).Count();
if (temp <= 0)
{
- this.Warning("璇烽�夋嫨瑕佸垹闄ょ殑鍙傛暟");
+ this.Warning(this.lang("HMI.NoDeleteData"));
return;
}
- if (MsgBoxHelper.WarnMessage(Window.GetWindow(this), $"纭畾瑕佸垹闄ら�変腑鐨刐{temp}]鏉″弬鏁板悧锛熻鎿嶄綔鏃犳硶鎾ら攢")
+ if (MsgBoxHelper.WarnMessage(Window.GetWindow(this), this.lang("HMI.MakeSureDeletes", temp))
== MessageBoxResult.OK)
{
Model.DeleteParameters();
Model.LoadParameters();
}
}
-
}
}
--
Gitblit v1.9.1