From fa30afb08c231f1507b89f0a0b81d1c552dcc97e Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 30 May 2025 09:32:16 +0800
Subject: [PATCH 01/12] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/BaseComponents/BootstrapBlazorRoot.razor        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/BaseComponents/BootstrapBlazorRoot.razor b/src/BootstrapBlazor/Components/BaseComponents/BootstrapBlazorRoot.razor
index 21f32a9b79e..2b95fa23cf2 100644
--- a/src/BootstrapBlazor/Components/BaseComponents/BootstrapBlazorRoot.razor
+++ b/src/BootstrapBlazor/Components/BaseComponents/BootstrapBlazorRoot.razor
@@ -2,7 +2,8 @@
 @namespace BootstrapBlazor.Components
 
 <CascadingValue Value="this" IsFixed="true">
-    <ErrorLogger EnableErrorLogger="_enableErrorLoggerValue" ShowToast="_showToast" ToastTitle="@ToastTitle" OnErrorHandleAsync="OnErrorHandleAsync!">
+    <ErrorLogger EnableErrorLogger="_enableErrorLoggerValue" ShowToast="_showToast" ToastTitle="@ToastTitle"
+                 OnErrorHandleAsync="OnErrorHandleAsync">
         @ChildContent
 
         <Dialog></Dialog>

From 945c9526e2a8354a9ba915bcdf39c1b44dafaede Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 30 May 2025 09:33:08 +0800
Subject: [PATCH 02/12] =?UTF-8?q?feat:=20Layout=20=E5=86=85=E7=BD=AE=20Err?=
 =?UTF-8?q?orLogger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Layout/Layout.razor            |  5 ++-
 .../Components/Layout/Layout.razor.cs         | 33 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor b/src/BootstrapBlazor/Components/Layout/Layout.razor
index 994cd0dc1a2..73a3ce5cf94 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor
@@ -126,7 +126,10 @@
         }
         else
         {
-            @HandlerMain()
+            <ErrorLogger EnableErrorLogger="@_enableErrorLoggerValue" ShowToast="@_showToast" ToastTitle="@ErrorLoggerToastTitle" 
+                         OnErrorHandleAsync="OnErrorHandleAsync">
+                @HandlerMain()
+            </ErrorLogger>
         }
     </main>;
 
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
index b0b09ba18ae..05e810df88f 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
 using System.Reflection;
 
 namespace BootstrapBlazor.Components;
@@ -452,12 +453,40 @@ public partial class Layout : IHandlerException, ITabHeader
     [Parameter]
     public object? Resource { get; set; }
 
+    /// <summary>
+    /// 获得/设置 是否开启全局异常捕获 默认 null 读取配置文件 EnableErrorLogger 值
+    /// </summary>
+    [Parameter]
+    public bool? EnableErrorLogger { get; set; }
+
+    /// <summary>
+    /// 获得/设置 是否显示 Error 提示弹窗 默认 null 使用 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 设置值
+    /// </summary>
+    [Parameter]
+    public bool? ShowErrorLoggerToast { get; set; }
+
+    /// <summary>
+    /// 获得/设置 错误日志 <see cref="Toast"/> 弹窗标题 默认 null
+    /// </summary>
+    [Parameter]
+    public string? ErrorLoggerToastTitle { get; set; }
+
+    /// <summary>
+    /// 获得/设置 自定义错误处理回调方法
+    /// </summary>
+    [Parameter]
+    public Func<ILogger, Exception, Task>? OnErrorHandleAsync { get; set; }
+
     /// <summary>
     /// 获得 登录授权信息
     /// </summary>
     [CascadingParameter]
     private Task<AuthenticationState>? AuthenticationStateTask { get; set; }
 
+    [Inject]
+    [NotNull]
+    private IOptionsMonitor<BootstrapBlazorOptions>? Options { get; set; }
+
     [Inject, NotNull]
     private IServiceProvider? ServiceProvider { get; set; }
 
@@ -470,6 +499,10 @@ public partial class Layout : IHandlerException, ITabHeader
 
     private ITabHeader? TabHeader => ShowTabInHeader ? this : null;
 
+    private bool _enableErrorLoggerValue => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
+
+    private bool _showToast => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>

From 041f6c27d1f45277917779ced2537728ac07a684 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 30 May 2025 09:42:55 +0800
Subject: [PATCH 03/12] =?UTF-8?q?Revert=20"feat:=20Layout=20=E5=86=85?=
 =?UTF-8?q?=E7=BD=AE=20ErrorLogger"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 945c9526e2a8354a9ba915bcdf39c1b44dafaede.
---
 .../Components/Layout/Layout.razor            |  5 +--
 .../Components/Layout/Layout.razor.cs         | 33 -------------------
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor b/src/BootstrapBlazor/Components/Layout/Layout.razor
index 73a3ce5cf94..994cd0dc1a2 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor
@@ -126,10 +126,7 @@
         }
         else
         {
-            <ErrorLogger EnableErrorLogger="@_enableErrorLoggerValue" ShowToast="@_showToast" ToastTitle="@ErrorLoggerToastTitle" 
-                         OnErrorHandleAsync="OnErrorHandleAsync">
-                @HandlerMain()
-            </ErrorLogger>
+            @HandlerMain()
         }
     </main>;
 
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
index 05e810df88f..b0b09ba18ae 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 using System.Reflection;
 
 namespace BootstrapBlazor.Components;
@@ -453,40 +452,12 @@ public partial class Layout : IHandlerException, ITabHeader
     [Parameter]
     public object? Resource { get; set; }
 
-    /// <summary>
-    /// 获得/设置 是否开启全局异常捕获 默认 null 读取配置文件 EnableErrorLogger 值
-    /// </summary>
-    [Parameter]
-    public bool? EnableErrorLogger { get; set; }
-
-    /// <summary>
-    /// 获得/设置 是否显示 Error 提示弹窗 默认 null 使用 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 设置值
-    /// </summary>
-    [Parameter]
-    public bool? ShowErrorLoggerToast { get; set; }
-
-    /// <summary>
-    /// 获得/设置 错误日志 <see cref="Toast"/> 弹窗标题 默认 null
-    /// </summary>
-    [Parameter]
-    public string? ErrorLoggerToastTitle { get; set; }
-
-    /// <summary>
-    /// 获得/设置 自定义错误处理回调方法
-    /// </summary>
-    [Parameter]
-    public Func<ILogger, Exception, Task>? OnErrorHandleAsync { get; set; }
-
     /// <summary>
     /// 获得 登录授权信息
     /// </summary>
     [CascadingParameter]
     private Task<AuthenticationState>? AuthenticationStateTask { get; set; }
 
-    [Inject]
-    [NotNull]
-    private IOptionsMonitor<BootstrapBlazorOptions>? Options { get; set; }
-
     [Inject, NotNull]
     private IServiceProvider? ServiceProvider { get; set; }
 
@@ -499,10 +470,6 @@ public partial class Layout : IHandlerException, ITabHeader
 
     private ITabHeader? TabHeader => ShowTabInHeader ? this : null;
 
-    private bool _enableErrorLoggerValue => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
-
-    private bool _showToast => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;
-
     /// <summary>
     /// <inheritdoc/>
     /// </summary>

From fd4464a482048ee2e57f992f93d83065ef994dbc Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 30 May 2025 10:38:15 +0800
Subject: [PATCH 04/12] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs b/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs
index 2a954f2c909..f93ca2fe45b 100644
--- a/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs
+++ b/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs
@@ -97,7 +97,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
     };
 
     /// <summary>
-    /// 由接口调用
+    /// 由实现 <see cref="BootstrapComponentBase"/> 组件实现类调用
     /// </summary>
     /// <param name="exception"></param>
     /// <returns></returns>

From 5afefb8a29a2e3aff6c5205c0f8dec35a95a9d9d Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 30 May 2025 10:38:35 +0800
Subject: [PATCH 05/12] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BootstrapBlazorErrorBoundary.cs           | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
index f84021837c2..f89dd4ff51b 100644
--- a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
+++ b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
@@ -68,19 +68,16 @@ protected override async Task OnErrorAsync(Exception exception)
     /// <param name="builder"></param>
     protected override void BuildRenderTree(RenderTreeBuilder builder)
     {
-#if DEBUG
-        // DEBUG 模式下显示异常堆栈信息到 UI 页面方便开发人员调试
-        if (OnErrorHandleAsync == null)
+        var ex = CurrentException ?? _exception;
+        if (ex != null)
         {
-            var ex = CurrentException ?? _exception;
-            if (ex != null)
-            {
-                _exception = null;
-                builder.AddContent(0, ExceptionContent(ex));
-            }
+            _exception = null;
+            builder.AddContent(0, ExceptionContent(ex));
+        }
+        else
+        {
+            builder.AddContent(1, ChildContent);
         }
-#endif
-        builder.AddContent(1, ChildContent);
     }
 
     private Exception? _exception = null;

From 81f9f6849c6e46d73477e7029a72a5f8b5581322 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 30 May 2025 10:38:48 +0800
Subject: [PATCH 06/12] =?UTF-8?q?Reapply=20"feat:=20Layout=20=E5=86=85?=
 =?UTF-8?q?=E7=BD=AE=20ErrorLogger"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 041f6c27d1f45277917779ced2537728ac07a684.
---
 .../Components/Layout/Layout.razor            |  5 ++-
 .../Components/Layout/Layout.razor.cs         | 33 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor b/src/BootstrapBlazor/Components/Layout/Layout.razor
index 994cd0dc1a2..73a3ce5cf94 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor
@@ -126,7 +126,10 @@
         }
         else
         {
-            @HandlerMain()
+            <ErrorLogger EnableErrorLogger="@_enableErrorLoggerValue" ShowToast="@_showToast" ToastTitle="@ErrorLoggerToastTitle" 
+                         OnErrorHandleAsync="OnErrorHandleAsync">
+                @HandlerMain()
+            </ErrorLogger>
         }
     </main>;
 
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
index b0b09ba18ae..05e810df88f 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
 using System.Reflection;
 
 namespace BootstrapBlazor.Components;
@@ -452,12 +453,40 @@ public partial class Layout : IHandlerException, ITabHeader
     [Parameter]
     public object? Resource { get; set; }
 
+    /// <summary>
+    /// 获得/设置 是否开启全局异常捕获 默认 null 读取配置文件 EnableErrorLogger 值
+    /// </summary>
+    [Parameter]
+    public bool? EnableErrorLogger { get; set; }
+
+    /// <summary>
+    /// 获得/设置 是否显示 Error 提示弹窗 默认 null 使用 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 设置值
+    /// </summary>
+    [Parameter]
+    public bool? ShowErrorLoggerToast { get; set; }
+
+    /// <summary>
+    /// 获得/设置 错误日志 <see cref="Toast"/> 弹窗标题 默认 null
+    /// </summary>
+    [Parameter]
+    public string? ErrorLoggerToastTitle { get; set; }
+
+    /// <summary>
+    /// 获得/设置 自定义错误处理回调方法
+    /// </summary>
+    [Parameter]
+    public Func<ILogger, Exception, Task>? OnErrorHandleAsync { get; set; }
+
     /// <summary>
     /// 获得 登录授权信息
     /// </summary>
     [CascadingParameter]
     private Task<AuthenticationState>? AuthenticationStateTask { get; set; }
 
+    [Inject]
+    [NotNull]
+    private IOptionsMonitor<BootstrapBlazorOptions>? Options { get; set; }
+
     [Inject, NotNull]
     private IServiceProvider? ServiceProvider { get; set; }
 
@@ -470,6 +499,10 @@ public partial class Layout : IHandlerException, ITabHeader
 
     private ITabHeader? TabHeader => ShowTabInHeader ? this : null;
 
+    private bool _enableErrorLoggerValue => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
+
+    private bool _showToast => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>

From e0ca487dece42b3bf11fbd8498c32b1f1354efc6 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 30 May 2025 10:48:25 +0800
Subject: [PATCH 07/12] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=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/Components/LayoutTest.cs | 37 +++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/test/UnitTest/Components/LayoutTest.cs b/test/UnitTest/Components/LayoutTest.cs
index 6a047aa861a..ed87fb225a9 100644
--- a/test/UnitTest/Components/LayoutTest.cs
+++ b/test/UnitTest/Components/LayoutTest.cs
@@ -528,13 +528,14 @@ public async Task OnUpdateAsync_Ok()
     }
 
     [Fact]
-    public void HandlerException_Ok()
+    public void IHandlerException_Ok()
     {
         var cut = Context.RenderComponent<BootstrapBlazorRoot>(pb =>
         {
             pb.Add(a => a.EnableErrorLogger, true);
             pb.AddChildContent<Layout>(pb =>
             {
+                // 按钮触发异常
                 pb.Add(a => a.Main, new RenderFragment(builder =>
                 {
                     builder.OpenComponent<Button>(0);
@@ -552,9 +553,31 @@ public void HandlerException_Ok()
         var button = cut.Find("button");
         cut.InvokeAsync(() => button.Click());
         cut.Contains("<div class=\"error-stack\">");
+        cut.Contains("class=\"layout\"");
         Context.DisposeComponents();
     }
 
+    [Fact]
+    public void ErrorLogger_LifeCycle()
+    {
+        var cut = Context.RenderComponent<BootstrapBlazorRoot>(pb =>
+        {
+            pb.Add(a => a.EnableErrorLogger, true);
+            pb.AddChildContent<Layout>(pb =>
+            {
+                pb.Add(a => a.UseTabSet, false);
+                // 按钮触发异常
+                pb.Add(a => a.Main, new RenderFragment(builder =>
+                {
+                    builder.OpenComponent<MockPage>(0);
+                    builder.CloseComponent();
+                }));
+            });
+        });
+        cut.Contains("<div class=\"error-stack\">");
+        cut.Contains("class=\"layout\"");
+    }
+
     [Fact]
     public void CollapseBarTemplate_Ok()
     {
@@ -600,3 +623,15 @@ public void Authorized_Ok()
         Context.DisposeComponents();
     }
 }
+
+class MockPage : ComponentBase
+{
+    protected override void OnInitialized()
+    {
+        var a = 1;
+        var b = 0;
+
+        // 触发生命周期内异常
+        var c = a / b; 
+    }
+}

From 9b987324c098372856bd48bb060e082d91857290 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 30 May 2025 11:16:38 +0800
Subject: [PATCH 08/12] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=94=9F=E5=91=BD=E5=91=A8=E6=9C=9F=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BC=82=E5=B8=B8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ErrorLogger/BootstrapBlazorErrorBoundary.cs      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
index f89dd4ff51b..b996f0dffc5 100644
--- a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
+++ b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using System;
 
 namespace BootstrapBlazor.Components;
 
@@ -72,10 +73,21 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
         if (ex != null)
         {
             _exception = null;
+
+            // 处理自定义异常逻辑
+            if(OnErrorHandleAsync != null)
+            {
+                // 页面生命周期内异常直接调用这里
+                _ = OnErrorHandleAsync(Logger, ex);
+                return;
+            }
+
+            // 渲染异常内容
             builder.AddContent(0, ExceptionContent(ex));
         }
         else
         {
+            // 渲染正常内容
             builder.AddContent(1, ChildContent);
         }
     }

From 26e8fd23796856788af1b02f41b5386f29de874a Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 30 May 2025 11:38:09 +0800
Subject: [PATCH 09/12] =?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/Components/ErrorHandlerTest.cs |  2 +
 test/UnitTest/Components/LayoutTest.cs       | 77 ++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/test/UnitTest/Components/ErrorHandlerTest.cs b/test/UnitTest/Components/ErrorHandlerTest.cs
index d604b06e228..84feb0c172c 100644
--- a/test/UnitTest/Components/ErrorHandlerTest.cs
+++ b/test/UnitTest/Components/ErrorHandlerTest.cs
@@ -37,6 +37,8 @@ public async Task ShowToast_Ok()
     {
         var cut = Context.RenderComponent<BootstrapBlazorRoot>(pb =>
         {
+            pb.Add(a => a.EnableErrorLogger, true);
+            pb.Add(a => a.ShowToast, true);
             pb.AddChildContent<ErrorComponent>();
         });
         var errorButton = cut.Find(".btn-error");
diff --git a/test/UnitTest/Components/LayoutTest.cs b/test/UnitTest/Components/LayoutTest.cs
index ed87fb225a9..fa8c89418d0 100644
--- a/test/UnitTest/Components/LayoutTest.cs
+++ b/test/UnitTest/Components/LayoutTest.cs
@@ -566,6 +566,9 @@ public void ErrorLogger_LifeCycle()
             pb.AddChildContent<Layout>(pb =>
             {
                 pb.Add(a => a.UseTabSet, false);
+                pb.Add(a => a.EnableErrorLogger, true);
+                pb.Add(a => a.ShowErrorLoggerToast, false);
+                pb.Add(a => a.ErrorLoggerToastTitle, "Title");
                 // 按钮触发异常
                 pb.Add(a => a.Main, new RenderFragment(builder =>
                 {
@@ -578,6 +581,80 @@ public void ErrorLogger_LifeCycle()
         cut.Contains("class=\"layout\"");
     }
 
+    [Fact]
+    public void ErrorLogger_OnErrorHandleAsync_Page()
+    {
+        // 页面生命周期内报错调用自定义处理方法
+        Exception? ex1 = null;
+        var cut = Context.RenderComponent<BootstrapBlazorRoot>(pb =>
+        {
+            pb.Add(a => a.EnableErrorLogger, true);
+            pb.AddChildContent<Layout>(pb =>
+            {
+                pb.Add(a => a.UseTabSet, false);
+                pb.Add(a => a.OnErrorHandleAsync, (logger, ex) =>
+                {
+                    ex1 = ex;
+                    return Task.CompletedTask;
+                });
+                // 按钮触发异常
+                pb.Add(a => a.Main, new RenderFragment(builder =>
+                {
+                    builder.OpenComponent<MockPage>(0);
+                    builder.CloseComponent();
+                }));
+            });
+        });
+        Assert.NotNull(ex1);
+    }
+
+    [Fact]
+    public void ErrorLogger_OnErrorHandleAsync_Button()
+    {
+        // 页面生命周期内报错调用自定义处理方法
+        Exception? ex1 = null;
+        var cut = Context.RenderComponent<BootstrapBlazorRoot>(pb =>
+        {
+            pb.Add(a => a.EnableErrorLogger, true);
+            pb.AddChildContent<Layout>(pb =>
+            {
+                pb.Add(a => a.OnErrorHandleAsync, (logger, ex) =>
+                {
+                    ex1 = ex;
+                    return Task.CompletedTask;
+                });
+                // 按钮触发异常
+                pb.Add(a => a.Main, new RenderFragment(builder =>
+                {
+                    builder.OpenComponent<Button>(0);
+                    builder.AddAttribute(1, nameof(Button.OnClick), EventCallback.Factory.Create<MouseEventArgs>(this, e =>
+                    {
+                        var a = 1;
+                        var b = 0;
+                        var c = a / b;
+                        return Task.CompletedTask;
+                    }));
+                    builder.CloseComponent();
+                }));
+            });
+        });
+        var button = cut.Find("button");
+        cut.InvokeAsync(() => button.Click());
+        Assert.NotNull(ex1);
+
+        // 移除自定义逻辑使用内部异常处理逻辑
+        var layout = cut.FindComponent<Layout>();
+        layout.SetParametersAndRender(pb =>
+        {
+           pb.Add(a => a.OnErrorHandleAsync, null);
+        });
+        button = cut.Find("button");
+
+        ex1 = null;
+        cut.InvokeAsync(() => button.Click());
+        Assert.Null(ex1);
+    }
+
     [Fact]
     public void CollapseBarTemplate_Ok()
     {

From e4fdfb7adc2ee0dac402d2f3fefaed73f503f7fd Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 30 May 2025 11:52:27 +0800
Subject: [PATCH 10/12] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=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

---
 .../Components/ErrorLogger/ErrorLogger.cs     | 20 +++++++++++++++++++
 .../Components/Layout/Layout.razor            |  2 +-
 .../Components/Layout/Layout.razor.cs         | 10 ++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs b/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs
index f93ca2fe45b..b6b195dd3fe 100644
--- a/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs
+++ b/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs
@@ -56,6 +56,12 @@ public class ErrorLogger : ComponentBase, IErrorLogger
     [Parameter]
     public RenderFragment<Exception>? ErrorContent { get; set; }
 
+    /// <summary>
+    /// Gets or sets the callback function to be invoked during initialization.
+    /// </summary>
+    [Parameter]
+    public Func<ErrorLogger, Task>? OnInitializedCallback { get; set; }
+
     [NotNull]
     private BootstrapBlazorErrorBoundary? _errorBoundary = default;
 
@@ -69,6 +75,20 @@ protected override void OnInitialized()
         ToastTitle ??= Localizer[nameof(ToastTitle)];
     }
 
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    /// <returns></returns>
+    protected override async Task OnInitializedAsync()
+    {
+        await base.OnInitializedAsync();
+
+        if (OnInitializedCallback is not null)
+        {
+            await OnInitializedCallback(this);
+        }
+    }
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor b/src/BootstrapBlazor/Components/Layout/Layout.razor
index 73a3ce5cf94..a7e689ea1cf 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor
@@ -127,7 +127,7 @@
         else
         {
             <ErrorLogger EnableErrorLogger="@_enableErrorLoggerValue" ShowToast="@_showToast" ToastTitle="@ErrorLoggerToastTitle" 
-                         OnErrorHandleAsync="OnErrorHandleAsync">
+                         OnErrorHandleAsync="OnErrorHandleAsync" OnInitializedCallback="OnErrorLoggerInitialized">
                 @HandlerMain()
             </ErrorLogger>
         }
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
index 05e810df88f..191a13a232f 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
@@ -658,6 +658,15 @@ private async Task ToggleSidebar()
         await TriggerCollapseChanged();
     }
 
+    private ErrorLogger? _errorLogger;
+
+    private Task OnErrorLoggerInitialized(ErrorLogger logger)
+    {
+        _errorLogger = logger;
+        _errorLogger.Register(this);
+        return Task.CompletedTask;
+    }
+
     /// <summary>
     /// 上次渲染错误内容
     /// </summary>
@@ -711,6 +720,7 @@ protected override async ValueTask DisposeAsync(bool disposing)
 
         if (disposing)
         {
+            _errorLogger?.UnRegister(this);
             ErrorLogger?.UnRegister(this);
             if (SubscribedLocationChangedEvent)
             {

From db14e17f7ccd42dd9b216a368fbe72b10bd5ce07 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 30 May 2025 11:56:20 +0800
Subject: [PATCH 11/12] =?UTF-8?q?test:=20=E7=A7=BB=E9=99=A4=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/Components/ErrorHandlerTest.cs | 27 --------------------
 1 file changed, 27 deletions(-)

diff --git a/test/UnitTest/Components/ErrorHandlerTest.cs b/test/UnitTest/Components/ErrorHandlerTest.cs
index 84feb0c172c..c031c1ccac9 100644
--- a/test/UnitTest/Components/ErrorHandlerTest.cs
+++ b/test/UnitTest/Components/ErrorHandlerTest.cs
@@ -32,33 +32,6 @@ await cut.InvokeAsync(() => dialog.Show(new DialogOption()
         await cut.InvokeAsync(() => btn.Click());
     }
 
-    [Fact]
-    public async Task ShowToast_Ok()
-    {
-        var cut = Context.RenderComponent<BootstrapBlazorRoot>(pb =>
-        {
-            pb.Add(a => a.EnableErrorLogger, true);
-            pb.Add(a => a.ShowToast, true);
-            pb.AddChildContent<ErrorComponent>();
-        });
-        var errorButton = cut.Find(".btn-error");
-        await cut.InvokeAsync(() => errorButton.Click());
-        cut.Contains("<div class=\"toast-body\">test error logger</div>");
-
-        // 关闭 Toast
-        var toast = cut.FindComponent<Toast>().Instance;
-        await cut.InvokeAsync(() => toast.Close());
-        cut.DoesNotContain("<div class=\"toast-body\">test error logger</div>");
-
-        cut.SetParametersAndRender(pb =>
-        {
-            pb.Add(a => a.ShowToast, false);
-        });
-        errorButton = cut.Find(".btn-error");
-        await cut.InvokeAsync(() => errorButton.Click());
-        cut.DoesNotContain("<div class=\"toast-body\">test error logger</div>");
-    }
-
     private class MockDialogTest : ComponentBase
     {
         [Inject]

From 53bc77f24b81c0a38b6c65d8410ef45cffdac635 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 30 May 2025 11:57:58 +0800
Subject: [PATCH 12/12] =?UTF-8?q?doc:=20=E7=A7=BB=E9=99=A4=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E7=A9=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs      | 1 -
 src/BootstrapBlazor/Components/Filters/FilterContext.cs         | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
index b996f0dffc5..f9b13ed90b5 100644
--- a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
+++ b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using System;
 
 namespace BootstrapBlazor.Components;
 
diff --git a/src/BootstrapBlazor/Components/Filters/FilterContext.cs b/src/BootstrapBlazor/Components/Filters/FilterContext.cs
index 2ae9e7d8f08..eabbe7dba27 100644
--- a/src/BootstrapBlazor/Components/Filters/FilterContext.cs
+++ b/src/BootstrapBlazor/Components/Filters/FilterContext.cs
@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
-using System.Runtime.CompilerServices;
-
 namespace BootstrapBlazor.Components;
 
 /// <summary>