diff --git a/src/BootstrapBlazor.Server/Components/Samples/GlobalException.razor b/src/BootstrapBlazor.Server/Components/Samples/GlobalException.razor
index 457e011676e..725bddd14da 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/GlobalException.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/GlobalException.razor
@@ -57,12 +57,16 @@
     "DetailedErrors": true
 }</Pre>
 
-<DemoBlock Title="@Localizer["Block1Title"]" Introduction="@Localizer["Block1Intro"]" Name="Normal">
+<DemoBlock Title="@Localizer["NormalTitle"]" Introduction="@Localizer["NormalIntro"]" Name="Normal">
     <section ignore>@((MarkupString)Localizer["ExceptionTestIntroduce"].Value)</section>
-    <Button Icon="fa-solid fa-font-awesome" Text="@Localizer["ButtonText"]" OnClick="OnClick" />
+    <Button Icon="fa-solid fa-font-awesome" Text="@Localizer["Button1Text"]" OnClick="OnClick" />
+    <button class="btn btn-primary" @onclick="OnClick">
+        <i class="fa-solid fa-font-awesome"></i>
+        <span>@Localizer["Button2Text"]</span>
+    </button>
 </DemoBlock>
 
-<DemoBlock Title="@Localizer["Block2Title"]" Introduction="@Localizer["Block2Intro"]" Name="Swal">
+<DemoBlock Title="@Localizer["OnErrorHandleTitle"]" Introduction="@Localizer["OnErrorHandleIntro"]" Name="Swal">
     <ErrorLogger OnErrorHandleAsync="OnErrorHandleAsync">
         <Button Icon="fa-solid fa-font-awesome" Text="@Localizer["ButtonText"]" OnClick="OnClick" />
     </ErrorLogger>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/GlobalException.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/GlobalException.razor.cs
index 6f5914f660d..b86fdc66a7b 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/GlobalException.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/GlobalException.razor.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
index e60901ea17f..4191e75d328 100644
--- a/src/BootstrapBlazor.Server/Locales/en-US.json
+++ b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -20,8 +20,8 @@
     "Type": "Type"
   },
   "BootstrapBlazor.Server.Components.Components.AttributeTable": {
-    "Obsolete": "Obsolete",
     "AutoGenerateColumns": "Automatically generated",
+    "Obsolete": "Obsolete",
     "Total": "Total"
   },
   "BootstrapBlazor.Server.Components.Components.CultureChooser": {
@@ -2407,17 +2407,19 @@
     "WatchPositionResultSuccess": "Call WatchPosition success"
   },
   "BootstrapBlazor.Server.Components.Samples.GlobalException": {
-    "Block1Intro": "This function is to obtain the component instance through the cascade parameter and use its function",
-    "Block1Title": "Test",
-    "Block2Intro": "Set custom exception handling logic by setting <code>OnErrorHandleAsync</code> callback method",
-    "Block2Title": "OnErrorHandleAsync",
-    "ButtonText": "test",
+    "Button1Text": "Test(Component)",
+    "Button2Text": "Test(HtmlElement)",
+    "ButtonText": "Test",
     "DialogIntro": "Click the button to pop up a pop-up window. The button in the pop-up window triggers an exception and the error is displayed in the pop-up window",
     "DialogText": "Popup",
     "DialogTitle": "In Dialog",
     "ExceptionTestIntroduce": "In this example code, an error code that divides by zero is written. Because <code>try/catch</code> is used to capture the exception, the error message is displayed in the console below",
     "H1": "Instructions",
     "Introduce": "Added component <code>ErrorLogger</code> Through this component, global logs and exceptions can be output uniformly; currently, the <code>Blazor</code> framework does not provide a <code>MVC</code> like <b>Global exception</b> The overall solution",
+    "NormalIntro": "This function is to obtain the component instance through the cascade parameter and use its function",
+    "NormalTitle": "Test",
+    "OnErrorHandleIntro": "By setting the <code>OnErrorHandleAsync</code> parameter of <code>ErrorLogger</code>, you can customize the use of the <code>Swal</code> pop-up to display exception information.",
+    "OnErrorHandleTitle": "OnErrorHandleAsync",
     "PageErrorIntro": "Click the button to navigate to the page where the error occurred during the page life cycle. The error is displayed on the current page and does not affect the menu and the overall page layout.",
     "PageErrorTitle": "Page",
     "Step1": "1. Add <code>AddLogging</code> to the <code>Startup</code> file to enable the <code>net core</code> system log function",
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
index 2e8a842f0b2..bcc9036b00e 100644
--- a/src/BootstrapBlazor.Server/Locales/zh-CN.json
+++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -20,8 +20,8 @@
     "Type": "类型"
   },
   "BootstrapBlazor.Server.Components.Components.AttributeTable": {
-    "Obsolete": "已弃用",
     "AutoGenerateColumns": "自动生成",
+    "Obsolete": "已弃用",
     "Total": "合计"
   },
   "BootstrapBlazor.Server.Components.Components.CultureChooser": {
@@ -2407,10 +2407,8 @@
     "WatchPositionResultSuccess": "调用 WatchPosition 成功"
   },
   "BootstrapBlazor.Server.Components.Samples.GlobalException": {
-    "Block1Intro": "本功能是通过代码产生异常信息，由全局捕获组件统一处理",
-    "Block1Title": "测试",
-    "Block2Intro": "通过设置 <code>OnErrorHandleAsync</code> 回调方法，设置自定义异常处理逻辑",
-    "Block2Title": "自定义错误处理",
+    "Button1Text": "测试(组件)",
+    "Button2Text": "测试(原生)",
     "ButtonText": "测试",
     "DialogIntro": "点击按钮弹出弹窗，弹窗内按钮触发异常，错误显示在弹窗内",
     "DialogText": "弹窗",
@@ -2418,6 +2416,10 @@
     "ExceptionTestIntroduce": "本例代码中写了一个除以零的错误代码，并且未使用 <code>try/catch</code> 对异常进行捕获，系统并不会崩溃导致不可用，<ul class='ul-demo'><li><code>Debug</code> 模式下会显示错误的 <b>描述信息</b> 与 <b>堆栈信息</b></li><li><code>Release</code> 模式下默认使用 <code>Toast</code> 进行弹窗提示</li></ul>",
     "H1": "使用方法",
     "Introduce": "<p>增加组件 <code>ErrorLogger</code> 通过本组件可以对全局的日志、异常进行统一输出；目前由于 <code>Blazor</code> 框架并未提供一个类似 <code>MVC</code> 的 <b>全局异常</b> 整体解决方案；通过使用 <code>ErrorLogger</code> 组件 <b>无需任何额外代码</b> 即可进行全局异常捕获与处理</p>",
+    "NormalIntro": "本功能是通过代码产生异常信息，由全局捕获组件统一处理",
+    "NormalTitle": "测试",
+    "OnErrorHandleIntro": "通过设置 <code>ErrorLogger</code> 参数 <code>OnErrorHandleAsync</code> 自定义使用 <code>Swal</code> 弹窗显示异常信息",
+    "OnErrorHandleTitle": "自定义错误处理",
     "PageErrorIntro": "点击按钮导航到页面生命周期内出错的页面，错误显示在当前页面，不影响菜单以及整体页面布局",
     "PageErrorTitle": "页面异常捕获",
     "Step1": "1. <code>Startup</code> 文件中增加 <code>AddLogging</code> 开启 <code>net core</code> 系统日志功能，支持其他第三方 <code>Logger</code> 组件",
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index edf9075973b..0995a8c9681 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>10.2.2-beta02</Version>
+    <Version>10.2.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
index db0a22fed2d..13230b4dae0 100644
--- a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
+++ b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
@@ -4,10 +4,15 @@
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
 using Microsoft.AspNetCore.Components.Rendering;
-using Microsoft.Extensions.Configuration;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using System.Reflection;
 
+#if NET8_0_OR_GREATER
+using System.Runtime.CompilerServices;
+#endif
+
 namespace BootstrapBlazor.Components;
 
 /// <summary>
@@ -18,11 +23,14 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase
 {
     [Inject]
     [NotNull]
-    private ILogger<BootstrapBlazorErrorBoundary>? Logger { get; set; }
+    private IStringLocalizer<ErrorLogger>? Localizer { get; set; }
 
     [Inject]
     [NotNull]
-    private IConfiguration? Configuration { get; set; }
+    private ILogger<BootstrapBlazorErrorBoundary>? Logger { get; set; }
+
+    [Inject, NotNull]
+    private IErrorBoundaryLogger? ErrorBoundaryLogger { get; set; }
 
     [Inject]
     [NotNull]
@@ -30,7 +38,7 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase
 
     [Inject]
     [NotNull]
-    private NavigationManager? NavigationManager { get; set; }
+    private DialogService? DialogService { get; set; }
 
     /// <summary>
     /// <para lang="zh">获得/设置 自定义错误处理回调方法</para>
@@ -41,14 +49,14 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase
 
     /// <summary>
     /// <para lang="zh">获得/设置 是否启用日志记录功能 默认 true 启用</para>
-    /// <para lang="en">Gets or sets Whether to Enable Logging Default true</para>
+    /// <para lang="en">Gets or sets Whether to Enable Logging. Default true</para>
     /// </summary>
     [Parameter]
     public bool EnableILogger { get; set; } = true;
 
     /// <summary>
     /// <para lang="zh">获得/设置 是否显示弹窗 默认 true 显示</para>
-    /// <para lang="en">Gets or sets Whether to Show Toast Default true</para>
+    /// <para lang="en">Gets or sets Whether to Show Toast. Default true</para>
     /// </summary>
     [Parameter]
     public bool ShowToast { get; set; } = true;
@@ -61,20 +69,34 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase
     [NotNull]
     public string? ToastTitle { get; set; }
 
-    [CascadingParameter, NotNull]
-    private IErrorLogger? ErrorLogger { get; set; }
+    [CascadingParameter]
+    private Tab? TabSet { get; set; }
+
+    [CascadingParameter]
+    private Modal? Modal { get; set; }
+
+    private Exception? _exception;
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    protected override void OnInitialized()
+    {
+        base.OnInitialized();
+
+        ToastTitle ??= Localizer[nameof(ToastTitle)];
+    }
 
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
     /// <param name="exception"></param>
-    protected override Task OnErrorAsync(Exception exception)
+    protected override async Task OnErrorAsync(Exception exception)
     {
-        if (EnableILogger && Logger.IsEnabled(LogLevel.Error))
+        if (EnableILogger)
         {
-            Logger.LogError(exception, "BootstrapBlazorErrorBoundary OnErrorAsync log this error occurred at {Page}", NavigationManager.Uri);
+            await ErrorBoundaryLogger.LogErrorAsync(exception);
         }
-        return Task.CompletedTask;
     }
 
     /// <summary>
@@ -83,123 +105,117 @@ protected override Task OnErrorAsync(Exception exception)
     /// <param name="builder"></param>
     protected override void BuildRenderTree(RenderTreeBuilder builder)
     {
-        // 页面生命周期内异常直接调用这里
-        // Exceptions in page lifecycle call here directly
-        var pageException = false;
-        var ex = CurrentException ?? _exception;
-        if (ex != null)
+        if (_exception is not null)
         {
-            pageException = IsPageException(ex);
-
-            // 重置 CurrentException
-            // Reset CurrentException
-            ResetException();
-
-            // 渲染异常
-            // Render Exception
-            var handler = GetLastOrDefaultHandler();
-            _ = RenderException(ex, handler);
+            builder.AddContent(0, RenderErrorContent(_exception));
+            _exception = null;
+            return;
         }
 
-        // 判断是否为组件周期内异常
-        // Determine if it is a component lifecycle exception
-        if (!pageException)
+        if (CurrentException is null)
         {
-            // 渲染正常内容
-            // Render Normal Content
-            builder.AddContent(1, ChildContent);
+            builder.AddContent(0, ChildContent);
+            return;
         }
-    }
-
-    private static readonly string[] PageMethods = new string[] { "SetParametersAsync", "RunInitAndSetParametersAsync", "OnAfterRenderAsync" };
 
-    private static bool IsPageException(Exception ex)
-    {
-        var errorMessage = ex.ToString();
-        return PageMethods.Any(i => errorMessage.Contains(i, StringComparison.OrdinalIgnoreCase));
-    }
-
-    private IHandlerException? GetLastOrDefaultHandler()
-    {
-        IHandlerException? handler = null;
-        if (ErrorLogger is Components.ErrorLogger logger)
+        var pageException = IsPageException(CurrentException);
+        if (pageException)
+        {
+            RenderPageException(builder, CurrentException);
+        }
+        else
         {
-            handler = logger.GetLastOrDefaultHandler();
+            // 保持 UI 使用 Toast 通知
+            builder.AddContent(0, ChildContent);
+            _ = HandlerErrorContent(CurrentException);
         }
-        return handler;
+        ResetException();
     }
 
-    private PropertyInfo? _currentExceptionPropertyInfo;
-
-    private void ResetException()
+    private void RenderPageException(RenderTreeBuilder builder, Exception ex)
     {
-        _exception = null;
-
-        _currentExceptionPropertyInfo ??= GetType().BaseType!.GetProperty(nameof(CurrentException), BindingFlags.NonPublic | BindingFlags.Instance)!;
-        _currentExceptionPropertyInfo.SetValue(this, null);
+        if (OnErrorHandleAsync is not null)
+        {
+            _ = OnErrorHandleAsync(Logger, ex);
+        }
+        else
+        {
+            builder.AddContent(0, RenderErrorContent(ex));
+        }
     }
 
-    private Exception? _exception = null;
-
-    private RenderFragment<Exception> ExceptionContent => ex => builder =>
+    private RenderFragment RenderErrorContent(Exception ex) => builder =>
     {
-        if (ErrorContent != null)
+        if (ErrorContent is null)
         {
-            builder.AddContent(0, ErrorContent(ex));
+            builder.OpenComponent<ErrorRender>(0);
+            builder.AddAttribute(1, "Exception", ex);
+            builder.CloseComponent();
         }
         else
         {
-            builder.OpenElement(0, "div");
-            builder.AddAttribute(1, "class", "error-stack");
-            builder.AddContent(2, GetErrorContentMarkupString(ex));
-            builder.CloseElement();
+            builder.AddContent(10, ErrorContent(ex));
         }
     };
 
-    private bool? _errorDetails;
+    private static readonly string[] PageMethods = new string[] { "SetParametersAsync", "RunInitAndSetParametersAsync", "OnAfterRenderAsync" };
 
-    private MarkupString GetErrorContentMarkupString(Exception ex)
+    private static bool IsPageException(Exception ex)
     {
-        _errorDetails ??= Configuration.GetValue("DetailedErrors", false);
-        return _errorDetails is true
-            ? ex.FormatMarkupString(Configuration.GetEnvironmentInformation())
-            : new MarkupString(ex.Message);
+        var errorMessage = ex.ToString();
+        return PageMethods.Any(i => errorMessage.Contains(i, StringComparison.OrdinalIgnoreCase));
     }
 
+#if NET8_0_OR_GREATER
+    private void ResetException(Exception? exception = null)
+    {
+        ResetExceptionCore(this, exception);
+    }
+#else
+    private PropertyInfo? _currentExceptionPropertyInfo;
+
+    private void ResetException(Exception? exception = null)
+    {
+        _currentExceptionPropertyInfo ??= GetType().BaseType!.GetProperty(nameof(CurrentException), BindingFlags.NonPublic | BindingFlags.Instance)!;
+        _currentExceptionPropertyInfo.SetValue(this, exception);
+    }
+#endif
+
     /// <summary>
-    /// <para lang="zh">BootstrapBlazor 组件导致异常渲染方法</para>
-    /// <para lang="en">BootstrapBlazor Component Exception Render Method</para>
+    /// <para lang="zh">处理指定异常 由 <see cref="BootstrapComponentBase"/> 处理 <see cref="IHandleEvent"/> 接口调用</para>
+    /// <para lang="en">Handle exception/></para>
     /// </summary>
     /// <param name="exception"></param>
-    /// <param name="handler"></param>
-    public async Task RenderException(Exception exception, IHandlerException? handler)
+    /// <returns></returns>
+    public async Task HandlerExceptionAsync(Exception exception)
     {
         // 记录日志
-        // Log Error
         await OnErrorAsync(exception);
 
-        // 外部调用
-        // External Call
-        if (OnErrorHandleAsync != null)
+        // 自定义处理后调用其处理逻辑
+        if (OnErrorHandleAsync is not null)
         {
             await OnErrorHandleAsync(Logger, exception);
+            return;
         }
 
-        if (handler != null)
+        if (TabSet != null)
         {
-            // IHandlerException 处理异常逻辑
-            // IHandlerException Handle Exception Logic
-            await handler.HandlerExceptionAsync(exception, ExceptionContent);
+            await DialogService.ShowExceptionDialog(ToastTitle, RenderErrorContent(exception));
+            return;
         }
-        else
+
+        if (Modal != null)
         {
-            // 显示异常信息
-            // Show Exception Info
-            await ShowErrorToast(exception);
+            _exception = exception;
+            StateHasChanged();
+            return;
         }
+
+        await HandlerErrorContent(exception);
     }
 
-    private async Task ShowErrorToast(Exception exception)
+    private async Task HandlerErrorContent(Exception exception)
     {
         if (ShowToast)
         {
@@ -207,11 +223,14 @@ private async Task ShowErrorToast(Exception exception)
             {
                 Category = ToastCategory.Error,
                 Title = ToastTitle,
-                ChildContent = ErrorContent == null
-                    ? ExceptionContent(exception)
-                    : ErrorContent(exception)
+                ChildContent = RenderErrorContent(exception)
             };
             await ToastService.Show(option);
         }
     }
+
+#if NET8_0_OR_GREATER
+    [UnsafeAccessor(UnsafeAccessorKind.Method, Name = "set_CurrentException")]
+    static extern void ResetExceptionCore(ErrorBoundaryBase @this, Exception? exception);
+#endif
 }
diff --git a/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs b/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs
index b2c6f648f46..6aaa4feed37 100644
--- a/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs
+++ b/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs
@@ -4,7 +4,6 @@
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
 using Microsoft.AspNetCore.Components.Rendering;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 
 namespace BootstrapBlazor.Components;
@@ -15,10 +14,6 @@ namespace BootstrapBlazor.Components;
 /// </summary>
 public class ErrorLogger : ComponentBase, IErrorLogger
 {
-    [Inject]
-    [NotNull]
-    private IStringLocalizer<ErrorLogger>? Localizer { get; set; }
-
     /// <summary>
     /// <inheritdoc cref="IErrorLogger.EnableErrorLogger"/>
     /// </summary>
@@ -69,39 +64,9 @@ public class ErrorLogger : ComponentBase, IErrorLogger
     [Parameter]
     public RenderFragment<Exception>? ErrorContent { get; set; }
 
-    /// <summary>
-    /// <para lang="zh">获得/设置 the 回调 function to be invoked during initialization.</para>
-    /// <para lang="en">Gets or sets the callback function to be invoked during initialization.</para>
-    /// </summary>
-    [Parameter]
-    public Func<IErrorLogger, Task>? OnInitializedCallback { get; set; }
-
     [NotNull]
     private BootstrapBlazorErrorBoundary? _errorBoundary = default;
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    protected override void OnInitialized()
-    {
-        base.OnInitialized();
-
-        ToastTitle ??= Localizer[nameof(ToastTitle)];
-    }
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    protected override async Task OnInitializedAsync()
-    {
-        await base.OnInitializedAsync();
-
-        if (OnInitializedCallback is not null)
-        {
-            await OnInitializedCallback(this);
-        }
-    }
-
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -131,32 +96,18 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
         builder.AddAttribute(4, nameof(BootstrapBlazorErrorBoundary.ErrorContent), ErrorContent);
         builder.AddAttribute(5, nameof(BootstrapBlazorErrorBoundary.ChildContent), ChildContent);
         builder.AddAttribute(6, nameof(BootstrapBlazorErrorBoundary.EnableILogger), EnableILogger);
-        builder.AddComponentReferenceCapture(7, obj => _errorBoundary = (BootstrapBlazorErrorBoundary)obj);
+        builder.AddComponentReferenceCapture(7, obj => _errorBoundary = obj as BootstrapBlazorErrorBoundary);
         builder.CloseComponent();
     };
 
     /// <summary>
     /// <inheritdoc cref="IErrorLogger.HandlerExceptionAsync(Exception)"/>
     /// </summary>
-    public Task HandlerExceptionAsync(Exception exception) => _errorBoundary.RenderException(exception, GetLastOrDefaultHandler());
-
-    private readonly List<IHandlerException> _cache = [];
-
-    internal IHandlerException? GetLastOrDefaultHandler() => _cache.LastOrDefault();
-
-    /// <summary>
-    /// <inheritdoc cref="IErrorLogger.Register(IHandlerException)"/>
-    /// </summary>
-    public void Register(IHandlerException component)
-    {
-        _cache.Add(component);
-    }
-
-    /// <summary>
-    /// <inheritdoc cref="IErrorLogger.UnRegister(IHandlerException)"/>
-    /// </summary>
-    public void UnRegister(IHandlerException component)
+    public async Task HandlerExceptionAsync(Exception exception)
     {
-        _cache.Remove(component);
+        if (_errorBoundary != null)
+        {
+            await _errorBoundary.HandlerExceptionAsync(exception);
+        }
     }
 }
diff --git a/src/BootstrapBlazor/Components/ErrorLogger/ErrorRender.cs b/src/BootstrapBlazor/Components/ErrorLogger/ErrorRender.cs
new file mode 100644
index 00000000000..7d91305b8c4
--- /dev/null
+++ b/src/BootstrapBlazor/Components/ErrorLogger/ErrorRender.cs
@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License
+// See the LICENSE file in the project root for more information.
+// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
+
+using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.Extensions.Configuration;
+
+namespace BootstrapBlazor.Components;
+
+class ErrorRender : IComponent
+{
+    [Inject]
+    [NotNull]
+    private IConfiguration? Configuration { get; set; }
+
+    private RenderHandle _renderHandle;
+
+    void IComponent.Attach(RenderHandle renderHandle)
+    {
+        _renderHandle = renderHandle;
+    }
+
+    private Exception? _ex;
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    /// <param name="parameters"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    public Task SetParametersAsync(ParameterView parameters)
+    {
+        _ex = parameters.GetValueOrDefault<Exception>("Exception");
+        _renderHandle.Render(BuildRenderTree);
+        return Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    /// <param name="builder"></param>
+    private void BuildRenderTree(RenderTreeBuilder builder)
+    {
+        if (_ex is not null)
+        {
+            builder.OpenElement(0, "div");
+            builder.AddAttribute(1, "class", "error-stack");
+            builder.AddContent(2, GetErrorContentMarkupString(_ex));
+            builder.CloseElement();
+        }
+    }
+
+    private bool? _errorDetails;
+    private MarkupString GetErrorContentMarkupString(Exception ex)
+    {
+        _errorDetails ??= Configuration.GetValue("DetailedErrors", false);
+        return _errorDetails is true
+            ? ex.FormatMarkupString(Configuration.GetEnvironmentInformation())
+            : new MarkupString(ex.Message);
+    }
+}
diff --git a/src/BootstrapBlazor/Components/ErrorLogger/IErrorLogger.cs b/src/BootstrapBlazor/Components/ErrorLogger/IErrorLogger.cs
index c23c278b329..f4361941d5b 100644
--- a/src/BootstrapBlazor/Components/ErrorLogger/IErrorLogger.cs
+++ b/src/BootstrapBlazor/Components/ErrorLogger/IErrorLogger.cs
@@ -41,18 +41,4 @@ public interface IErrorLogger
     /// </summary>
     /// <param name="ex"></param>
     Task HandlerExceptionAsync(Exception ex);
-
-    /// <summary>
-    /// <para lang="zh">注册方法</para>
-    /// <para lang="en">Register Method</para>
-    /// </summary>
-    /// <param name="component"></param>
-    void Register(IHandlerException component);
-
-    /// <summary>
-    /// <para lang="zh">注销方法</para>
-    /// <para lang="en">Unregister Method</para>
-    /// </summary>
-    /// <param name="component"></param>
-    void UnRegister(IHandlerException component);
 }
diff --git a/src/BootstrapBlazor/Components/ErrorLogger/IHandlerException.cs b/src/BootstrapBlazor/Components/ErrorLogger/IHandlerException.cs
deleted file mode 100644
index c71a8da5fe6..00000000000
--- a/src/BootstrapBlazor/Components/ErrorLogger/IHandlerException.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the Apache 2.0 License
-// See the LICENSE file in the project root for more information.
-// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
-
-namespace BootstrapBlazor.Components;
-
-/// <summary>
-/// <para lang="zh">IHandlerException 接口</para>
-/// <para lang="en">IHandlerException Interface</para>
-/// </summary>
-public interface IHandlerException
-{
-    /// <summary>
-    /// <para lang="zh">处理异常方法</para>
-    /// <para lang="en">Handle Exception Method</para>
-    /// </summary>
-    /// <param name="ex"></param>
-    /// <param name="errorContent"></param>
-    Task HandlerExceptionAsync(Exception ex, RenderFragment<Exception> errorContent);
-}
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor b/src/BootstrapBlazor/Components/Layout/Layout.razor
index 1fe4d7c25f7..8632d3db11c 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor
@@ -128,7 +128,7 @@
         {
             <ErrorLogger EnableErrorLogger="@EnableLogger" EnableILogger="@EnableILogger"
                          ShowToast="@ShowToast" ToastTitle="@ErrorLoggerToastTitle"
-                         OnErrorHandleAsync="OnErrorHandleAsync" OnInitializedCallback="OnErrorLoggerInitialized">
+                         OnErrorHandleAsync="OnErrorHandleAsync">
                 @HandlerMain()
             </ErrorLogger>
         }
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
index ce3c69f180e..9bcc240e0f0 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
@@ -15,7 +15,7 @@ namespace BootstrapBlazor.Components;
 /// <para lang="zh">Layout 组件</para>
 /// <para lang="en">Layout Component</para>
 /// </summary>
-public partial class Layout : IHandlerException, ITabHeader
+public partial class Layout : ITabHeader
 {
     private bool IsSmallScreen { get; set; }
 
@@ -623,8 +623,6 @@ protected override void OnInitialized()
             SubscribedLocationChangedEvent = true;
             Navigation.LocationChanged += Navigation_LocationChanged;
         }
-
-        ErrorLogger?.Register(this);
     }
 
     /// <summary>
@@ -762,33 +760,12 @@ private async Task ToggleSidebar()
         await TriggerCollapseChanged();
     }
 
-    private IErrorLogger? _errorLogger;
-
-    private Task OnErrorLoggerInitialized(IErrorLogger logger)
-    {
-        _errorLogger = logger;
-        _errorLogger.Register(this);
-        return Task.CompletedTask;
-    }
-
     /// <summary>
     /// <para lang="zh">上次渲染错误内容</para>
     /// <para lang="en">Last rendered error content</para>
     /// </summary>
     private RenderFragment? _errorContent;
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="ex"></param>
-    /// <param name="errorContent"></param>
-    public virtual Task HandlerExceptionAsync(Exception ex, RenderFragment<Exception> errorContent)
-    {
-        _errorContent = errorContent(ex);
-        StateHasChanged();
-        return Task.CompletedTask;
-    }
-
     private string? GetTargetString() => IsFixedTabHeader ? ".tabs-body" : null;
 
     private RenderFragment RenderTabHeader() => builder =>
@@ -820,14 +797,9 @@ protected override async ValueTask DisposeAsync(bool disposing)
     {
         await base.DisposeAsync(disposing);
 
-        if (disposing)
+        if (disposing && SubscribedLocationChangedEvent)
         {
-            _errorLogger?.UnRegister(this);
-            ErrorLogger?.UnRegister(this);
-            if (SubscribedLocationChangedEvent)
-            {
-                Navigation.LocationChanged -= Navigation_LocationChanged;
-            }
+            Navigation.LocationChanged -= Navigation_LocationChanged;
         }
     }
 }
diff --git a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor
index 657e49dd6d3..2b57e974b47 100644
--- a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor
+++ b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor
@@ -1,4 +1,4 @@
-@namespace BootstrapBlazor.Components
+@namespace BootstrapBlazor.Components
 @inherits BootstrapModuleComponentBase
 @attribute [BootstrapModuleAutoLoader("Modal/ModalDialog.razor.js", JSObjectReference = true)]
 
diff --git a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs
index a9d9c4dc35c..113dc9e1649 100644
--- a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs
+++ b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs
@@ -11,7 +11,7 @@ namespace BootstrapBlazor.Components;
 /// <para lang="zh">ModalDialog 组件</para>
 /// <para lang="en">ModalDialog Component</para>
 /// </summary>
-public partial class ModalDialog : IHandlerException
+public partial class ModalDialog
 {
     private string MaximizeAriaLabel => MaximizeStatus ? "maximize" : "restore";
 
@@ -353,26 +353,21 @@ public partial class ModalDialog : IHandlerException
     private IIconTheme? IconTheme { get; set; }
 
     private string? MaximizeIconString { get; set; }
-
     private DialogResult _result = DialogResult.Close;
-
     private bool _firstRender = true;
 
     /// <summary>
-    /// <para lang="zh">OnInitialized 方法</para>
-    /// <para lang="en">OnInitialized Method</para>
+    /// <inheritdoc/>
     /// </summary>
     protected override void OnInitialized()
     {
         base.OnInitialized();
 
-        ErrorLogger?.Register(this);
         Modal.AddDialog(this);
     }
 
     /// <summary>
-    /// <para lang="zh">OnParametersSet 方法</para>
-    /// <para lang="en">OnParametersSet Method</para>
+    /// <inheritdoc/>
     /// </summary>
     protected override void OnParametersSet()
     {
@@ -492,28 +487,22 @@ private async Task OnClickSave()
 
     private RenderFragment RenderBodyTemplate() => builder =>
     {
-        builder.AddContent(0, _errorContent ?? BodyTemplate);
-        _errorContent = null;
+        if (ErrorLogger is not null)
+        {
+            builder.OpenComponent<ErrorLogger>(0);
+            builder.AddAttribute(10, nameof(IErrorLogger.EnableErrorLogger), ErrorLogger.EnableErrorLogger);
+            builder.AddAttribute(20, nameof(IErrorLogger.EnableILogger), ErrorLogger.EnableILogger);
+            builder.AddAttribute(30, nameof(IErrorLogger.ShowToast), ErrorLogger.ShowToast);
+            builder.AddAttribute(40, nameof(IErrorLogger.ToastTitle), ErrorLogger.ToastTitle);
+            builder.AddAttribute(40, nameof(BootstrapBlazorErrorBoundary.ChildContent), BodyTemplate);
+            builder.CloseComponent();
+        }
+        else
+        {
+            builder.AddContent(0, BodyTemplate);
+        }
     };
 
-    /// <summary>
-    /// <para lang="zh">上次渲染错误内容</para>
-    /// <para lang="en">Last rendered error content</para>
-    /// </summary>
-    protected RenderFragment? _errorContent;
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="ex"></param>
-    /// <param name="errorContent"></param>
-    public virtual Task HandlerExceptionAsync(Exception ex, RenderFragment<Exception> errorContent)
-    {
-        _errorContent = errorContent(ex);
-        StateHasChanged();
-        return Task.CompletedTask;
-    }
-
     /// <summary>
     /// <para lang="zh">Dispose 方法</para>
     /// <para lang="en">Dispose Method</para>
@@ -525,7 +514,6 @@ protected override async ValueTask DisposeAsync(bool disposing)
 
         if (disposing)
         {
-            ErrorLogger?.UnRegister(this);
             Modal.RemoveDialog(this);
         }
     }
diff --git a/src/BootstrapBlazor/Components/Tab/TabItemContent.cs b/src/BootstrapBlazor/Components/Tab/TabItemContent.cs
index 035f6dc0a4d..530904a7e74 100644
--- a/src/BootstrapBlazor/Components/Tab/TabItemContent.cs
+++ b/src/BootstrapBlazor/Components/Tab/TabItemContent.cs
@@ -4,11 +4,10 @@
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
 using Microsoft.AspNetCore.Components.Rendering;
-using Microsoft.Extensions.Configuration;
 
 namespace BootstrapBlazor.Components;
 
-class TabItemContent : IComponent, IHandlerException, IDisposable
+class TabItemContent : IComponent
 {
     /// <summary>
     /// <para lang="zh">获得/设置 标签项，默认为 null</para>
@@ -20,23 +19,10 @@ class TabItemContent : IComponent, IHandlerException, IDisposable
     [CascadingParameter, NotNull]
     private Tab? TabSet { get; set; }
 
-    [Inject, NotNull]
-    private DialogService? DialogService { get; set; }
-
-    [Inject]
-    [NotNull]
-    private ToastService? ToastService { get; set; }
-
     [Inject]
     [NotNull]
     private IOptionsMonitor<BootstrapBlazorOptions>? Options { get; set; }
 
-    [Inject]
-    [NotNull]
-    private IConfiguration? Configuration { get; set; }
-
-    private IErrorLogger? _logger;
-
     private RenderHandle _renderHandle;
 
     void IComponent.Attach(RenderHandle renderHandle)
@@ -73,13 +59,7 @@ private void BuildRenderTree(RenderTreeBuilder builder)
         builder.AddAttribute(3, nameof(ErrorLogger.EnableILogger), EnableErrorLoggerILogger);
         builder.AddAttribute(4, nameof(ErrorLogger.ShowToast), ShowErrorLoggerToast);
         builder.AddAttribute(5, nameof(ErrorLogger.ToastTitle), ToastTitle);
-        builder.AddAttribute(6, nameof(ErrorLogger.OnInitializedCallback), new Func<IErrorLogger, Task>(logger =>
-        {
-            _logger = logger;
-            _logger.Register(this);
-            return Task.CompletedTask;
-        }));
-        builder.AddAttribute(7, nameof(ErrorLogger.OnErrorHandleAsync), TabSet.OnErrorHandleAsync);
+        builder.AddAttribute(6, nameof(ErrorLogger.OnErrorHandleAsync), TabSet.OnErrorHandleAsync);
         builder.CloseComponent();
     }
 
@@ -92,41 +72,4 @@ public void Render()
         _key = Guid.NewGuid();
         RenderContent();
     }
-
-    private bool _detailedErrorsLoaded;
-    private bool _showDetailedErrors;
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="ex"></param>
-    /// <param name="errorContent"></param>
-    public async Task HandlerExceptionAsync(Exception ex, RenderFragment<Exception> errorContent)
-    {
-        if (!_detailedErrorsLoaded)
-        {
-            _showDetailedErrors = Configuration.GetValue("DetailedErrors", false);
-            _detailedErrorsLoaded = true;
-        }
-
-        var useDialog = _showDetailedErrors || !ShowErrorLoggerToast;
-        if (useDialog)
-        {
-            await DialogService.ShowErrorHandlerDialog(errorContent(ex));
-        }
-        else
-        {
-            await ToastService.Error(ToastTitle, ex.Message);
-        }
-    }
-
-    /// <summary>
-    /// <para lang="zh">Dispose 方法用于释放资源</para>
-    /// <para lang="en">Dispose method</para>
-    /// </summary>
-    public void Dispose()
-    {
-        _logger?.UnRegister(this);
-        GC.SuppressFinalize(this);
-    }
 }
diff --git a/src/BootstrapBlazor/Extensions/ConfigurationExtensions.cs b/src/BootstrapBlazor/Extensions/ConfigurationExtensions.cs
index 5520083f015..cbdcf10210f 100644
--- a/src/BootstrapBlazor/Extensions/ConfigurationExtensions.cs
+++ b/src/BootstrapBlazor/Extensions/ConfigurationExtensions.cs
@@ -35,40 +35,33 @@ public static NameValueCollection GetEnvironmentInformation(this IConfiguration
             ["MachineName"] = Environment.MachineName,
             ["AppDomainName"] = AppDomain.CurrentDomain.FriendlyName,
 
-            // <para lang="zh">收集环境变量信息</para>
-            // <para lang="en">Collect environment variables</para>
             ["OS"] = GetOS(),
             ["OSArchitecture"] = RuntimeInformation.OSArchitecture.ToString(),
             ["ProcessArchitecture"] = RuntimeInformation.ProcessArchitecture.ToString(),
             ["Framework"] = RuntimeInformation.FrameworkDescription
         };
 
-        // <para lang="zh">当前用户</para>
-        // <para lang="en">Current User</para>
         var userName = configuration.GetUserName();
         if (!string.IsNullOrEmpty(userName))
         {
             nv["UserName"] = userName;
         }
 
-        // <para lang="zh">当前环境</para>
-        // <para lang="en">Current Environment</para>
+        // Current Environment
         var env = configuration.GetEnvironmentName();
         if (!string.IsNullOrEmpty(env))
         {
             nv["EnvironmentName"] = env;
         }
 
-        // <para lang="zh">IIS Root 路径</para>
-        // <para lang="en">IIS Root Path</para>
+        // IIS Root Path
         var iis = configuration.GetIISPath();
         if (!string.IsNullOrEmpty(iis))
         {
             nv["IISRootPath"] = iis;
         }
 
-        // <para lang="zh">VisualStudio Version</para>
-        // <para lang="en">VisualStudio Version</para>
+        // VisualStudio Version
         var vs = configuration.GetVisualStudioVersion();
         if (!string.IsNullOrEmpty(vs))
         {
@@ -117,8 +110,7 @@ public static string GetOS()
     {
         var userName = config.GetValue<string?>("USERNAME");
 
-        // <para lang="zh">Mac CentOS 系统</para>
-        // <para lang="en">Mac CentOS System</para>
+        // Mac CentOS System
         if (string.IsNullOrEmpty(userName))
         {
             userName = config.GetValue<string?>("LOGNAME");
@@ -160,7 +152,7 @@ public static string GetOS()
         var version = config.GetValue<string?>("VisualStudioVersion");
 
         var ret = $"{edition} {version}";
-        if (ret == " ")
+        if (string.IsNullOrWhiteSpace(ret))
         {
             ret = defaultValue;
         }
diff --git a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs
index f5bbc6fc8de..9abfbe06304 100644
--- a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs
+++ b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs
@@ -258,11 +258,26 @@ public static async Task ShowValidateFormDialog<TComponent>(this DialogService s
     /// <param name="service"></param>
     /// <param name="fragment"></param>
     /// <param name="dialog"></param>
-    public static async Task ShowErrorHandlerDialog(this DialogService service, RenderFragment fragment, Dialog? dialog = null)
+    [Obsolete("已弃用，请使用 ShowExceptionDialog 方法。Deprecated, please use ShowExceptionDialog method")]
+    [ExcludeFromCodeCoverage]
+    public static Task ShowErrorHandlerDialog(this DialogService service, RenderFragment fragment, Dialog? dialog = null)
+    {
+        return ShowExceptionDialog(service, null, fragment, dialog);
+    }
+
+    /// <summary>
+    /// <para lang="zh">显示异常信息对话框扩展方法</para>
+    /// <para lang="en">Show error handler dialog</para>
+    /// </summary>
+    /// <param name="service"></param>
+    /// <param name="title"></param>
+    /// <param name="fragment"></param>
+    /// <param name="dialog"></param>
+    public static async Task ShowExceptionDialog(this DialogService service, string? title, RenderFragment fragment, Dialog? dialog = null)
     {
         var option = new DialogOption
         {
-            Title = "Error",
+            Title = title ?? "Error",
             IsScrolling = true,
             BodyTemplate = fragment
         };
@@ -274,9 +289,10 @@ public static async Task ShowErrorHandlerDialog(this DialogService service, Rend
     /// <para lang="en">Show exception dialog</para>
     /// </summary>
     /// <param name="service"></param>
+    /// <param name="title"></param>
     /// <param name="exception"></param>
     /// <param name="dialog"></param>
-    public static async Task ShowExceptionDialog(this DialogService service, Exception exception, Dialog? dialog = null)
+    public static async Task ShowExceptionDialog(this DialogService service, string? title, Exception exception, Dialog? dialog = null)
     {
         RenderFragment fragment = builder =>
         {
@@ -285,6 +301,6 @@ public static async Task ShowExceptionDialog(this DialogService service, Excepti
             builder.AddContent(20, new MarkupString(exception.Message));
             builder.CloseElement();
         };
-        await ShowErrorHandlerDialog(service, fragment, dialog);
+        await ShowExceptionDialog(service, title, fragment, dialog);
     }
 }
diff --git a/src/BootstrapBlazor/Locales/en.json b/src/BootstrapBlazor/Locales/en.json
index 6005210830b..3b1b28efbdb 100644
--- a/src/BootstrapBlazor/Locales/en.json
+++ b/src/BootstrapBlazor/Locales/en.json
@@ -99,7 +99,7 @@
   "BootstrapBlazor.Components.EqualToValidator": {
     "ErrorMessage": "Please enter the same value again"
   },
-  "BootstrapBlazor.Components.ErrorLogger": {
+  "BootstrapBlazor.Components.BootstrapBlazorErrorBoundary": {
     "ToastTitle": "Application Error"
   },
   "BootstrapBlazor.Components.GoTop": {
diff --git a/src/BootstrapBlazor/Locales/zh.json b/src/BootstrapBlazor/Locales/zh.json
index 733b6bd261d..63dc05583c1 100644
--- a/src/BootstrapBlazor/Locales/zh.json
+++ b/src/BootstrapBlazor/Locales/zh.json
@@ -99,7 +99,7 @@
   "BootstrapBlazor.Components.EqualToValidator": {
     "ErrorMessage": "你的输入不相同"
   },
-  "BootstrapBlazor.Components.ErrorLogger": {
+  "BootstrapBlazor.Components.BootstrapBlazorErrorBoundary": {
     "ToastTitle": "应用程序错误"
   },
   "BootstrapBlazor.Components.GoTop": {
diff --git a/test/UnitTest/Components/DialogTest.cs b/test/UnitTest/Components/DialogTest.cs
index 957ad19b40f..79e509b9c98 100644
--- a/test/UnitTest/Components/DialogTest.cs
+++ b/test/UnitTest/Components/DialogTest.cs
@@ -580,7 +580,7 @@ await cut.InvokeAsync(() => dialog.ShowCloseDialog<MockValidateFormDialog>("Clos
         #endregion
 
         #region ShowExceptionDialog Method
-        await cut.InvokeAsync(() => dialog.ShowExceptionDialog(new Exception("Test")));
+        await cut.InvokeAsync(() => dialog.ShowExceptionDialog(null, new Exception("Test")));
         await cut.InvokeAsync(() => modal.Instance.CloseCallback());
         #endregion
     }
diff --git a/test/UnitTest/Components/ErrorHandlerTest.cs b/test/UnitTest/Components/ErrorHandlerTest.cs
index bcd21dd309c..4fbd7df70cf 100644
--- a/test/UnitTest/Components/ErrorHandlerTest.cs
+++ b/test/UnitTest/Components/ErrorHandlerTest.cs
@@ -25,7 +25,7 @@ await cut.InvokeAsync(() => dialog.Show(new DialogOption()
         }));
         var errorButton = cut.Find(".btn-error");
         await cut.InvokeAsync(() => errorButton.Click());
-        Assert.Contains("<div class=\"modal-body\"><div class=\"error-stack\">", cut.Markup);
+        cut.Contains("test error logger");
 
         // 关闭弹窗
         var btn = cut.Find(".modal-header .btn-close");
diff --git a/test/UnitTest/Components/ErrorLoggerTest.cs b/test/UnitTest/Components/ErrorLoggerTest.cs
index 6b2db0ea5b1..e0c972730d0 100644
--- a/test/UnitTest/Components/ErrorLoggerTest.cs
+++ b/test/UnitTest/Components/ErrorLoggerTest.cs
@@ -5,6 +5,7 @@
 
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.Extensions.Configuration;
+using System.Reflection;
 
 namespace UnitTest.Components;
 
@@ -87,45 +88,68 @@ public async Task OnErrorHandleAsync_Ok()
             });
         });
         var button = cut.Find("button");
-        button.TriggerEvent("onclick", EventArgs.Empty);
+        await cut.InvokeAsync(() => button.Click());
         var result = await tcs.Task;
         Assert.True(result);
+
+        // 由于自定义 OnErrorHandleAsync 组件对异常未处理
+        cut.DoesNotContain("Attempted to divide by zero.");
     }
 
     [Fact]
-    public void OnErrorHandleAsync_Tab()
+    public async Task ResetException_Ok()
+    {
+        var cut = Context.Render<ErrorLogger>(pb =>
+        {
+            pb.AddChildContent("test");
+        });
+
+        var boundaryField = cut.Instance.GetType().GetField("_errorBoundary", BindingFlags.Instance | BindingFlags.NonPublic);
+        Assert.NotNull(boundaryField);
+
+        var boundary = boundaryField.GetValue(cut.Instance);
+        Assert.NotNull(boundary);
+
+        var methodInfo = boundary.GetType().GetMethod("ResetException", BindingFlags.Instance | BindingFlags.NonPublic);
+        Assert.NotNull(methodInfo);
+
+        methodInfo.Invoke(boundary, new object[] { new Exception("mock exception") });
+
+        cut.Render();
+        // 原生组件点击报错
+        // 保持 UI 使用 Toast 弹出异常
+
+        cut.Contains("test");
+    }
+
+    [Fact]
+    public async Task Tab_Error()
     {
         var cut = Context.Render<BootstrapBlazorRoot>(pb =>
         {
-            pb.Add(a => a.ChildContent, new RenderFragment(builder =>
+            pb.AddChildContent<Tab>(pb =>
             {
-                builder.OpenComponent<Tab>(0);
-                builder.AddAttribute(1, nameof(Tab.ChildContent), new RenderFragment(builder =>
+                pb.AddChildContent<TabItem>(pb =>
                 {
-                    builder.OpenComponent<TabItem>(0);
-                    builder.AddAttribute(1, nameof(TabItem.ChildContent), new RenderFragment(builder =>
+                    pb.AddChildContent<Button>(pb =>
                     {
-                        builder.OpenComponent<Button>(0);
-                        builder.AddAttribute(1, nameof(Button.Text), "errorLogger-click");
-                        builder.AddAttribute(2, nameof(Button.OnClick), EventCallback.Factory.Create<MouseEventArgs>(this, e =>
+                        pb.Add(a => a.Text, "errorLogger-click");
+                        pb.Add(a => a.OnClick, EventCallback.Factory.Create<MouseEventArgs>(this, e =>
                         {
                             var a = 0;
                             _ = 1 / a;
                         }));
-                        builder.CloseComponent();
-                    }));
-                    builder.CloseComponent();
-                }));
-                builder.CloseComponent();
-            }));
+                    });
+                });
+            });
         });
 
         cut.Contains("errorLogger-click");
         var button = cut.Find("button");
-        button.TriggerEvent("onclick", EventArgs.Empty);
+        await cut.InvokeAsync(() => button.Click());
 
         // TabItem 内显示异常信息
-        cut.Contains("error-stack");
+        cut.Contains("Attempted to divide by zero.");
     }
 
     [Fact]
@@ -197,7 +221,7 @@ public async Task Toast_ErrorContent_Ok()
     }
 
     [Fact]
-    public async Task ErrorContent_Ok()
+    public async Task Tab_ErrorContent_Ok()
     {
         var cut = Context.Render<BootstrapBlazorRoot>(pb =>
         {
@@ -250,16 +274,7 @@ public async Task TabItem_Error()
         await cut.InvokeAsync(() => button.Click());
 
         // 页面不崩溃，由弹窗显示异常信息
-        cut.Contains("<div class=\"error-stack\">TimeStamp:");
-
-        // 单元测试覆盖 TabItemContent Dispose 方法 覆盖内部 _logger 变量为空情况
-        var handler = Activator.CreateInstance("BootstrapBlazor", "BootstrapBlazor.Components.TabItemContent");
-        Assert.NotNull(handler);
-        var content = handler.Unwrap();
-        Assert.NotNull(content);
-
-        Assert.IsType<IDisposable>(content, exactMatch: false);
-        ((IDisposable)content).Dispose();
+        cut.Contains("Attempted to divide by zero.");
     }
 
     [Fact]
@@ -292,8 +307,19 @@ public void OnInitialize_Error()
         {
             pb.AddChildContent<MockInitializedError>();
         });
+        cut.Contains("Attempted to divide by zero.");
 
-        Assert.Equal("", cut.Markup);
+        var errorLogger = cut.FindComponent<ErrorLogger>();
+        Assert.NotNull(errorLogger);
+
+        errorLogger.Render(pb =>
+        {
+            pb.Add(a => a.ErrorContent, ex => builder =>
+            {
+                builder.AddContent(0, $"{ex.Message}_error_content_template");
+            });
+        });
+        cut.Contains("Attempted to divide by zero._error_content_template");
     }
 
     [Fact]
@@ -304,7 +330,7 @@ public void OnInitializeAsync_Error()
             pb.AddChildContent<MockInitializedAsyncError>();
         });
 
-        Assert.Equal("", cut.Markup);
+        cut.Contains("Attempted to divide by zero.");
     }
 
     [Fact]
@@ -315,7 +341,7 @@ public void OnParameterSet_Error()
             pb.AddChildContent<MockOnParametersSetError>();
         });
 
-        Assert.Equal("", cut.Markup);
+        cut.Contains("Attempted to divide by zero.");
     }
 
     [Fact]
@@ -326,7 +352,7 @@ public void OnParameterSetAsync_Error()
             pb.AddChildContent<MockOnParameterSetAsyncError>();
         });
 
-        Assert.Equal("", cut.Markup);
+        cut.Contains("Attempted to divide by zero.");
     }
 
     [Fact]
@@ -337,7 +363,7 @@ public void OnAfterRender_Error()
             pb.AddChildContent<MockOnAfterRenderError>();
         });
 
-        Assert.Equal("", cut.Markup);
+        cut.Contains("Attempted to divide by zero.");
     }
 
     [Fact]
@@ -348,7 +374,7 @@ public void OnAfterRenderAsync_Error()
             pb.AddChildContent<MockOnAfterRenderAsyncError>();
         });
 
-        Assert.Equal("", cut.Markup);
+        cut.Contains("Attempted to divide by zero.");
     }
 
     private RenderFragment RenderButton() => builder =>
diff --git a/test/UnitTest/Components/LayoutTest.cs b/test/UnitTest/Components/LayoutTest.cs
index c29019131fc..898c76d4f2b 100644
--- a/test/UnitTest/Components/LayoutTest.cs
+++ b/test/UnitTest/Components/LayoutTest.cs
@@ -308,7 +308,7 @@ public void UseTabSet_OK()
         {
             pb.Add(a => a.UseTabSet, false);
             pb.Add(a => a.Main, CreateMain());
-            pb.Add(a => a.ExcludeUrls, new string[] { "/Index" });
+            pb.Add(a => a.ExcludeUrls, new List<string>() { "/Index" });
             pb.Add(a => a.TabDefaultUrl, "/Index");
             pb.Add(a => a.IsOnlyRenderActiveTab, true);
             pb.Add(a => a.AllowDragTab, true);
@@ -627,7 +627,7 @@ public void ErrorLogger_OnErrorHandleAsync_Page()
     }
 
     [Fact]
-    public void ErrorLogger_OnErrorHandleAsync_Button()
+    public async Task ErrorLogger_OnErrorHandleAsync_Button()
     {
         // 页面生命周期内报错调用自定义处理方法
         Exception? ex1 = null;
@@ -657,7 +657,7 @@ public void ErrorLogger_OnErrorHandleAsync_Button()
             });
         });
         var button = cut.Find("button");
-        cut.InvokeAsync(() => button.Click());
+        await cut.InvokeAsync(() => button.Click());
         Assert.NotNull(ex1);
 
         // 移除自定义逻辑使用内部异常处理逻辑
@@ -669,7 +669,7 @@ public void ErrorLogger_OnErrorHandleAsync_Button()
         button = cut.Find("button");
 
         ex1 = null;
-        cut.InvokeAsync(() => button.Click());
+        await cut.InvokeAsync(() => button.Click());
         Assert.Null(ex1);
     }
 
@@ -688,8 +688,12 @@ public void CollapseBarTemplate_Ok()
             });
         });
         Assert.Contains("CollapseBarTemplate-Content", cut.Markup);
-    }
 
+        var methodInfo = cut.Instance.GetType().GetMethod("DisposeAsync", BindingFlags.Instance | BindingFlags.NonPublic);
+        Assert.NotNull(methodInfo);
+
+        methodInfo.Invoke(cut.Instance, new object[] { false });
+    }
 
     [Fact]
     public void SkipAuthenticate_Ok()