Merge branch 'feat-pdf'

Author: ArgoZhang

.gitignore

@@ -381,3 +381,6 @@ src/**/wwwroot/**/uploader
 **/BootstrapBlazor/wwwroot/css/sweetalert2.css
 **/BootstrapBlazor/wwwroot/css/motronic.min.css
 **/BootstrapBlazor/wwwroot/css/nano.min.css
+
+# Bootstrap
+**/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js

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

@@ -116,7 +116,7 @@
            Name="PreviewList">
     <div class="images img-ph mt-3">
         <div class="images-item">
-            <ImageViewer Url="@WebsiteOption.CurrentValue.GetAssetUrl("images/bird.jpeg")" PreviewList="PreviewList" />
+            <ImageViewer Url="@WebsiteOption.CurrentValue.GetAssetUrl("images/bird.jpeg")" PreviewList="PreviewList" ZoomSpeed="0.5" />
         </div>
     </div>
 </DemoBlock>

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

@@ -428,7 +428,8 @@
     <section ignore>@((MarkupString)Localizer["SelectsGenericDesc"].Value)</section>
     <div class="row">
         <div class="col-12 col-sm-6">
-            <SelectGeneric Items="_genericItems" @bind-Value="_selectedFoo" IsEditable="true"></SelectGeneric>
+            <SelectGeneric Items="_genericItems" @bind-Value="_selectedFoo"
+                           IsEditable="true" TextConvertToValueCallback="TextConvertToValueCallback"></SelectGeneric>
         </div>
         <div class="col-12 col-sm-6">
             <Display Value="_selectedFoo.Address"></Display>

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

@@ -251,6 +251,27 @@ private Task OnTimeZoneValueChanged(string timeZoneId)
 
     private Foo _selectedFoo = new();
 
+    private async Task<Foo> TextConvertToValueCallback(string v)
+    {
+        // 模拟异步通讯切换线程
+        await Task.Delay(10);
+
+        Foo? foo = null;
+        var item = _genericItems.Find(i => i.Text == v);
+        if (item == null)
+        {
+            var id = _genericItems.Count + 1;
+            foo = new Foo() { Id = id,  Address = $"New Address - {id}" };
+            var fooItem = new SelectedItem<Foo> { Text = v, Value = foo };
+            _genericItems.Add(fooItem);
+        }
+        else
+        {
+            foo = item.Value;
+        }
+        return foo!;
+    }
+
     /// <summary>
     /// 获得事件方法
     /// </summary>

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

@@ -3266,7 +3266,7 @@
     "SelectsVirtualizeDescription": "Component virtual scrolling supports two ways of providing data through <code>Items</code> or <code>OnQueryAsync</code> callback methods",
     "SelectsGenericTitle": "Generic",
     "SelectsGenericIntro": "Data source <code>Items</code> supports generics when using <code>SelectedItem&lt;TValue&gt;</code>",
-    "SelectsGenericDesc": "<p>Please refer to <a href=\"https://github.com/dotnetcore/BootstrapBlazor/issues/4497?wt.mc_id=DT-MVP-5004174\" target=\"_blank\">Design Ideas</a> to understand this feature. In this example, by selecting the drop-down box option, the value obtained is the <code>Foo</code> instance, and the value displayed in the text box on the right is the <code>Address</code> value of the <code>Foo</code> attribute</p><p>In this example, the <code>ValueEqualityComparer</code> and <code>CustomKeyAttribute</code> parameters are not set, and the <code>[Key]</code> tag of the <code>Id</code> attribute of <code>Foo</code> is used for equality judgment</p>",
+    "SelectsGenericDesc": "<p>Please refer to <a href=\"https://github.com/dotnetcore/BootstrapBlazor/issues/4497?wt.mc_id=DT-MVP-5004174\" target=\"_blank\">Design Ideas</a> to understand this feature. In this example, by selecting the drop-down box option, the value obtained is the <code>Foo</code> instance, and the value displayed in the text box on the right is the <code>Address</code> value of the <code>Foo</code> attribute</p><p>In this example, <code>IsEditable=\"true\"</code> and <code>TextConvertToValueCallback</code> parameters are set. When a <code>Foo</code> that does not exist in the original data source is entered, a new <code>Foo</code> instance is added to the data source in the <code></code> callback method</p>",
     "SelectsOnInputChangedCallback": "Callback method for converting input text into corresponding Value in edit mode",
     "TextConvertToValueCallback": "Callback method when input text changes in edit mode",
     "SelectsIsEditable": "Whether editable",
@@ -5914,7 +5914,7 @@
     "ImageViewerErrorTemplateTitle": "Load failed",
     "ImageViewerErrorTemplateIntro": "Can be set up by the <code>Error Template</code> open Error Template function, Url parameter <code>Url</code> unable to load images displayed when the content of the Template",
     "ImageViewerPreviewListTitle": "A larger preview",
-    "ImageViewerPreviewListIntro": "Can be set up by the <code>Preview List</code> opens a larger Preview of the function",
+    "ImageViewerPreviewListIntro": "Can be set up by the <code>Preview List</code> opens a larger Preview of the function, set <code>ZoomSpeed</code> to control the speed of scrolling and scaling",
     "ImageViewersAttrUrl": "Picture Url",
     "ImageViewersAttrAlt": "Native Alt attribute",
     "ImageViewersAttrShowPlaceHolder": "Whether display placeholder for large images added",

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

@@ -3266,7 +3266,7 @@
     "SelectsVirtualizeDescription": "组件虚拟滚动支持两种形式通过 <code>Items</code> 或者 <code>OnQueryAsync</code> 回调方法提供数据",
     "SelectsGenericTitle": "泛型支持",
     "SelectsGenericIntro": "数据源 <code>Items</code> 使用 <code>SelectedItem&lt;TValue&gt;</code> 时即可支持泛型",
-    "SelectsGenericDesc": "<p>请参考 <a href=\"https://github.com/dotnetcore/BootstrapBlazor/issues/4497?wt.mc_id=DT-MVP-5004174\" target=\"_blank\">设计思路</a> 理解此功能。本例中通过选择下拉框选项，得到的值为 <code>Foo</code> 实例，右侧文本框内显示值为 <code>Foo</code> 属性 <code>Address</code> 值</p><p>本例中未设置 <code>ValueEqualityComparer</code> 以及 <code>CustomKeyAttribute</code> 参数，使用 <code>Foo</code> 属性 <code>Id</code> 的 <code>[Key]</code> 标签进行相等判定</p>",
+    "SelectsGenericDesc": "<p>请参考 <a href=\"https://github.com/dotnetcore/BootstrapBlazor/issues/4497?wt.mc_id=DT-MVP-5004174\" target=\"_blank\">设计思路</a> 理解此功能。本例中通过选择下拉框选项，得到的值为 <code>Foo</code> 实例，右侧文本框内显示值为 <code>Foo</code> 属性 <code>Address</code> 值</p><p>本例中设置 <code>IsEditable=\"true\"</code> 以及 <code>TextConvertToValueCallback</code> 参数，录入原数据源中不存在的 <code>Foo</code> 时，在 <code></code> 回调方法中添加新 <code>Foo</code> 实例到数据源中</p>",
     "SelectsOnInputChangedCallback": "编辑模式下输入文本转换为对应 Value 回调方法",
     "TextConvertToValueCallback": "编辑模式下输入文本变化时回调方法",
     "SelectsIsEditable": "是否可编辑",
@@ -5914,7 +5914,7 @@
     "ImageViewerErrorTemplateTitle": "加载失败",
     "ImageViewerErrorTemplateIntro": "可通过设置 <code>ErrorTemplate</code> 开启错误模板功能，参数 <code>Url</code> 无法加载图片时显示此模板内容",
     "ImageViewerPreviewListTitle": "大图预览",
-    "ImageViewerPreviewListIntro": "可通过设置 <code>PreviewList</code> 开启预览大图的功能",
+    "ImageViewerPreviewListIntro": "可通过设置 <code>PreviewList</code> 开启预览大图的功能，设置 <code>ZoomSpeed</code> 控制滚动缩放时的速度",
     "ImageViewersAttrUrl": "图片 Url",
     "ImageViewersAttrAlt": "原生 alt 属性",
     "ImageViewersAttrShowPlaceHolder": "是否显示占位符 适用于大图片加载",

src/BootstrapBlazor/BootstrapBlazor.csproj

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

src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs

@@ -5,6 +5,7 @@
 
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using System.Reflection;
 
@@ -31,6 +32,10 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase
     [NotNull]
     private NavigationManager? NavigationManager { get; set; }
 
+    [Inject]
+    [NotNull]
+    private IHostEnvironment? HostEnvironment { get; set; }
+
     /// <summary>
     /// 获得/设置 自定义错误处理回调方法
     /// </summary>
@@ -54,13 +59,10 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase
     /// <inheritdoc/>
     /// </summary>
     /// <param name="exception"></param>
-    protected override async Task OnErrorAsync(Exception exception)
+    protected override Task OnErrorAsync(Exception exception)
     {
-        if (ShowToast)
-        {
-            await ToastService.Error(ToastTitle, exception.Message);
-        }
         Logger.LogError(exception, "{BootstrapBlazorErrorBoundary} {OnErrorAsync} log this error occurred at {Page}", nameof(BootstrapBlazorErrorBoundary), nameof(OnErrorAsync), NavigationManager.Uri);
+        return Task.CompletedTask;
     }
 
     /// <summary>
@@ -69,13 +71,13 @@ protected override async Task OnErrorAsync(Exception exception)
     /// <param name="builder"></param>
     protected override void BuildRenderTree(RenderTreeBuilder builder)
     {
+        // 页面生命周期内异常直接调用这里
         var ex = CurrentException ?? _exception;
         if (ex != null)
         {
             // 处理自定义异常逻辑
             if (OnErrorHandleAsync != null)
             {
-                // 页面生命周期内异常直接调用这里
                 _ = OnErrorHandleAsync(Logger, ex);
                 return;
             }
@@ -132,7 +134,7 @@ private MarkupString GetErrorContentMarkupString(Exception ex)
     }
 
     /// <summary>
-    /// 渲染异常信息方法
+    /// BootstrapBlazor 组件导致异常渲染方法
     /// </summary>
     /// <param name="exception"></param>
     /// <param name="handler"></param>
@@ -145,14 +147,35 @@ public async Task RenderException(Exception exception, IHandlerException? handle
             return;
         }
 
+        // 记录日志
+        await OnErrorAsync(exception);
+
         if (handler != null)
         {
-            await handler.HandlerException(exception, ExceptionContent);
+            if (HostEnvironment.IsDevelopment())
+            {
+                // IHandlerException 处理异常逻辑
+                await handler.HandlerException(exception, ExceptionContent);
+            }
+            else
+            {
+                // 非开发模式下弹窗提示错误信息
+                await ToastService.Error(ToastTitle, exception.Message);
+            }
             return;
         }
 
-        await OnErrorAsync(exception);
+        // 显示异常信息
+        await ShowErrorToast(exception);
         _exception = exception;
         StateHasChanged();
     }
+
+    private async Task ShowErrorToast(Exception exception)
+    {
+        if (ShowToast)
+        {
+            await ToastService.Error(ToastTitle, exception.Message);
+        }
+    }
 }

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,17 +62,9 @@ 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>
@@ -110,13 +102,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>
-    /// 获得/设置 是否开启全局异常捕获 默认 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 弹窗标题 默认读取资源文件内容