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.UI/Util/MsgBoxHelper.cs | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/HMI.UI/Util/MsgBoxHelper.cs b/HMI.UI/Util/MsgBoxHelper.cs
index 047e96a..2c81478 100644
--- a/HMI.UI/Util/MsgBoxHelper.cs
+++ b/HMI.UI/Util/MsgBoxHelper.cs
@@ -1,19 +1,22 @@
锘縰sing Panuon.WPF.UI;
using System.Windows;
using Panuon.WPF.UI.Configurations;
+using HMI.Core.Util;
+using System;
namespace HMI.UI.Util
{
public class MsgBoxHelper
{
#region Warn
- public static MessageBoxResult WarnMessage(Window owner,
+ public static MessageBoxResult WarnMessage(DependencyObject owner,
string message,
- string caption = "璀﹀憡",
+ string caption = null,
MessageBoxButton button = MessageBoxButton.OKCancel,
MessageBoxIcon icon = MessageBoxIcon.Warning,
DefaultButton defaultButton = DefaultButton.Unset, int? countdown = null)
{
+ caption = caption ?? LangUtil.Get("App.Warn");
var setting = Application.Current.FindResource("MsgBoxWarn") as MessageBoxXSetting;
return ShowMessage(owner, message, caption, button, icon, defaultButton, setting, countdown);
}
@@ -22,35 +25,38 @@
#region Error
public static MessageBoxResult ErrorMessage(DependencyObject owner,
string message,
- string caption = "閿欒",
+ string caption = null,
MessageBoxButton button = MessageBoxButton.OKCancel,
MessageBoxIcon icon = MessageBoxIcon.Error,
DefaultButton defaultButton = DefaultButton.Unset, int? countdown = null)
{
+ caption = caption ?? LangUtil.Get("App.Error");
var setting = Application.Current.FindResource("MsgBoxError") as MessageBoxXSetting;
return ShowMessage(owner, message, caption, button, icon, defaultButton, setting, countdown);
}
public static MessageBoxResult Error(DependencyObject owner,
string message,
- string caption = "閿欒",
+ string caption = null,
MessageBoxButton button = MessageBoxButton.OK,
MessageBoxIcon icon = MessageBoxIcon.Error,
DefaultButton defaultButton = DefaultButton.Unset, int? countdown = null)
{
+ caption = caption ?? LangUtil.Get("App.Error");
var setting = Application.Current.FindResource("MsgBoxError") as MessageBoxXSetting;
return ShowMessage(owner, message, caption, button, icon, defaultButton, setting, countdown);
}
#endregion
#region Info
- public static MessageBoxResult InfoMessage(Window owner,
+ public static MessageBoxResult InfoMessage(DependencyObject owner,
string message,
- string caption = "鎻愮ず",
+ string caption = null,
MessageBoxButton button = MessageBoxButton.OKCancel,
MessageBoxIcon icon = MessageBoxIcon.Info,
DefaultButton defaultButton = DefaultButton.Unset, int? countdown = null)
{
+ caption = caption ?? LangUtil.Get("App.Info");
var setting = Application.Current.FindResource("MsgBoxInfo") as MessageBoxXSetting;
return ShowMessage(owner, message, caption, button, icon, defaultButton, setting, countdown);
}
@@ -66,12 +72,22 @@
MessageBoxResult res = MessageBoxResult.None;
if (!(owner is Window window))
{
- window = Window.GetWindow(owner);
+ owner.Dispatcher.Invoke(() =>
+ {
+ window = Window.GetWindow(owner) ?? Application.Current.MainWindow;
+ window.Dispatcher.Invoke(() =>
+ {
+ res = MessageBoxX.Show(window, message, caption, button, icon, defaultButton, setting, countdown);
+ });
+ });
}
- window.Dispatcher.Invoke(() =>
+ else
{
- res = MessageBoxX.Show(window, message, caption, button, icon, defaultButton, setting, countdown);
- });
+ window.Dispatcher.Invoke(() =>
+ {
+ res = MessageBoxX.Show(window, message, caption, button, icon, defaultButton, setting, countdown);
+ });
+ }
return res;
}
}
--
Gitblit v1.9.1