Merge branch 'dotnetcore:main' into main

Author: WilliamLiu1997

src/BootstrapBlazor/Components/BaseComponents/DynamicElement.cs

@@ -97,12 +97,12 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
 
         if (IsTriggerClick())
         {
-            builder.AddAttribute(2, "onclick", EventCallback.Factory.Create<MouseEventArgs>(this, e => OnClick!()));
+            builder.AddAttribute(2, "onclick", EventCallback.Factory.Create<MouseEventArgs>(this, OnTriggerClick));
         }
 
         if (IsTriggerDoubleClick())
         {
-            builder.AddAttribute(3, "ondblclick", EventCallback.Factory.Create<MouseEventArgs>(this, e => OnDoubleClick!()));
+            builder.AddAttribute(3, "ondblclick", EventCallback.Factory.Create<MouseEventArgs>(this, OnTriggerDoubleClick));
         }
 
         if (IsTriggerClick() || IsTriggerDoubleClick())
@@ -111,9 +111,9 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             builder.AddEventStopPropagationAttribute(5, "onclick", StopPropagation);
         }
 
-        if (TriggerContextMenu && OnContextMenu != null)
+        if (IsTriggerContextMenu())
         {
-            builder.AddAttribute(6, "oncontextmenu", EventCallback.Factory.Create<MouseEventArgs>(this, e => OnContextMenu(e)));
+            builder.AddAttribute(6, "oncontextmenu", EventCallback.Factory.Create<MouseEventArgs>(this, OnTriggerContextMenu));
             builder.AddEventPreventDefaultAttribute(7, "oncontextmenu", true);
         }
 
@@ -123,8 +123,35 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
         {
             builder.CloseElement();
         }
+    }
+
+    private bool IsTriggerClick() => TriggerClick && OnClick != null;
+
+    private bool IsTriggerDoubleClick() => TriggerDoubleClick && OnDoubleClick != null;
+
+    private bool IsTriggerContextMenu() => TriggerContextMenu && OnContextMenu != null;
+
+    private async Task OnTriggerClick()
+    {
+        if (OnClick != null)
+        {
+            await OnClick();
+        }
+    }
 
-        bool IsTriggerClick() => TriggerClick && OnClick != null;
-        bool IsTriggerDoubleClick() => TriggerDoubleClick && OnDoubleClick != null;
+    private async Task OnTriggerDoubleClick()
+    {
+        if (OnDoubleClick != null)
+        {
+            await OnDoubleClick();
+        }
+    }
+
+    private async Task OnTriggerContextMenu(MouseEventArgs e)
+    {
+        if (OnContextMenu != null)
+        {
+            await OnContextMenu(e);
+        }
     }
 }

src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs

@@ -22,13 +22,13 @@ public class ErrorLogger : ComponentBase, IErrorLogger
     /// <inheritdoc/>
     /// </summary>
     [Parameter]
-    public bool EnableErrorLogger { get; set; } = true;
+    public bool? EnableErrorLogger { get; set; }
 
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
     [Parameter]
-    public bool ShowToast { get; set; } = true;
+    public bool? ShowToast { get; set; }
 
     /// <summary>
     /// <inheritdoc/>
@@ -62,9 +62,17 @@ public class ErrorLogger : ComponentBase, IErrorLogger
     [Parameter]
     public Func<ErrorLogger, Task>? OnInitializedCallback { get; set; }
 
+    [Inject]
+    [NotNull]
+    private IOptionsMonitor<BootstrapBlazorOptions>? Options { get; set; }
+
     [NotNull]
     private BootstrapBlazorErrorBoundary? _errorBoundary = default;
 
+    private bool _enableErrorLogger => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
+
+    private bool _showToast => ShowToast ?? Options.CurrentValue.ShowErrorLoggerToast;
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -102,13 +110,13 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
         builder.CloseComponent();
     }
 
-    private RenderFragment? RenderContent => EnableErrorLogger ? RenderError : ChildContent;
+    private RenderFragment? RenderContent => _enableErrorLogger ? RenderError : ChildContent;
 
     private RenderFragment RenderError => builder =>
     {
         builder.OpenComponent<BootstrapBlazorErrorBoundary>(0);
         builder.AddAttribute(1, nameof(BootstrapBlazorErrorBoundary.OnErrorHandleAsync), OnErrorHandleAsync);
-        builder.AddAttribute(2, nameof(BootstrapBlazorErrorBoundary.ShowToast), ShowToast);
+        builder.AddAttribute(2, nameof(BootstrapBlazorErrorBoundary.ShowToast), _showToast);
         builder.AddAttribute(3, nameof(BootstrapBlazorErrorBoundary.ToastTitle), ToastTitle);
         builder.AddAttribute(4, nameof(BootstrapBlazorErrorBoundary.ErrorContent), ErrorContent);
         builder.AddAttribute(5, nameof(BootstrapBlazorErrorBoundary.ChildContent), ChildContent);

src/BootstrapBlazor/Components/ErrorLogger/IErrorLogger.cs

@@ -11,9 +11,9 @@ namespace BootstrapBlazor.Components;
 public interface IErrorLogger
 {
     /// <summary>
-    /// 获得/设置 是否开启全局异常捕获 默认 true
+    /// 获得/设置 是否开启全局异常捕获 默认 null 使用全局配置 <see cref="BootstrapBlazorOptions.EnableErrorLogger"/> 值
     /// </summary>
-    bool EnableErrorLogger { get; set; }
+    bool? EnableErrorLogger { get; set; }
 
     /// <summary>
     /// 获得/设置 自定义 Error 处理方法 默认 null
@@ -23,9 +23,9 @@ public interface IErrorLogger
     Task HandlerExceptionAsync(Exception ex);
 
     /// <summary>
-    /// 获得 是否显示 Error 提示弹窗 默认 true 显示
+    /// 获得 是否显示 Error 提示弹窗 默认 null 使用全局配置 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 值
     /// </summary>
-    bool ShowToast { get; }
+    bool? ShowToast { get; }
 
     /// <summary>
     /// 获得 Error Toast 弹窗标题 默认读取资源文件内容

src/BootstrapBlazor/Components/Layout/Layout.razor

@@ -126,7 +126,7 @@
         }
         else
         {
-            <ErrorLogger EnableErrorLogger="@_enableErrorLoggerValue" ShowToast="@_showToast" ToastTitle="@ErrorLoggerToastTitle" 
+            <ErrorLogger EnableErrorLogger="@EnableErrorLogger" ShowToast="@ShowErrorLoggerToast" ToastTitle="@ErrorLoggerToastTitle" 
                          OnErrorHandleAsync="OnErrorHandleAsync" OnInitializedCallback="OnErrorLoggerInitialized">
                 @HandlerMain()
             </ErrorLogger>

src/BootstrapBlazor/Components/Layout/Layout.razor.cs

@@ -483,10 +483,6 @@ public partial class Layout : IHandlerException, ITabHeader
     [CascadingParameter]
     private Task<AuthenticationState>? AuthenticationStateTask { get; set; }
 
-    [Inject]
-    [NotNull]
-    private IOptionsMonitor<BootstrapBlazorOptions>? Options { get; set; }
-
     [Inject, NotNull]
     private IServiceProvider? ServiceProvider { get; set; }
 
@@ -499,10 +495,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>

test/UnitTest/Components/LayoutTest.cs

@@ -535,6 +535,7 @@ public void IHandlerException_Ok()
             pb.Add(a => a.EnableErrorLogger, true);
             pb.AddChildContent<Layout>(pb =>
             {
+                pb.Add(a => a.EnableErrorLogger, true);
                 // 按钮触发异常
                 pb.Add(a => a.Main, new RenderFragment(builder =>
                 {