Merge branch 'main' into feat-upload

Author: ArgoZhang

src/BootstrapBlazor.Server/Components/Pages/ErrorPage.razor

@@ -0,0 +1,3 @@
+@page "/error-page"
+
+<h3>ErrorPage</h3>

src/BootstrapBlazor.Server/Components/Pages/ErrorPage.razor.cs

@@ -0,0 +1,26 @@
+// 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([email protected]) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Server.Components.Pages;
+
+/// <summary>
+/// ErrorPage 组件用于测试全局异常处理功能
+/// </summary>
+public partial class ErrorPage
+{
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    protected override void OnInitialized()
+    {
+        base.OnInitialized();
+
+        var a = 1;
+        var b = 0;
+
+        // 这里会抛出异常
+        var c = a / b;
+    }
+}

src/BootstrapBlazor.Server/Components/Samples/GlobalException.razor

@@ -72,4 +72,8 @@
     <Button Icon="fa-solid fa-font-awesome" Text="@Localizer["DialogText"]" OnClick="OnShowDialog" />
 </DemoBlock>
 
+<DemoBlock Title="@Localizer["PageErrorTitle"]" Introduction="@Localizer["PageErrorIntro"]" Name="Page">
+    <Button Icon="fa-solid fa-font-awesome" Text="@Localizer["ButtonText"]" OnClick="OnGotoPage" />
+</DemoBlock>
+
 <AttributeTable Items="@GetAttributes()" />

src/BootstrapBlazor.Server/Components/Samples/GlobalException.razor.cs

@@ -10,6 +10,10 @@ namespace BootstrapBlazor.Server.Components.Samples;
 /// </summary>
 public partial class GlobalException
 {
+    [Inject]
+    [NotNull]
+    private NavigationManager? NavigationManager { get; set; }
+
     [Inject]
     [NotNull]
     private SwalService? SwalService { get; set; }
@@ -19,7 +23,6 @@ public partial class GlobalException
 
     private static void OnClick()
     {
-        // NET6.0 采用 ErrorLogger 统一处理
         var a = 0;
         _ = 1 / a;
     }
@@ -39,6 +42,12 @@ private Task OnShowDialog() => DialogService.Show(new DialogOption()
         Component = BootstrapDynamicComponent.CreateComponent<MockError>()
     });
 
+    private Task OnGotoPage()
+    {
+        NavigationManager.NavigateTo("/error-page");
+        return Task.CompletedTask;
+    }
+
     /// <summary>
     /// 获得属性方法
     /// </summary>

src/BootstrapBlazor.Server/Locales/en-US.json

@@ -1725,7 +1725,9 @@
     "Block2Intro": "Set custom exception handling logic by setting <code>OnErrorHandleAsync</code> callback method",
     "DialogTitle": "In Dialog",
     "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"
+    "DialogText": "Popup",
+    "PageErrorTitle": "Page",
+    "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."
   },
   "BootstrapBlazor.Server.Components.Pages.GlobalOption": {
     "Title": "Global exception",

src/BootstrapBlazor.Server/Locales/zh-CN.json

@@ -1725,7 +1725,9 @@
     "Block2Intro": "通过设置 <code>OnErrorHandleAsync</code> 回调方法，设置自定义异常处理逻辑",
     "DialogTitle": "弹窗中异常捕获",
     "DialogIntro": "点击按钮弹出弹窗，弹窗内按钮触发异常，错误显示在弹窗内",
-    "DialogText": "弹窗"
+    "DialogText": "弹窗",
+    "PageErrorTitle": "页面异常捕获",
+    "PageErrorIntro": "点击按钮导航到页面生命周期内出错的页面，错误显示在当前页面，不影响菜单以及整体页面布局"
   },
   "BootstrapBlazor.Server.Components.Pages.GlobalOption": {
     "Title": "全局配置",

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.7.0</Version>
+    <Version>9.7.1-beta01</Version>
   </PropertyGroup>
 
   <ItemGroup>

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>

src/BootstrapBlazor/Components/BaseComponents/BootstrapBlazorRoot.razor.cs

@@ -48,10 +48,10 @@ public partial class BootstrapBlazorRoot
     public Func<ILogger, Exception, Task>? OnErrorHandleAsync { get; set; }
 
     /// <summary>
-    /// 获得/设置 是否显示 Error 提示弹窗 默认 true 显示
+    /// 获得/设置 是否显示 Error 提示弹窗 默认 null 使用 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 设置值
     /// </summary>
     [Parameter]
-    public bool ShowToast { get; set; } = true;
+    public bool? ShowToast { get; set; }
 
     /// <summary>
     /// 获得/设置 Error Toast 弹窗标题
@@ -65,7 +65,9 @@ public partial class BootstrapBlazorRoot
     [Parameter]
     public bool? EnableErrorLogger { get; set; }
 
-    private bool EnableErrorLoggerValue => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
+    private bool _enableErrorLoggerValue => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
+
+    private bool _showToast => ShowToast ?? Options.CurrentValue.ShowErrorLoggerToast;
 
     /// <summary>
     /// SetParametersAsync 方法

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.Reflection;
 
 namespace BootstrapBlazor.Components;
 
@@ -68,19 +69,38 @@ 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)
+            // 处理自定义异常逻辑
+            if (OnErrorHandleAsync != null)
             {
-                _exception = null;
-                builder.AddContent(0, ExceptionContent(ex));
+                // 页面生命周期内异常直接调用这里
+                _ = OnErrorHandleAsync(Logger, ex);
+                return;
             }
+
+            // 渲染异常内容
+            builder.AddContent(0, ExceptionContent(ex));
+
+            // 重置 CurrentException
+            ResetException();
+        }
+        else
+        {
+            // 渲染正常内容
+            builder.AddContent(1, ChildContent);
         }
-#endif
-        builder.AddContent(1, ChildContent);
+    }
+
+    private PropertyInfo? _currentExceptionPropertyInfo;
+
+    private void ResetException()
+    {
+        _exception = null;
+
+        _currentExceptionPropertyInfo ??= GetType().BaseType!.GetProperty(nameof(CurrentException), BindingFlags.NonPublic | BindingFlags.Instance)!;
+        _currentExceptionPropertyInfo.SetValue(this, null);
     }
 
     private Exception? _exception = null;