diff --git a/src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Views/Windows/AvaloniaWindowManagerImpl.cs b/src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Views/Windows/AvaloniaWindowManagerImpl.cs index 3984fd9f77e..cebe4a90005 100644 --- a/src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Views/Windows/AvaloniaWindowManagerImpl.cs +++ b/src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Views/Windows/AvaloniaWindowManagerImpl.cs @@ -111,6 +111,12 @@ public async Task ShowTaskDialogAsync( XamlRoot = GetWindowTopLevel(), }; + if (td.XamlRoot == null) + { + Toast.LogAndShowT(new Exception("在 AppWindow 为 Null 时,无法弹出 Taskdialog.")); + return false; + } + if (viewModel != null) { if (viewModel is IWindowViewModel window) diff --git a/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/Button.axaml b/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/Button.axaml index 06c79996143..1057b0f73a6 100644 --- a/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/Button.axaml +++ b/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/Button.axaml @@ -9,6 +9,11 @@