feat(BootstrapBlazorRoot): add ShowErrorLoggerToast parameter

src/BootstrapBlazor/Components/BaseComponents/BootstrapBlazorRoot.razor

@@ -1,8 +1,9 @@
-@inherits ComponentBase
+@inherits ComponentBase
 @namespace BootstrapBlazor.Components
 
 <CascadingValue Value="this" IsFixed="true">
-    <ErrorLogger EnableErrorLogger="EnableErrorLoggerValue" ShowToast="ShowToastValue" ToastTitle="@ToastTitle"
+    <ErrorLogger EnableErrorLogger="EnableErrorLoggerValue" EnableILogger="EnableErrorLoggerILoggerValue"
+                 ShowToast="ShowToastValue" ToastTitle="@ToastTitle"
                  OnErrorHandleAsync="OnErrorHandleAsync">
         @ChildContent
 

src/BootstrapBlazor/Components/BaseComponents/BootstrapBlazorRoot.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
@@ -42,16 +42,30 @@ public partial class BootstrapBlazorRoot
     public ToastContainer? ToastContainer { get; private set; }
 
     /// <summary>
-    /// 获得/设置 自定义错误处理回调方法
+    /// 获得/设置 是否开启全局异常捕获 默认 null 使用 <see cref="BootstrapBlazorOptions.EnableErrorLogger"/> 设置值
     /// </summary>
     [Parameter]
-    public Func<ILogger, Exception, Task>? OnErrorHandleAsync { get; set; }
+    public bool? EnableErrorLogger { get; set; }
+
+    /// <summary>
+    /// 获得/设置 是否记录异常到 <see cref="ILogger"/> 默认 null 使用 <see cref="BootstrapBlazorOptions.EnableErrorLoggerILogger"/> 设置值
+    /// </summary>
+    [Parameter]
+    public bool? EnableErrorLoggerILogger { get; set; }
+
+    /// <summary>
+    /// 获得/设置 是否显示 Error 提示弹窗 默认 null 使用 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 设置值
+    /// </summary>
+    [Parameter]
+    [Obsolete("已弃用，请使用 ShowErrorLoggerToast 参数. Deprecated, please use ShowErrorLoggerToast parameter")]
+    [ExcludeFromCodeCoverage]
+    public bool? ShowToast { get => ShowErrorLoggerToast; set => ShowErrorLoggerToast = value; }
 
     /// <summary>
     /// 获得/设置 是否显示 Error 提示弹窗 默认 null 使用 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 设置值
     /// </summary>
     [Parameter]
-    public bool? ShowToast { get; set; }
+    public bool? ShowErrorLoggerToast { get; set; }
 
     /// <summary>
     /// 获得/设置 Error Toast 弹窗标题
@@ -60,17 +74,19 @@ public partial class BootstrapBlazorRoot
     public string? ToastTitle { get; set; }
 
     /// <summary>
-    /// 获得/设置 是否开启全局异常捕获 默认 null 读取配置文件 EnableErrorLogger 值
+    /// 获得/设置 自定义错误处理回调方法
     /// </summary>
     [Parameter]
-    public bool? EnableErrorLogger { get; set; }
+    public Func<ILogger, Exception, Task>? OnErrorHandleAsync { get; set; }
 
     private bool EnableErrorLoggerValue => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
 
-    private bool ShowToastValue => ShowToast ?? Options.CurrentValue.ShowErrorLoggerToast;
+    private bool EnableErrorLoggerILoggerValue => EnableErrorLoggerILogger ?? Options.CurrentValue.EnableErrorLoggerILogger;
+
+    private bool ShowToastValue => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;
 
     /// <summary>
-    /// SetParametersAsync 方法
+    /// <inheritdoc/>
     /// </summary>
     /// <param name="parameters"></param>
     /// <returns></returns>

src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.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
@@ -43,16 +43,16 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase
     public Func<ILogger, Exception, Task>? OnErrorHandleAsync { get; set; }
 
     /// <summary>
-    /// 获得/设置 是否显示弹窗 默认 true 显示
+    /// 获得/设置 是否启用日志记录功能 默认 true 启用
     /// </summary>
     [Parameter]
-    public bool ShowToast { get; set; } = true;
+    public bool EnableILogger { get; set; } = true;
 
     /// <summary>
-    /// 获得/设置 是否启用日志记录功能 默认 true 启用
+    /// 获得/设置 是否显示弹窗 默认 true 显示
     /// </summary>
     [Parameter]
-    public bool EnableILogger { get; set; } = true;
+    public bool ShowToast { get; set; } = true;
 
     /// <summary>
     /// 获得/设置 Toast 弹窗标题
@@ -164,7 +164,7 @@ public async Task RenderException(Exception exception, IHandlerException? handle
             if (HostEnvironment.IsDevelopment())
             {
                 // IHandlerException 处理异常逻辑
-                await handler.HandlerException(exception, ExceptionContent);
+                await handler.HandlerExceptionAsync(exception, ExceptionContent);
             }
             else
             {

src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs

@@ -28,13 +28,13 @@ public class ErrorLogger : ComponentBase, IErrorLogger
     /// <inheritdoc/>
     /// </summary>
     [Parameter]
-    public bool ShowToast { get; set; } = true;
+    public bool EnableILogger { get; set; } = true;
 
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
     [Parameter]
-    public bool EnableILogger { get; set; } = true;
+    public bool ShowToast { get; set; } = true;
 
     /// <summary>
     /// <inheritdoc/>
@@ -44,7 +44,7 @@ public class ErrorLogger : ComponentBase, IErrorLogger
     public string? ToastTitle { get; set; }
 
     /// <summary>
-    /// <inheritdoc/>
+    /// 获得/设置 自定义错误处理回调方法
     /// </summary>
     [Parameter]
     public Func<ILogger, Exception, Task>? OnErrorHandleAsync { get; set; }

src/BootstrapBlazor/Components/ErrorLogger/IErrorLogger.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
@@ -16,27 +16,26 @@ public interface IErrorLogger
     bool EnableErrorLogger { get; set; }
 
     /// <summary>
-    /// 获得/设置 自定义 Error 处理方法 默认 null
+    /// 获得/设置 是否启用日志记录功能 默认 true 启用
+    /// <para>设置 false 后关闭记录日志功能</para>
     /// </summary>
-    /// <param name="ex"></param>
-    /// <returns></returns>
-    Task HandlerExceptionAsync(Exception ex);
+    bool EnableILogger { get; }
 
     /// <summary>
     /// 获得 是否显示 Error 提示弹窗 默认 true
     /// </summary>
     bool ShowToast { get; }
 
     /// <summary>
-    /// 获得/设置 是否启用日志记录功能 默认 true 启用
-    /// <para>设置 false 后关闭记录日志功能</para>
+    /// 获得 Error Toast 弹窗标题 默认读取资源文件内容
     /// </summary>
-    bool EnableILogger { get; }
+    string? ToastTitle { get; }
 
     /// <summary>
-    /// 获得 Error Toast 弹窗标题 默认读取资源文件内容
+    /// 获得/设置 自定义 Error 处理方法 默认 null
     /// </summary>
-    string? ToastTitle { get; }
+    /// <param name="ex"></param>
+    Task HandlerExceptionAsync(Exception ex);
 
     /// <summary>
     /// 注册方法

src/BootstrapBlazor/Components/ErrorLogger/IHandlerException.cs

@@ -1,19 +1,19 @@
-// 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
 
 namespace BootstrapBlazor.Components;
 
 /// <summary>
-/// IHandlerException
+/// IHandlerException 接口
 /// </summary>
 public interface IHandlerException
 {
     /// <summary>
-    /// 
+    /// 处理异常方法
     /// </summary>
     /// <param name="ex"></param>
     /// <param name="errorContent"></param>
-    Task HandlerException(Exception ex, RenderFragment<Exception> errorContent);
+    Task HandlerExceptionAsync(Exception ex, RenderFragment<Exception> errorContent);
 }

src/BootstrapBlazor/Components/Layout/Layout.razor

@@ -1,4 +1,4 @@
-@namespace BootstrapBlazor.Components
+@namespace BootstrapBlazor.Components
 @inherits BootstrapModuleComponentBase
 @attribute [BootstrapModuleAutoLoader(JSObjectReference = true)]
 
@@ -126,8 +126,9 @@
         }
         else
         {
-            <ErrorLogger EnableErrorLogger="@EnableLogger" ShowToast="@ShowToast" ToastTitle="@ErrorLoggerToastTitle"
-                         EnableILogger="@EnableILogger" OnErrorHandleAsync="OnErrorHandleAsync" OnInitializedCallback="OnErrorLoggerInitialized">
+            <ErrorLogger EnableErrorLogger="@EnableLogger" EnableILogger="@EnableILogger"
+                         ShowToast="@ShowToast" ToastTitle="@ErrorLoggerToastTitle"
+                         OnErrorHandleAsync="OnErrorHandleAsync" OnInitializedCallback="OnErrorLoggerInitialized">
                 @HandlerMain()
             </ErrorLogger>
         }

src/BootstrapBlazor/Components/Layout/Layout.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
@@ -473,22 +473,22 @@ public partial class Layout : IHandlerException, ITabHeader
     public object? Resource { get; set; }
 
     /// <summary>
-    /// 获得/设置 是否开启全局异常捕获 默认 null 读取配置文件 EnableErrorLogger 值
+    /// 获得/设置 是否开启全局异常捕获 默认 null 使用 <see cref="BootstrapBlazorOptions.EnableErrorLogger"/> 设置值
     /// </summary>
     [Parameter]
     public bool? EnableErrorLogger { get; set; }
 
     /// <summary>
-    /// 获得/设置 是否显示 Error 提示弹窗 默认 null 使用 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 设置值
+    /// 获得/设置 是否记录异常到 <see cref="ILogger"/> 默认 null 使用 <see cref="BootstrapBlazorOptions.EnableErrorLoggerILogger"/> 设置值
     /// </summary>
     [Parameter]
-    public bool? ShowErrorLoggerToast { get; set; }
+    public bool? EnableErrorLoggerILogger { get; set; }
 
     /// <summary>
-    /// 获得/设置 是否启用日志记录功能 默认 null 启用 使用 <see cref="BootstrapBlazorOptions.EnableErrorLoggerILogger"/> 设置值
+    /// 获得/设置 是否显示 Error 提示弹窗 默认 null 使用 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 设置值
     /// </summary>
     [Parameter]
-    public bool? EnableErrorLoggerILogger { get; set; }
+    public bool? ShowErrorLoggerToast { get; set; }
 
     /// <summary>
     /// 获得/设置 错误日志 <see cref="Toast"/> 弹窗标题 默认 null
@@ -526,10 +526,10 @@ public partial class Layout : IHandlerException, ITabHeader
 
     private bool EnableLogger => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
 
-    private bool ShowToast => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;
-
     private bool EnableILogger => EnableErrorLoggerILogger ?? Options.CurrentValue.EnableErrorLoggerILogger;
 
+    private bool ShowToast => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -702,7 +702,7 @@ private Task OnErrorLoggerInitialized(ErrorLogger logger)
     /// </summary>
     /// <param name="ex"></param>
     /// <param name="errorContent"></param>
-    public virtual Task HandlerException(Exception ex, RenderFragment<Exception> errorContent)
+    public virtual Task HandlerExceptionAsync(Exception ex, RenderFragment<Exception> errorContent)
     {
         _errorContent = errorContent(ex);
         StateHasChanged();

src/BootstrapBlazor/Components/Modal/ModalDialog.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
@@ -453,7 +453,7 @@ private RenderFragment RenderBodyTemplate() => builder =>
     /// </summary>
     /// <param name="ex"></param>
     /// <param name="errorContent"></param>
-    public virtual Task HandlerException(Exception ex, RenderFragment<Exception> errorContent)
+    public virtual Task HandlerExceptionAsync(Exception ex, RenderFragment<Exception> errorContent)
     {
         _errorContent = errorContent(ex);
         StateHasChanged();

src/BootstrapBlazor/Components/Tab/TabItemContent.cs

@@ -88,7 +88,7 @@ public void Render()
     /// </summary>
     /// <param name="ex"></param>
     /// <param name="errorContent"></param>
-    public Task HandlerException(Exception ex, RenderFragment<Exception> errorContent) => DialogService.ShowErrorHandlerDialog(errorContent(ex));
+    public Task HandlerExceptionAsync(Exception ex, RenderFragment<Exception> errorContent) => DialogService.ShowErrorHandlerDialog(errorContent(ex));
 
     /// <summary>
     /// IDispose 方法用于释放资源

test/UnitTest/Components/BootstrapBlazorRootTest.cs

@@ -5,8 +5,6 @@
 
 //using HarmonyLib;
 
-using Bunit.TestDoubles;
-
 namespace UnitTest.Components;
 
 public class BootstrapBlazorRootTest : TestBase
@@ -27,7 +25,6 @@ class MockGenerator : IRootComponentGenerator
         /// <inheritdoc/>
         /// </summary>
         /// <returns></returns>
-        /// <exception cref="NotImplementedException"></exception>
         public RenderFragment Generator() => builder =>
         {
             builder.AddContent(0, new MarkupString("<div class=\"auto-generator\"></div>"));

test/UnitTest/Components/ErrorLoggerTest.cs

@@ -13,7 +13,7 @@ namespace UnitTest.Components;
 public class ErrorLoggerTest : BootstrapBlazorTestBase
 {
     [Fact]
-    public void OnErrorAsync_Ok()
+    public async Task OnErrorAsync_Ok()
     {
         var cut = Context.Render<BootstrapBlazorRoot>(pb =>
         {
@@ -39,7 +39,7 @@ public void OnErrorAsync_Ok()
             pb.Add(e => e.ShowToast, true);
         });
         var button = cut.Find("button");
-        button.TriggerEvent("onclick", EventArgs.Empty);
+        await cut.InvokeAsync(() => button.Click());
     }
 
     [Fact]
@@ -130,13 +130,14 @@ public void OnErrorHandleAsync_Tab()
     }
 
     [Fact]
-    public void Root_Ok()
+    public async Task Root_Ok()
     {
         Exception? exception = null;
         var cut = Context.Render<BootstrapBlazorRoot>(pb =>
         {
             pb.Add(a => a.EnableErrorLogger, true);
-            pb.Add(a => a.ShowToast, false);
+            pb.Add(a => a.EnableErrorLoggerILogger, true);
+            pb.Add(a => a.ShowErrorLoggerToast, false);
             pb.Add(a => a.ToastTitle, "Test");
             pb.Add(a => a.OnErrorHandleAsync, (logger, ex) =>
             {
@@ -153,17 +154,24 @@ public void Root_Ok()
             });
         });
         var button = cut.Find("button");
-        cut.InvokeAsync(() => button.Click());
+        await cut.InvokeAsync(() => button.Click());
         Assert.NotNull(exception);
+
+        cut.Render(pb =>
+        {
+            pb.Add(a => a.EnableErrorLogger, false);
+        });
+        button = cut.Find("button");
+        await Assert.ThrowsAsync<DivideByZeroException>(async () => await cut.InvokeAsync(() => button.Click()));
     }
 
     [Fact]
-    public void ErrorContent_Ok()
+    public async Task ErrorContent_Ok()
     {
         var cut = Context.Render<BootstrapBlazorRoot>(pb =>
         {
             pb.Add(a => a.EnableErrorLogger, true);
-            pb.Add(a => a.ShowToast, true);
+            pb.Add(a => a.ShowErrorLoggerToast, true);
             pb.AddChildContent<Button>(pb =>
             {
                 pb.Add(b => b.OnClick, () =>
@@ -184,7 +192,7 @@ public void ErrorContent_Ok()
             }));
         });
         var button = cut.Find("button");
-        cut.InvokeAsync(() => button.Click());
+        await cut.InvokeAsync(() => button.Click());
         cut.Contains("Attempted to divide by zero.error_content_template");
     }