From dedcf4174c8540ee3a912daad2ff13e014e495b1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 28 三月 2025 16:28:30 +0800
Subject: [PATCH] 优化UI组件；
---
HMI.UI/Util/ToastHelper.cs | 100 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 6 deletions(-)
diff --git a/HMI.UI/Util/ToastHelper.cs b/HMI.UI/Util/ToastHelper.cs
index 6410963..90a409b 100644
--- a/HMI.UI/Util/ToastHelper.cs
+++ b/HMI.UI/Util/ToastHelper.cs
@@ -1,4 +1,6 @@
-锘縰sing Panuon.WPF.UI;
+锘縰sing HMI.Core.Util;
+using Panuon.WPF.UI;
+using System.Runtime.CompilerServices;
using System.Windows;
using System.Windows.Controls;
@@ -40,39 +42,122 @@
if (Instance == null) { Instance = helper; }
}
- public static void Success(Window window,
+ public static void Success(string message,
+ MessageBoxIcon icon = MessageBoxIcon.Success,
+ ToastPosition position = ToastPosition.Top, double offset = 0, int durationMs = 3000,
+ ToastWindow targetWindow = ToastWindow.ActiveWindow)
+ {
+ var window = Application.Current.MainWindow;
+ if (window is WindowX)
+ {
+ Instance.Success(window, message, icon, position, offset, durationMs, targetWindow);
+ }
+ else
+ {
+ MessageBox.Show(message, LangUtil.Get("App.Success"));
+ }
+ }
+
+ public static void Warning(string message,
+ MessageBoxIcon icon = MessageBoxIcon.Warning,
+ ToastPosition position = ToastPosition.Top, double offset = 0, int durationMs = 3000,
+ ToastWindow targetWindow = ToastWindow.ActiveWindow)
+ {
+ var window = Application.Current.MainWindow;
+ if (window is WindowX)
+ {
+ Instance.Warning(window, message, icon, position, offset, durationMs, targetWindow);
+ }
+ else
+ {
+ MessageBox.Show(message, LangUtil.Get("App.Warn"));
+ }
+ }
+
+ public static void Error(string message,
+ MessageBoxIcon icon = MessageBoxIcon.Error,
+ ToastPosition position = ToastPosition.Top, double offset = 0, int durationMs = 3000,
+ ToastWindow targetWindow = ToastWindow.ActiveWindow)
+ {
+ var window = Application.Current.MainWindow;
+ if (window is WindowX)
+ {
+
+ Instance.Error(window, message, icon, position, offset, durationMs, targetWindow);
+ }
+ else
+ {
+ MessageBox.Show(message, LangUtil.Get("App.Error"));
+ }
+ }
+
+ public static void Info(string message,
+ MessageBoxIcon icon = MessageBoxIcon.Info,
+ ToastPosition position = ToastPosition.Top, double offset = 0, int durationMs = 3000,
+ ToastWindow targetWindow = ToastWindow.ActiveWindow)
+ {
+ var window = Application.Current.MainWindow;
+ if (window is WindowX)
+ {
+
+ Instance.Info(window, message, icon, position, offset, durationMs, targetWindow);
+ }
+ else
+ {
+ MessageBox.Show(message, LangUtil.Get("App.Info"));
+ }
+ }
+
+
+ public static void Success(DependencyObject dp,
string message,
MessageBoxIcon icon = MessageBoxIcon.Success,
ToastPosition position = ToastPosition.Top, double offset = 0, int durationMs = 3000,
ToastWindow targetWindow = ToastWindow.ActiveWindow)
{
+ if (!(dp is Window window))
+ {
+ window = Window.GetWindow(dp);
+ }
Instance.Success(window, message, icon, position, offset, durationMs, targetWindow);
}
- public static void Warning(Window window,
+ public static void Warning(DependencyObject dp,
string message,
MessageBoxIcon icon = MessageBoxIcon.Warning,
ToastPosition position = ToastPosition.Top, double offset = 0, int durationMs = 3000,
ToastWindow targetWindow = ToastWindow.ActiveWindow)
{
+ if (!(dp is Window window))
+ {
+ window = Window.GetWindow(dp);
+ }
Instance.Warning(window, message, icon, position, offset, durationMs, targetWindow);
}
- public static void Error(Window window,
+ public static void Error(DependencyObject dp,
string message,
MessageBoxIcon icon = MessageBoxIcon.Error,
ToastPosition position = ToastPosition.Top, double offset = 0, int durationMs = 3000,
ToastWindow targetWindow = ToastWindow.ActiveWindow)
{
+ if (!(dp is Window window))
+ {
+ window = Window.GetWindow(dp);
+ }
Instance.Error(window, message, icon, position, offset, durationMs, targetWindow);
}
- public static void Info(Window window,
+ public static void Info(DependencyObject dp,
string message,
MessageBoxIcon icon = MessageBoxIcon.Info,
ToastPosition position = ToastPosition.Top, double offset = 0, int durationMs = 3000,
ToastWindow targetWindow = ToastWindow.ActiveWindow)
{
+ if (!(dp is Window window))
+ {
+ window = Window.GetWindow(dp);
+ }
Instance.Info(window, message, icon, position, offset, durationMs, targetWindow);
}
}
@@ -141,7 +226,10 @@
ToastPosition position = ToastPosition.Top, double offset = 0, int durationMs = 3000,
ToastWindow targetWindow = ToastWindow.ActiveWindow)
{
- ToastHelper.Error(Window.GetWindow(control), message, icon, position, offset, durationMs, targetWindow);
+ Application.Current.Dispatcher.Invoke(() =>
+ {
+ ToastHelper.Error(Window.GetWindow(control), message, icon, position, offset, durationMs, targetWindow);
+ });
}
public static void Info(this UserControl control,
--
Gitblit v1.9.1