Merge branch 'main' into feat-socket

ArgoZhang · ArgoZhang · commit 8b588e8d4b5c · 2025-06-19T11:57:58.000+08:00
diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
@@ -31,9 +31,9 @@
     <PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="9.0.2" />
     <PackageReference Include="BootstrapBlazor.Chart" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.ChatBot" Version="9.0.0" />
-    <PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.0" />
+    <PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0" />
-    <PackageReference Include="BootstrapBlazor.DockView" Version="9.1.13" />
+    <PackageReference Include="BootstrapBlazor.DockView" Version="9.1.14" />
     <PackageReference Include="BootstrapBlazor.DriverJs" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.FileViewer" Version="9.0.0" />
diff --git a/src/BootstrapBlazor.Server/Components/Samples/CherryMarkdowns.razor b/src/BootstrapBlazor.Server/Components/Samples/CherryMarkdowns.razor
@@ -11,7 +11,7 @@
 <Pre class="no-highlight">builder.Services.Configure&lt;HubOptions&gt;(option => option.MaximumReceiveMessageSize = null);</Pre>
 
 <DemoBlock Title="@Localizer["NormalTitle"]" Introduction="@Localizer["NormalIntro"]" Name="Normal">
-    <CherryMarkdown @bind-Value="MarkdownString" @bind-Html="HtmlString" style="height: 400px" />
+    <CherryMarkdown @bind-Value="MarkdownString" @bind-Html="HtmlString" IsSupportMath="true" style="height: 400px" />
     <div class="mt-3">
         <textarea class="form-control" rows="6" disabled="disabled">@MarkdownString</textarea>
     </div>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor
@@ -364,9 +364,15 @@
 <DemoBlock Title="@Localizer["SelectsConfirmSelectTitle"]"
            Introduction="@Localizer["SelectsConfirmSelectIntro"]"
            Name="ConfirmSelect">
+    <section ignore>
+        <ul class="ul-demo">
+            <li>@((MarkupString)Localizer["SelectConfifrmSelectDesc1"].Value)</li>
+            <li>@((MarkupString)Localizer["SelectConfifrmSelectDesc2"].Value)</li>
+        </ul>
+    </section>
     <div class="row">
         <div class="col-12 col-sm-6">
-            <Select TValue="string" Items="Items" OnBeforeSelectedItemChange="@OnBeforeSelectedItemChange"
+            <Select TValue="string" Items="Items" ShowSwal="true"
                     SwalTitle="@Localizer["SwalTitle"]" SwalContent="@Localizer["SwalContent"]" SwalFooter="@Localizer["SwalFooter"]" />
         </div>
     </div>
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -3219,7 +3219,9 @@
     "SelectsShowSearchTitle": "Drop-down box with search box",
     "SelectsShowSearchIntro": "Controls whether the search box is displayed by setting the <code>ShowSearch</code> property, which is not displayed by default <b>false</b>. You can set the <code>IsAutoClearSearchTextWhenCollapsed</code> parameter to control whether the text in the search box is automatically cleared after the drop-down box is collapsed. The default value is <b>false</b>.",
     "SelectsConfirmSelectTitle": "Drop-down box with confirmation",
-    "SelectsConfirmSelectIntro": "Block changes to the current value by setting the <code>OnBeforeSelectedItemChange</code> delegate.",
+    "SelectsConfirmSelectIntro": "Prevent the current value from changing by setting the <code>OnBeforeSelectedItemChange</code> delegate or setting the <code>ShowSwal</code> parameter to <code>true</code>.",
+    "SelectConfifrmSelectDesc1": "Set the <code>OnBeforeSelectedItemChange</code> callback method, and pop up a window in the callback method to confirm whether to change the value. If it returns <code>true</code>, the value will be changed, otherwise it will not be changed.",
+    "SelectConfifrmSelectDesc2": "Set <code>ShowSwal=\"true\"</code> and then confirm the value of the <code>SwalTitle</code> <code>SwalContent</code> parameter using the built-in popup window. In the callback method, you can confirm whether to change the value.",
     "SelectsTimeZoneTitle": "Timezone",
     "SelectsTimeZoneIntro": "Display data of Timezone",
     "SwalTitle": "The drop-down box value changes",
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -3219,7 +3219,9 @@
     "SelectsShowSearchTitle": "带搜索框的下拉框",
     "SelectsShowSearchIntro": "通过设置 <code>ShowSearch</code> 属性控制是否显示搜索框，默认为 <b>false</b> 不显示搜索框，可以通过设置 <code>IsAutoClearSearchTextWhenCollapsed</code> 参数控制下拉框收起后是否自动清空搜索框内文字，默认值为 <b>false</b> 不清空",
     "SelectsConfirmSelectTitle": "带确认的下拉框",
-    "SelectsConfirmSelectIntro": "通过设置 <code>OnBeforeSelectedItemChange</code> 委托，阻止当前值的改变",
+    "SelectsConfirmSelectIntro": "通过设置 <code>OnBeforeSelectedItemChange</code> 委托或者设置 <code>ShowSwal</code> 参数值为 <code>true</code>，阻止当前值的改变。",
+    "SelectConfifrmSelectDesc1": "设置 <code>OnBeforeSelectedItemChange</code> 回调方法，在回调方法内自己弹窗确认是否更改值，返回 <code>true</code> 时更改，否则不更改",
+    "SelectConfifrmSelectDesc2": "设置 <code>ShowSwal=\"true\"</code> 然后通过设置 <code>SwalTitle</code> <code>SwalContent</code> 参数值使用内置弹窗进行确认即可，在回调方法内自己弹窗确认是否更改值",
     "SelectsTimeZoneTitle": "时区下拉框",
     "SelectsTimeZoneIntro": "下拉框展现时区数据",
     "SwalTitle": "下拉框值变更",
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.7.4-beta05</Version>
+    <Version>9.7.4-beta08</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
@@ -18,7 +18,7 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase
 {
     [Inject]
     [NotNull]
-    private ILogger<ErrorLogger>? Logger { get; set; }
+    private ILogger<BootstrapBlazorErrorBoundary>? Logger { get; set; }
 
     [Inject]
     [NotNull]
@@ -48,6 +48,12 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase
     [Parameter]
     public bool ShowToast { get; set; } = true;
 
+    /// <summary>
+    /// 获得/设置 是否启用日志记录功能 默认 true 启用
+    /// </summary>
+    [Parameter]
+    public bool EnableILogger { get; set; } = true;
+
     /// <summary>
     /// 获得/设置 Toast 弹窗标题
     /// </summary>
@@ -61,7 +67,10 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase
     /// <param name="exception"></param>
     protected override Task OnErrorAsync(Exception exception)
     {
-        Logger.LogError(exception, "{BootstrapBlazorErrorBoundary} {OnErrorAsync} log this error occurred at {Page}", nameof(BootstrapBlazorErrorBoundary), nameof(OnErrorAsync), NavigationManager.Uri);
+        if (EnableILogger)
+        {
+            Logger.LogError(exception, "BootstrapBlazorErrorBoundary OnErrorAsync log this error occurred at {Page}", NavigationManager.Uri);
+        }
         return Task.CompletedTask;
     }
 
diff --git a/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs b/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs
@@ -30,6 +30,12 @@ public class ErrorLogger : ComponentBase, IErrorLogger
     [Parameter]
     public bool ShowToast { get; set; } = true;
 
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    [Parameter]
+    public bool EnableILogger { get; set; } = true;
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -112,6 +118,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
         builder.AddAttribute(3, nameof(BootstrapBlazorErrorBoundary.ToastTitle), ToastTitle);
         builder.AddAttribute(4, nameof(BootstrapBlazorErrorBoundary.ErrorContent), ErrorContent);
         builder.AddAttribute(5, nameof(BootstrapBlazorErrorBoundary.ChildContent), ChildContent);
+        builder.AddAttribute(6, nameof(BootstrapBlazorErrorBoundary.EnableILogger), EnableILogger);
         builder.AddComponentReferenceCapture(5, obj => _errorBoundary = (BootstrapBlazorErrorBoundary)obj);
         builder.CloseComponent();
     };
diff --git a/src/BootstrapBlazor/Components/ErrorLogger/IErrorLogger.cs b/src/BootstrapBlazor/Components/ErrorLogger/IErrorLogger.cs
@@ -27,6 +27,12 @@ public interface IErrorLogger
     /// </summary>
     bool ShowToast { get; }
 
+    /// <summary>
+    /// 获得/设置 是否启用日志记录功能 默认 true 启用
+    /// <para>设置 false 后关闭记录日志功能</para>
+    /// </summary>
+    bool EnableILogger { get; }
+
     /// <summary>
     /// 获得 Error Toast 弹窗标题 默认读取资源文件内容
     /// </summary>
diff --git a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.cs b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.cs
@@ -36,10 +36,10 @@ protected override void OnParametersSet()
         var ipSegments = CurrentValueAsString.Split(".", System.StringSplitOptions.RemoveEmptyEntries);
         if (ipSegments.Length == 4)
         {
-            Value1 = ipSegments[0];
-            Value2 = ipSegments[1];
-            Value3 = ipSegments[2];
-            Value4 = ipSegments[3];
+            Value1 = ipSegments[0].Trim();
+            Value2 = ipSegments[1].Trim();
+            Value3 = ipSegments[2].Trim();
+            Value4 = ipSegments[3].Trim();
         }
         else
         {
diff --git a/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.js b/src/BootstrapBlazor/Components/IpAddress/IpAddress.razor.js
@@ -8,9 +8,8 @@ const selectCell = (el, index) => {
     if (index > 3) {
         index = 3
     }
-    const c = el.querySelectorAll(".ipv4-cell")[index]
-    c.focus()
-    return c
+    const cell = el.querySelectorAll(".ipv4-cell")[index];
+    cell.focus();
 }
 
 export function init(id) {
@@ -23,16 +22,26 @@ export function init(id) {
     Data.set(id, ip)
 
     el.querySelectorAll(".ipv4-cell").forEach((c, index) => {
+        EventHandler.on(c, 'compositionend', e => {
+            e.preventDefault();
+            c.value = ip.prevValues[index];
+        });
+        EventHandler.on(c, 'focus', e => {
+            const input = e.target;
+            input.select();
+        });
         EventHandler.on(c, 'keydown', e => {
+            const current = e.target;
             if ((e.keyCode >= 48 && e.keyCode <= 57) || (e.keyCode >= 96 && e.keyCode <= 105)) {
                 // numbers, backup last status
                 ip.prevValues[index] = c.value
                 if (c.value === "0") {
                     c.value = ""
                 }
                 else if (c.selectionStart !== c.selectionEnd) {
-                    const v = c.value.substring(c.selectionStart, c.selectionEnd)
-                    const newVal = c.value.replace(v, e.key)
+                    const v1 = c.value.substring(0, c.selectionStart);
+                    const v2 = c.value.substring(c.selectionEnd, c.value.length);
+                    const newVal = `${v1}${e.key}${v2}`;
                     const num = Number(newVal)
                     if (num > 255) {
                         e.preventDefault()
@@ -47,15 +56,23 @@ export function init(id) {
             }
             else if (e.key === '.') {
                 e.preventDefault()
-                const c = selectCell(el, index + 1)
-                c.select()
+                selectCell(el, index + 1)
             }
             else if (e.key === 'Backspace') {
-                if (c.value.length === 0) {
+                if (c.value.length <= 1) {
                     c.value = "0"
+                    e.preventDefault();
                     selectCell(el, index - 1)
                 }
             }
+            else if (current.selectionStart === current.value.length && (e.code === 'Space' || e.code === 'ArrowRight')) {
+                e.preventDefault()
+                selectCell(el, index + 1)
+            }
+            else if (current.selectionStart === 0 && e.code === 'ArrowLeft') {
+                e.preventDefault()
+                selectCell(el, index - 1)
+            }
             else if (e.key === 'Delete' || e.key === 'Tab' || e.key === 'ArrowLeft' || e.key === 'ArrowRight') {
 
             }
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor b/src/BootstrapBlazor/Components/Layout/Layout.razor
@@ -127,7 +127,7 @@
         else
         {
             <ErrorLogger EnableErrorLogger="@_enableErrorLogger" ShowToast="@_showToast" ToastTitle="@ErrorLoggerToastTitle" 
-                         OnErrorHandleAsync="OnErrorHandleAsync" OnInitializedCallback="OnErrorLoggerInitialized">
+                         EnableILogger="@_enableILogger" OnErrorHandleAsync="OnErrorHandleAsync" OnInitializedCallback="OnErrorLoggerInitialized">
                 @HandlerMain()
             </ErrorLogger>
         }
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
@@ -465,6 +465,12 @@ public partial class Layout : IHandlerException, ITabHeader
     [Parameter]
     public bool? ShowErrorLoggerToast { get; set; }
 
+    /// <summary>
+    /// 获得/设置 是否启用日志记录功能 默认 null 启用 使用 <see cref="BootstrapBlazorOptions.EnableErrorLoggerILogger"/> 设置值
+    /// </summary>
+    [Parameter]
+    public bool? EnableErrorLoggerILogger { get; set; }
+
     /// <summary>
     /// 获得/设置 错误日志 <see cref="Toast"/> 弹窗标题 默认 null
     /// </summary>
@@ -503,6 +509,8 @@ public partial class Layout : IHandlerException, ITabHeader
 
     private bool _showToast => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;
 
+    private bool _enableILogger => EnableErrorLoggerILogger ?? Options.CurrentValue.EnableErrorLoggerILogger;
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
diff --git a/src/BootstrapBlazor/Components/Table/ColumnWidth.cs b/src/BootstrapBlazor/Components/Table/ColumnWidth.cs
@@ -8,7 +8,7 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// 列宽设置类
 /// </summary>
-class ColumnWidth
+struct ColumnWidth
 {
     /// <summary>
     /// 获得/设置 列名称
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -40,7 +40,7 @@
         @if (ShowToolbar)
         {
             <div class="table-toolbar">
-                <TableToolbar GearIcon="@GearIcon" OnGetSelectedRows="@GetSelectedRows" IsAutoCollapsedToolbarButton="IsAutoCollapsedToolbarButton">
+                <TableToolbar GearIcon="@GearIcon" OnGetSelectedRows="@GetSelectedRows" IsAutoCollapsedToolbarButton="IsAutoCollapsedToolbarButton" ShowColorWhenToolbarButtonsCollapsed="ShowColorWhenToolbarButtonsCollapsed">
                     @if (TableToolbarBeforeTemplate != null)
                     {
                         @TableToolbarBeforeTemplate
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Sort.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Sort.cs
@@ -229,7 +229,7 @@ private int MultipleSelectColumnLeft()
 
     private bool IsNotFixedColumn() => !(FixedExtendButtonsColumn && IsExtendButtonsInRowHeader) && !(GetVisibleColumns().FirstOrDefault()?.Fixed ?? false);
 
-    private ConcurrentDictionary<ITableColumn, bool> LastFixedColumnCache { get; } = new();
+    private ConcurrentDictionary<ITableColumn, bool> LastFixedColumnCache { get; } = new(ReferenceEqualityComparer.Instance);
 
     private bool IsLastColumn(ITableColumn col) => LastFixedColumnCache.GetOrAdd(col, col =>
     {
@@ -244,7 +244,7 @@ private bool IsLastColumn(ITableColumn col) => LastFixedColumnCache.GetOrAdd(col
 
     private bool IsLastExtendButtonColumn() => IsExtendButtonsInRowHeader && !GetVisibleColumns().Any(i => i.Fixed);
 
-    private ConcurrentDictionary<ITableColumn, bool> FirstFixedColumnCache { get; } = new();
+    private ConcurrentDictionary<ITableColumn, bool> FirstFixedColumnCache { get; } = new(ReferenceEqualityComparer.Instance);
 
     private bool IsFirstColumn(ITableColumn col) => FirstFixedColumnCache.GetOrAdd(col, col =>
     {
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
@@ -166,6 +166,12 @@ public partial class Table<TItem>
     [Parameter]
     public bool IsAutoCollapsedToolbarButton { get; set; } = true;
 
+    /// <summary>
+    /// 获得/设置 工具栏按钮收缩后是否继承原先按钮的颜色样式和中空化 默认 false
+    /// </summary>
+    [Parameter]
+    public bool ShowColorWhenToolbarButtonsCollapsed { get; set; }
+
     /// <summary>
     /// 获得/设置 工具栏移动端按钮图标
     /// </summary>
@@ -1102,7 +1108,7 @@ private void ResetDynamicContext()
             FirstFixedColumnCache.Clear();
             LastFixedColumnCache.Clear();
 
-            InternalResetVisibleColumns();
+            InternalResetVisibleColumns(Columns);
 
             var queryOption = BuildQueryPageOptions();
             // 设置是否为首次查询
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.scss b/src/BootstrapBlazor/Components/Table/Table.razor.scss
diff --git a/src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs b/src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs
diff --git a/src/BootstrapBlazor/Options/BootstrapBlazorOptions.cs b/src/BootstrapBlazor/Options/BootstrapBlazorOptions.cs
diff --git a/test/UnitTest/Components/LayoutTest.cs b/test/UnitTest/Components/LayoutTest.cs
diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,10 @@ protected override void OnParametersSet()`
`36`	`36`	`var ipSegments = CurrentValueAsString.Split(".", System.StringSplitOptions.RemoveEmptyEntries);`
`37`	`37`	`if (ipSegments.Length == 4)`
`38`	`38`	`{`
`39`		`- Value1 = ipSegments[0];`
`40`		`- Value2 = ipSegments[1];`
`41`		`- Value3 = ipSegments[2];`
`42`		`- Value4 = ipSegments[3];`
	`39`	`+ Value1 = ipSegments[0].Trim();`
	`40`	`+ Value2 = ipSegments[1].Trim();`
	`41`	`+ Value3 = ipSegments[2].Trim();`
	`42`	`+ Value4 = ipSegments[3].Trim();`
`43`	`43`	`}`
`44`	`44`	`else`
`45`	`45`	`{`