Merge branch 'main' of https://github.com/dotnetcore/BootstrapBlazor

actions-user · actions-user · commit b7d8e109b5c6 · 2025-10-17T01:17:59.000Z
diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="BootstrapBlazor.BarCode" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="9.0.2" />
-    <PackageReference Include="BootstrapBlazor.Chart" Version="9.0.3" />
+    <PackageReference Include="BootstrapBlazor.Chart" Version="9.0.4" />
     <PackageReference Include="BootstrapBlazor.ChatBot" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.3" />
@@ -66,7 +66,7 @@
     <PackageReference Include="BootstrapBlazor.PdfViewer" Version="9.0.6" />
     <PackageReference Include="BootstrapBlazor.Player" Version="9.0.2" />
     <PackageReference Include="BootstrapBlazor.RDKit" Version="9.0.2" />
-    <PackageReference Include="BootstrapBlazor.Region" Version="9.0.1" />
+    <PackageReference Include="BootstrapBlazor.Region" Version="9.0.2" />
     <PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.SmilesDrawer" Version="9.0.2" />
     <PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.3" />
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.11.2</Version>
+    <Version>9.11.3-beta02</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor
@@ -12,7 +12,7 @@
            data-bb-auto-dropdown-focus="@ShowDropdownListOnFocusString" data-bb-debounce="@DurationString"
            data-bb-skip-esc="@SkipEscString" data-bb-skip-enter="@SkipEnterString" data-bb-blur="@TriggerBlurString"
            data-bb-scroll-behavior="@ScrollIntoViewBehaviorString" data-bb-trigger-delete="true"
-           placeholder="@PlaceHolder" disabled="@Disabled" @ref="FocusElement"/>
+           placeholder="@PlaceHolder" disabled="@Disabled" />
     <span class="form-select-append"><i class="@Icon"></i></span>
     <span class="form-select-append ac-loading"><i class="@LoadingIcon"></i></span>
     @if (GetClearable())
diff --git a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs
@@ -132,8 +132,6 @@ protected override void OnParametersSet()
         PlaceHolder ??= Localizer[nameof(PlaceHolder)];
         Icon ??= IconTheme.GetIconByKey(ComponentIcons.AutoCompleteIcon);
         LoadingIcon ??= IconTheme.GetIconByKey(ComponentIcons.LoadingIcon);
-
-        _clientValue = Value;
     }
 
     /// <summary>
diff --git a/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor b/src/BootstrapBlazor/Components/AutoFill/AutoFill.razor
@@ -14,7 +14,7 @@
            data-bb-auto-dropdown-focus="@ShowDropdownListOnFocusString" data-bb-debounce="@DurationString"
            data-bb-skip-esc="@SkipEscString" data-bb-skip-enter="@SkipEnterString"
            data-bb-scroll-behavior="@ScrollIntoViewBehaviorString"
-           placeholder="@PlaceHolder" disabled="@Disabled" @ref="FocusElement" />
+           placeholder="@PlaceHolder" disabled="@Disabled" />
     <span class="form-select-append"><i class="@Icon"></i></span>
     <span class="form-select-append ac-loading"><i class="@LoadingIcon"></i></span>
     @if (GetClearable())
diff --git a/src/BootstrapBlazor/Components/Cascader/Cascader.razor.cs b/src/BootstrapBlazor/Components/Cascader/Cascader.razor.cs
@@ -203,7 +203,7 @@ private void SetDefaultValue(string defaultValue)
 
     private string? ClassString => CssBuilder.Default("select cascade menu dropdown")
         .AddClass("disabled", IsDisabled)
-        .AddClass("cls", IsClearable)
+        .AddClass("is-clearable", IsClearable)
         .AddClass(CssClass).AddClass(ValidCss)
         .Build();
 
diff --git a/src/BootstrapBlazor/Components/Input/BootstrapInput.razor b/src/BootstrapBlazor/Components/Input/BootstrapInput.razor
@@ -27,5 +27,5 @@ else
     @<input @attributes="@AdditionalAttributes" type="@Type" id="@Id" class="@ClassName"
             readonly="@ReadonlyString" disabled="@Disabled"
             placeholder="@PlaceHolder"
-            @bind-value="CurrentValueAsString" @bind-value:event="@EventString" @onblur="@OnBlur" @ref="FocusElement" />;
+            @bind-value="CurrentValueAsString" @bind-value:event="@EventString" @onblur="@OnBlur" />;
 }
diff --git a/src/BootstrapBlazor/Components/Input/BootstrapInput.razor.js b/src/BootstrapBlazor/Components/Input/BootstrapInput.razor.js
@@ -1,5 +1,12 @@
 ﻿import EventHandler from "../../modules/event-handler.js"
 
+export function focus(id) {
+    const el = document.getElementById(id)
+    if (el) {
+        el.focus();
+    }
+}
+
 export function clear(id) {
     const el = document.getElementById(id)
     if (el) {
diff --git a/src/BootstrapBlazor/Components/Input/BootstrapInputBase.cs b/src/BootstrapBlazor/Components/Input/BootstrapInputBase.cs
@@ -19,11 +19,6 @@ public abstract class BootstrapInputBase<TValue> : ValidateBase<TValue>
         .AddClass(CssClass).AddClass(ValidCss)
         .Build();
 
-    /// <summary>
-    /// Gets or sets Element reference instance
-    /// </summary>
-    protected ElementReference FocusElement { get; set; }
-
     /// <summary>
     /// Gets or sets the placeholder attribute value
     /// </summary>
@@ -102,7 +97,7 @@ public abstract class BootstrapInputBase<TValue> : ValidateBase<TValue>
     /// Method to focus the element
     /// </summary>
     /// <returns></returns>
-    public async Task FocusAsync() => await FocusElement.FocusAsync();
+    public async Task FocusAsync() => await InvokeVoidAsync("focus", GetInputId());
 
     /// <summary>
     /// Method to select all text
diff --git a/src/BootstrapBlazor/Components/Input/FloatingLabel.razor b/src/BootstrapBlazor/Components/Input/FloatingLabel.razor
@@ -3,6 +3,6 @@
 @inherits BootstrapInputBase<TValue>
 
 <div class="@ClassString">
-    <input @attributes="@AdditionalAttributes" type="@Type" id="@Id" placeholder="@PlaceHolder" class="@ClassName" disabled="@Disabled" @bind-value="@CurrentValueAsString" @onblur="@OnBlur" @ref="FocusElement" />
+    <input @attributes="@AdditionalAttributes" type="@Type" id="@Id" placeholder="@PlaceHolder" class="@ClassName" disabled="@Disabled" @bind-value="@CurrentValueAsString" @onblur="@OnBlur" />
     <label for="@Id">@DisplayText</label>
 </div>
diff --git a/src/BootstrapBlazor/Components/InputNumber/BootstrapInputNumber.razor b/src/BootstrapBlazor/Components/InputNumber/BootstrapInputNumber.razor
@@ -25,5 +25,5 @@ else
 
 @code {
     RenderFragment RenderInput =>
-    @<input @attributes="AdditionalAttributes" step="@StepString" min="@Min" max="@Max" id="@Id" type="number" placeholder="@PlaceHolder" class="@InputClassString" disabled="@Disabled" @bind-value="@CurrentValueAsString" @bind-value:event="@EventString" @onblur="@OnBlur" @ref="FocusElement" />;
+    @<input @attributes="AdditionalAttributes" step="@StepString" min="@Min" max="@Max" id="@Id" type="number" placeholder="@PlaceHolder" class="@InputClassString" disabled="@Disabled" @bind-value="@CurrentValueAsString" @bind-value:event="@EventString" @onblur="@OnBlur" />;
 }
diff --git a/src/BootstrapBlazor/Components/Search/Search.razor b/src/BootstrapBlazor/Components/Search/Search.razor
@@ -29,7 +29,7 @@
                    data-bb-skip-esc="@SkipEscString" data-bb-skip-enter="@SkipEnterString" data-bb-blur="@TriggerBlurString"
                    data-bb-scroll-behavior="@ScrollIntoViewBehaviorString"
                    data-bb-input="@UseInputString"
-                   placeholder="@PlaceHolder" disabled="@Disabled" @ref="FocusElement" />
+                   placeholder="@PlaceHolder" disabled="@Disabled" />
             @if (IsClearable)
             {
                 <div class="search-clear-icon">
diff --git a/src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs b/src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs
@@ -213,6 +213,11 @@ protected override void OnParametersSet()
                 var list = _currentValue.Split(',', StringSplitOptions.RemoveEmptyEntries);
                 SelectedItems.AddRange(Rows.Where(item => list.Any(i => i.Trim() == item.Value)));
             }
+
+            if (SelectedItems.Count == 0)
+            {
+                _lastSelectedValueString = string.Empty;
+            }
         }
     }
 
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -725,11 +725,6 @@
                 <div class="@LineCellClassString">@GetLineNo(item)</div>
             </td>
         }
-        @{
-            var index = 0;
-            var colIndex = 0;
-            var isInCell = InCellMode && SelectedRows.FirstOrDefault() == item;
-        }
         @if (ShowExtendButtons && IsExtendButtonsInRowHeader)
         {
             @RenderRowExtendButtons(item)
@@ -741,94 +736,59 @@
         }
         else
         {
-            @foreach (var col in GetVisibleColumns())
-            {
-                if (colIndex > 1)
-                {
-                    colIndex--;
-                    continue;
-                }
-                var cellClass = "";
-                var colSpan = 0;
-                string? value = null;
-                RenderFragment? valueTemplate = null;
-                if (col.OnCellRender != null)
-                {
-                    var cell = new TableCellArgs { Row = item, ColumnName = col.GetFieldName() };
-                    col.OnCellRender(cell);
-                    cellClass = cell.Class;
-                    colSpan = cell.Colspan;
-                    valueTemplate = cell.ValueTemplate;
-                    value = cell.Value;
-                    colIndex = colSpan;
-                }
-                <td colspan="@GetColSpan(colSpan)" class="@GetFixedCellClassString(col, cellClass)" style="@GetFixedCellStyleString(col)">
-                    @{
-                        var isFirstColOfTree = IsTree && index++ == 0;
-                        var degree = 0;
-                        var isExpend = false;
-                        var hasChildren = false;
-                        if (isFirstColOfTree)
-                        {
-                            var treeItem = TreeNodeCache.Find(TreeRows, item, out degree);
-                            if(treeItem != null)
-                            {
-                                isExpend = treeItem.IsExpand;
-                                hasChildren = treeItem.HasChildren;
-                            }
-                        }
-                        var hesTreeChildren = isFirstColOfTree && hasChildren;
-                    }
-                    <DynamicElement TagName="div" TriggerClick="@hesTreeChildren"
-                                    OnClick="@ToggleTreeRow(item)" StopPropagation="hesTreeChildren"
-                                    class="@GetCellClassString(col, hesTreeChildren, isInCell)" style="@GetCellStyleString(col)">
-                        @if (isFirstColOfTree)
-                        {
-                            <div class="is-node" style="@GetTreeStyleString(degree)">
-                            @if (hesTreeChildren)
-                            {
-                                <i class="@GetTreeClassString(isExpend)"></i>
-                            }
-                            </div>
-                        }
-                        @if (IsExcel)
-                        {
-                            @RenderExcelCell(col, item, ItemChangedType.Update)
-                        }
-                        else if(isInCell)
-                        {
-                            @RenderCell(col, EditModel, AddInCell ? ItemChangedType.Add : ItemChangedType.Update)
-                        }
-                        else
-                        {
-                            var triggerDoubleClick = OnDoubleClickCellCallback != null;
-                            <DynamicElement TagName="div" TriggerDoubleClick="triggerDoubleClick" GenerateElement="false"
-                                            OnDoubleClick="TriggerDoubleClickCell(col, item)" StopPropagation="true"
-                                            class="@GetDoubleClickCellClassString(triggerDoubleClick)">
-                                @if (valueTemplate != null)
-                                {
-                                    @valueTemplate
-                                }
-                                else if (value != null)
-                                {
-                                    @value
-                                }
-                                else
-                                {
-                                    @GetValue(col, item)
-                                }
-                            </DynamicElement>
-                        }
-                    </DynamicElement>
-                </td>
-            }
+            @RenderContentRow(item);
         }
         @if (ShowExtendButtons && !IsExtendButtonsInRowHeader)
         {
             @RenderRowExtendButtons(item)
         }
     </DynamicElement>;
 
+    RenderFragment<TableContentCellContext<TItem>> RenderContentCell => context =>
+    @<td colspan="@GetColSpan(context.Colspan)" class="@GetFixedCellClassString(context.Col, context.CellClass)" style="@GetFixedCellStyleString(context.Col)">
+        <DynamicElement TagName="div" TriggerClick="@context.HasTreeChildren"
+                        OnClick="@ToggleTreeRow(context.Item)" StopPropagation="context.HasTreeChildren"
+                        class="@GetCellClassString(context.Col, context.HasTreeChildren, context.IsInCell)" style="@GetCellStyleString(context.Col)">
+            @if (context.IsFirstColOfTree)
+            {
+                <div class="is-node" style="@GetTreeStyleString(context.Degree)">
+                @if (context.HasTreeChildren)
+                {
+                    <i class="@GetTreeClassString(context.IsExpand)"></i>
+                }
+                </div>
+            }
+            @if (IsExcel)
+            {
+                @RenderExcelCell(context.Col, context.Item, ItemChangedType.Update)
+            }
+            else if(context.IsInCell)
+            {
+                @RenderCell(context.Col, EditModel, AddInCell ? ItemChangedType.Add : ItemChangedType.Update)
+            }
+            else
+            {
+                var triggerDoubleClick = OnDoubleClickCellCallback != null;
+                <DynamicElement TagName="div" TriggerDoubleClick="triggerDoubleClick" GenerateElement="false"
+                                OnDoubleClick="TriggerDoubleClickCell(context.Col, context.Item)" StopPropagation="true"
+                                class="@GetDoubleClickCellClassString(triggerDoubleClick)">
+                    @if (context.ValueTemplate != null)
+                    {
+                        @context.ValueTemplate
+                    }
+                    else if (context.Value != null)
+                    {
+                        @context.Value
+                    }
+                    else
+                    {
+                        @GetValue(context.Col, context.Item)
+                    }
+                </DynamicElement>
+            }
+        </DynamicElement>
+    </td>;
+
     RenderFragment<PlaceholderContext> RenderPlaceholderRow => context =>
     @<tr>
         @if (IsMultipleSelect)
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
@@ -1305,10 +1305,7 @@ protected async Task LoopQueryAsync()
         try
         {
             AutoRefreshCancelTokenSource ??= new();
-            // 自动刷新功能
             await Task.Delay(AutoRefreshInterval, AutoRefreshCancelTokenSource.Token);
-
-            // 不调用 QueryAsync 防止出现 Loading 动画 保持屏幕静止
             await QueryAsync();
             StateHasChanged();
         }
@@ -1367,6 +1364,74 @@ protected RenderFragment GetValue(ITableColumn col, TItem item) => builder =>
     };
     #endregion
 
+    private RenderFragment RenderContentRow(TItem item) => builder =>
+    {
+        var index = 0;
+        var colIndex = 0;
+        var isInCell = InCellMode && SelectedRows.FirstOrDefault() == item;
+
+        foreach (var col in GetVisibleColumns())
+        {
+            if (colIndex > 1)
+            {
+                // 合并单元格情况
+                colIndex--;
+                continue;
+            }
+
+            // 获得单元格参数
+            var cellArgs = GetCellArgs(item, col, ref colIndex);
+
+            // 获得树节点信息
+            var (isTreeCol, degree, isExpand, hasChildren) = GetTreeInfo(item, index++);
+            var hasTreeChildren = isTreeCol && hasChildren;
+
+            var context = new TableContentCellContext<TItem>()
+            {
+                Item = item,
+                Col = col,
+                Colspan = cellArgs.Colspan,
+                CellClass = cellArgs.Class,
+                Value = cellArgs.Value,
+                ValueTemplate = cellArgs.ValueTemplate,
+                HasTreeChildren = hasTreeChildren,
+                IsInCell = isInCell,
+                Degree = degree,
+                IsExpand = isExpand,
+                IsFirstColOfTree = isTreeCol
+            };
+
+            builder.AddContent(0, RenderContentCell(context));
+        }
+    };
+
+    private static TableCellArgs GetCellArgs(TItem item, ITableColumn col, ref int colIndex)
+    {
+        var cell = new TableCellArgs { Row = item, ColumnName = col.GetFieldName() };
+        col.OnCellRender?.Invoke(cell);
+        colIndex = cell.Colspan;
+        return cell;
+    }
+
+    private (bool isFirstColOfTree, int degree, bool isExpand, bool hasChildren) GetTreeInfo(TItem item, int index)
+    {
+        var isFirstColOfTree = IsTree && index == 0;
+        if (!isFirstColOfTree)
+        {
+            return (false, 0, false, false);
+        }
+
+        var treeItem = TreeNodeCache.Find(TreeRows, item, out var degree);
+        var isExpand = false;
+        var hasChildren = false;
+        if (treeItem != null)
+        {
+            isExpand = treeItem.IsExpand;
+            hasChildren = treeItem.HasChildren;
+        }
+        return (isFirstColOfTree, degree, isExpand, hasChildren);
+    }
+
     /// <summary>
     /// 渲染单元格方法
     /// </summary>
diff --git a/src/BootstrapBlazor/Components/Table/TableContentCellContext.cs b/src/BootstrapBlazor/Components/Table/TableContentCellContext.cs
diff --git a/src/BootstrapBlazor/Components/Textarea/Textarea.razor b/src/BootstrapBlazor/Components/Textarea/Textarea.razor

Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,6 @@ protected override void OnParametersSet()`
`132`	`132`	`PlaceHolder ??= Localizer[nameof(PlaceHolder)];`
`133`	`133`	`Icon ??= IconTheme.GetIconByKey(ComponentIcons.AutoCompleteIcon);`
`134`	`134`	`LoadingIcon ??= IconTheme.GetIconByKey(ComponentIcons.LoadingIcon);`
`135`		`-`
`136`		`- _clientValue = Value;`
`137`	`135`	`}`
`138`	`136`
`139`	`137`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@ else`
`27`	`27`	`@<input @attributes="@AdditionalAttributes" type="@Type" id="@Id" class="@ClassName"`
`28`	`28`	`readonly="@ReadonlyString" disabled="@Disabled"`
`29`	`29`	`placeholder="@PlaceHolder"`
`30`		`- @bind-value="CurrentValueAsString" @bind-value:event="@EventString" @onblur="@OnBlur" @ref="FocusElement" />;`
	`30`	`+ @bind-value="CurrentValueAsString" @bind-value:event="@EventString" @onblur="@OnBlur" />;`
`31`	`31`	`}`