From 75d4f366ebb1a44c9e62bdc63bda6b258d10890f Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 9 May 2025 14:35:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=20OnErrorHan?= =?UTF-8?q?dleAsync=20=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/ErrorLogger/ErrorLogger.cs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs b/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs index 2a954f2c909..52c85cf21a5 100644 --- a/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs +++ b/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs @@ -18,6 +18,10 @@ public class ErrorLogger : ComponentBase, IErrorLogger [NotNull] private IStringLocalizer? Localizer { get; set; } + [Inject] + [NotNull] + private ILogger? Logger { get; set; } + /// /// /// @@ -101,7 +105,17 @@ protected override void BuildRenderTree(RenderTreeBuilder builder) /// /// /// - public Task HandlerExceptionAsync(Exception exception) => _errorBoundary.RenderException(exception, _cache.LastOrDefault()); + public async Task HandlerExceptionAsync(Exception exception) + { + if (OnErrorHandleAsync != null) + { + await OnErrorHandleAsync(Logger, exception); + } + else + { + await _errorBoundary.RenderException(exception, _cache.LastOrDefault()); + } + } private readonly List _cache = []; From 839abdac1d06ae503d1a29d2994081aca4f31159 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 9 May 2025 14:38:54 +0800 Subject: [PATCH 2/6] chore: bump version 9.6.2-beta01 Co-Authored-By: Jayce Liu <129018443+kaishao628@users.noreply.github.com> --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 18b67acd46e..ee2fdce1f9c 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.6.1 + 9.6.2-beta01 From 97d863c8169d8c82d1d55a44c74814217e26f459 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 9 May 2025 14:40:54 +0800 Subject: [PATCH 3/6] =?UTF-8?q?Revert=20"refactor:=20=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?OnErrorHandleAsync=20=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 75d4f366ebb1a44c9e62bdc63bda6b258d10890f. --- .../Components/ErrorLogger/ErrorLogger.cs | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs b/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs index 52c85cf21a5..2a954f2c909 100644 --- a/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs +++ b/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs @@ -18,10 +18,6 @@ public class ErrorLogger : ComponentBase, IErrorLogger [NotNull] private IStringLocalizer? Localizer { get; set; } - [Inject] - [NotNull] - private ILogger? Logger { get; set; } - /// /// /// @@ -105,17 +101,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder) /// /// /// - public async Task HandlerExceptionAsync(Exception exception) - { - if (OnErrorHandleAsync != null) - { - await OnErrorHandleAsync(Logger, exception); - } - else - { - await _errorBoundary.RenderException(exception, _cache.LastOrDefault()); - } - } + public Task HandlerExceptionAsync(Exception exception) => _errorBoundary.RenderException(exception, _cache.LastOrDefault()); private readonly List _cache = []; From e39af563def31cf917e4f90576e1cad000ed4893 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 9 May 2025 14:44:23 +0800 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=85=88=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs index 40071f3316f..317fad127e0 100644 --- a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs +++ b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs @@ -124,6 +124,13 @@ private MarkupString GetErrorContentMarkupString(Exception ex) /// public async Task RenderException(Exception exception, IHandlerException? handler) { + // 外部调用 + if (OnErrorHandleAsync != null) + { + await OnErrorHandleAsync(Logger, exception); + return; + } + if (handler != null) { await handler.HandlerException(exception, ExceptionContent); From 6f5baca9f30fe9b61c177447a65cc094dd43f18c Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 9 May 2025 14:51:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Services/FullScreenServiceTest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/UnitTest/Services/FullScreenServiceTest.cs b/test/UnitTest/Services/FullScreenServiceTest.cs index 1068c8aab8b..fe7d91c216e 100644 --- a/test/UnitTest/Services/FullScreenServiceTest.cs +++ b/test/UnitTest/Services/FullScreenServiceTest.cs @@ -17,6 +17,7 @@ public async Task ButtonIcon_Ok() { builder.Add(s => s.Icon, "fa-solid fa-maximize"); builder.Add(s => s.Text, "button-text"); + builder.Add(s => s.TargetId, "fsId"); }); cut.Contains("bb-fs-off"); cut.Contains("bb-fs-on"); From ce0f241689df0dc4a25e9b89a823e29be88d2647 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 9 May 2025 14:58:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ErrorLogger/BootstrapBlazorErrorBoundary.cs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs index 317fad127e0..f3e5beaacf0 100644 --- a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs +++ b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs @@ -53,17 +53,8 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase /// /// /// - /// - /// protected override async Task OnErrorAsync(Exception exception) { - // 由框架调用 - if (OnErrorHandleAsync != null) - { - await OnErrorHandleAsync(Logger, exception); - return; - } - if (ShowToast) { await ToastService.Error(ToastTitle, exception.Message);