完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject

alielie

2025-03-11 2e54b439c64e0adbb7e010243c1f33aa5fc5f503

 HMI.UI/Util/MsgBoxHelper.cs

@@ -1,7 +1,6 @@
using Panuon.WPF.UI;
using System.Windows;
using Panuon.WPF.UI.Configurations;
using System.Windows.Threading;

namespace HMI.UI.Util
{
@@ -65,17 +64,13 @@
            DefaultButton defaultButton, MessageBoxXSetting setting, int? countdown)
        {
            MessageBoxResult res = MessageBoxResult.None;
            Application.Current.Dispatcher.Invoke(() =>
            if (!(owner is Window window))
            {
                if (owner is Window window)
                {
                    res = MessageBoxX.Show(window, message, caption, button, icon, defaultButton, setting, countdown);
                }
                else
                {
                    window = Window.GetWindow(owner);
                    res = MessageBoxX.Show(window, message, caption, button, icon, defaultButton, setting, countdown);
                }
                window = Window.GetWindow(owner);
            }
            window.Dispatcher.Invoke(() =>
            {
                res = MessageBoxX.Show(window, message, caption, button, icon, defaultButton, setting, countdown);
            });
            return res;
        }