Merge branch 'main' into lee/imageview

Author: ArgoZhang

src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs

@@ -22,13 +22,13 @@ public class ErrorLogger : ComponentBase, IErrorLogger
     /// <inheritdoc/>
     /// </summary>
     [Parameter]
-    public bool? EnableErrorLogger { get; set; }
+    public bool EnableErrorLogger { get; set; } = true;
 
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
     [Parameter]
-    public bool? ShowToast { get; set; }
+    public bool ShowToast { get; set; } = true;
 
     /// <summary>
     /// <inheritdoc/>
@@ -62,10 +62,6 @@ 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;
 
@@ -77,8 +73,6 @@ protected override void OnInitialized()
         base.OnInitialized();
 
         ToastTitle ??= Localizer[nameof(ToastTitle)];
-        EnableErrorLogger ??= Options.CurrentValue.EnableErrorLogger;
-        ShowToast ??= Options.CurrentValue.ShowErrorLoggerToast;
     }
 
     /// <summary>
@@ -108,7 +102,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
         builder.CloseComponent();
     }
 
-    private RenderFragment? RenderContent => (EnableErrorLogger ?? false) ? RenderError : ChildContent;
+    private RenderFragment? RenderContent => EnableErrorLogger ? RenderError : ChildContent;
 
     private RenderFragment RenderError => builder =>
     {

src/BootstrapBlazor/Components/ErrorLogger/IErrorLogger.cs

@@ -11,9 +11,9 @@ namespace BootstrapBlazor.Components;
 public interface IErrorLogger
 {
     /// <summary>
-    /// 获得/设置 是否开启全局异常捕获 默认 null 使用全局配置 <see cref="BootstrapBlazorOptions.EnableErrorLogger"/> 值
+    /// 获得/设置 是否开启全局异常捕获 默认 true
     /// </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 提示弹窗 默认 null 使用全局配置 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 值
+    /// 获得 是否显示 Error 提示弹窗 默认 true
     /// </summary>
-    bool? ShowToast { get; }
+    bool ShowToast { get; }
 
     /// <summary>
     /// 获得 Error Toast 弹窗标题 默认读取资源文件内容

src/BootstrapBlazor/Components/Layout/Layout.razor

@@ -126,7 +126,7 @@
         }
         else
         {
-            <ErrorLogger EnableErrorLogger="@EnableErrorLogger" ShowToast="@ShowErrorLoggerToast" ToastTitle="@ErrorLoggerToastTitle" 
+            <ErrorLogger EnableErrorLogger="@_enableErrorLogger" ShowToast="@_showToast" ToastTitle="@ErrorLoggerToastTitle" 
                          OnErrorHandleAsync="OnErrorHandleAsync" OnInitializedCallback="OnErrorLoggerInitialized">
                 @HandlerMain()
             </ErrorLogger>
@@ -147,7 +147,9 @@
           RefreshToolbarButtonIcon="@RefreshToolbarButtonIcon" FullscreenToolbarButtonIcon="@FullscreenToolbarButtonIcon"
           RefreshToolbarTooltipText="@RefreshToolbarTooltipText" FullscreenToolbarTooltipText="@FullscreenToolbarTooltipText"
           OnToolbarRefreshCallback="OnToolbarRefreshCallback" TabHeader="TabHeader"
-          Body="@Main" NotAuthorized="NotAuthorized!" NotFound="NotFound!" NotFoundTabText="@NotFoundTabText">
+          Body="@Main" NotAuthorized="NotAuthorized!" NotFound="NotFound!" NotFoundTabText="@NotFoundTabText"
+          EnableErrorLogger="EnableErrorLogger" ShowErrorLoggerToast="ShowErrorLoggerToast"
+          ErrorLoggerToastTitle="@ErrorLoggerToastTitle">
     </Tab>;
 
     RenderFragment RenderFooter =>

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

@@ -490,11 +490,19 @@ public partial class Layout : IHandlerException, ITabHeader
     [NotNull]
     private IStringLocalizer<Layout>? Localizer { get; set; }
 
+    [Inject]
+    [NotNull]
+    private IOptionsMonitor<BootstrapBlazorOptions>? Options { get; set; }
+
     private bool _init;
     private LayoutHeader? _layoutHeader = null;
 
     private ITabHeader? TabHeader => ShowTabInHeader ? this : null;
 
+    private bool _enableErrorLogger => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
+
+    private bool _showToast => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>

src/BootstrapBlazor/Components/Tab/Tab.razor.cs

@@ -431,6 +431,24 @@ public partial class Tab
     [Parameter]
     public ITabHeader? TabHeader { 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; }
+
     [CascadingParameter]
     private Layout? Layout { get; set; }
 

src/BootstrapBlazor/Components/Tab/TabItemContent.cs

@@ -7,16 +7,16 @@
 
 namespace BootstrapBlazor.Components;
 
-internal class TabItemContent : IComponent
+class TabItemContent : IComponent
 {
     /// <summary>
     /// Gets or sets the component content. Default is null
     /// </summary>
     [Parameter, NotNull]
     public TabItem? Item { get; set; }
 
-    [CascadingParameter]
-    private Layout? Layout { get; set; }
+    [CascadingParameter, NotNull]
+    private Tab? TabSet { get; set; }
 
     private RenderHandle _renderHandle;
 
@@ -55,10 +55,11 @@ private RenderFragment RenderItemContent(RenderFragment? content) => builder =>
         builder.OpenComponent<ErrorLogger>(0);
         builder.AddAttribute(1, nameof(ErrorLogger.ChildContent), content);
 
-        var enableErrorLogger = Layout?.EnableErrorLogger;
-        var showToast = Layout?.ShowErrorLoggerToast;
+        var enableErrorLogger = TabSet.EnableErrorLogger;
+        var showToast = TabSet.ShowErrorLoggerToast;
         builder.AddAttribute(2, nameof(ErrorLogger.EnableErrorLogger), enableErrorLogger);
         builder.AddAttribute(3, nameof(ErrorLogger.ShowToast), showToast);
+        builder.AddAttribute(4, nameof(ErrorLogger.ToastTitle), TabSet.ErrorLoggerToastTitle);
         builder.CloseComponent();
     };