Merge branch 'main' into feat-region

Author: ArgoZhang

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.11.2-beta04</Version>
+    <Version>9.11.2-beta07</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Components/Filters/FilterButton.razor

@@ -2,13 +2,15 @@
 @typeparam TValue
 @inherits Dropdown<TValue>
 
-<button type="button" class="btn btn-filter dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-    <i class="@FilterIcon" />
-</button>
-<div class="dropdown-menu shadow">
-    @foreach (var item in Items)
-    {
-        <div class="@ActiveItem(item)" @onclick="e => OnItemClick(item)">@item.Text</div>
-    }
+<div id="@Id" class="bb-filter-btn-group">
+    <button type="button" class="btn btn-filter dropdown-toggle" data-bs-toggle="bb.dropdown" aria-expanded="false">
+        <i class="@FilterIcon" />
+    </button>
+    <div class="dropdown-menu shadow">
+        @foreach (var item in Items)
+        {
+            <div class="@ActiveItem(item)" @onclick="e => OnItemClick(item)">@item.Text</div>
+        }
+    </div>
+    <Button Icon="@ClearIcon" Color="Color.None" class="btn-ban text-danger" OnClickWithoutRender="ClearFilter" />
 </div>
-<Button Icon="@ClearIcon" Color="Color.None" class="btn-ban text-danger" OnClickWithoutRender="ClearFilter" />

src/BootstrapBlazor/Components/Filters/FilterButton.razor.js

@@ -0,0 +1,22 @@
+import Data from "../../modules/data.js"
+import Popover from "../../modules/base-popover.js"
+
+export function init(id) {
+    const el = document.getElementById(id)
+    if (el == null) {
+        return
+    }
+    const popover = Popover.init(el);
+
+    const dropdown = { popover }
+    Data.set(id, dropdown)
+}
+
+export function dispose(id) {
+    const dropdown = Data.get(id)
+    Data.remove(id)
+
+    if (dropdown) {
+        Popover.dispose(dropdown.popover)
+    }
+}

src/BootstrapBlazor/Components/Filters/FilterButton.razor.scss

@@ -0,0 +1,4 @@
+.bb-filter-btn-group {
+    display: flex;
+    flex-wrap: nowrap;
+}

src/BootstrapBlazor/Components/Filters/StringFilter.razor

@@ -4,7 +4,7 @@
 @if (IsHeaderRow)
 {
     <div class="@FilterRowClassString">
-        <BootstrapInput @bind-Value="@_value1" ShowLabel="false" SkipValidate="true"></BootstrapInput>
+        <BootstrapInput Value="@_value1" OnValueChanged="OnValueChanged" ShowLabel="false" SkipValidate="true"></BootstrapInput>
         <FilterButton Items="Items" @bind-Value="_action1" OnSelectedItemChanged="_ => OnFilterAsync()" OnClearFilter="OnClearFilter" />
     </div>
 }

src/BootstrapBlazor/Components/Filters/StringFilter.razor.cs

@@ -128,4 +128,10 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
         }
         await base.SetFilterConditionsAsync(filter);
     }
+
+    private async Task OnValueChanged(string? val)
+    {
+        _value1 = val;
+        await OnFilterAsync();
+    }
 }

src/BootstrapBlazor/Components/Table/Table.razor

@@ -107,7 +107,7 @@
                                 <span class="caret"></span>
                             </button>
                             <div class="dropdown-menu dropdown-menu-end shadow">
-                                @foreach (var item in VisibleColumns)
+                                @foreach (var item in _visibleColumns)
                                 {
                                     <div class="dropdown-item">
                                         <Checkbox ShowAfterLabel="true" DisplayText="@item.DisplayName" IsDisabled="@GetColumnsListState(item)"

src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs

@@ -466,7 +466,7 @@ public Func<TItem, bool>? ShowDeleteButtonCallback
     /// <summary>
     /// 获得/设置 各列是否显示状态集合
     /// </summary>
-    private List<ColumnVisibleItem> VisibleColumns { get; } = [];
+    private readonly List<ColumnVisibleItem> _visibleColumns = [];
 
     /// <summary>
     /// 获得当前可见列集合
@@ -475,11 +475,15 @@ public Func<TItem, bool>? ShowDeleteButtonCallback
     public IEnumerable<ITableColumn> GetVisibleColumns()
     {
         // 不可见列
-        var items = VisibleColumns.Where(i => i.Visible);
-        return Columns.Where(i => !i.GetIgnore() && items.Any(v => v.Name == i.GetFieldName()) && ScreenSize >= i.ShownWithBreakPoint);
+        var items = _visibleColumns.Where(i => i.Visible).Select(a => a.Name).ToHashSet();
+        return Columns.Where(i => !i.GetIgnore() && items.Contains(i.GetFieldName()) && ScreenSize >= i.ShownWithBreakPoint);
     }
 
-    private bool GetColumnsListState(ColumnVisibleItem item) => VisibleColumns.Find(i => i.Name == item.Name) is { Visible: true } && VisibleColumns.Where(i => i.Visible).DistinctBy(i => i.Name).Count(i => i.Visible) == 1;
+    private bool GetColumnsListState(ColumnVisibleItem item)
+    {
+        var items = _visibleColumns.Where(i => i.Visible).Select(a => a.Name).Distinct().ToHashSet();
+        return items.Contains(item.Name) && items.Count == 1;
+    }
 
     private bool ShowAddForm { get; set; }
 

src/BootstrapBlazor/Components/Table/Table.razor.cs

@@ -1276,8 +1276,8 @@ private void InternalResetVisibleColumns(List<ITableColumn> columns, IEnumerable
                 }
             }
         }
-        VisibleColumns.Clear();
-        VisibleColumns.AddRange(cols);
+        _visibleColumns.Clear();
+        _visibleColumns.AddRange(cols);
     }
 
     /// <summary>

src/BootstrapBlazor/Components/Table/Table.razor.js

@@ -747,7 +747,7 @@ const autoFitColumnWidth = async (table, col) => {
         const span = th.querySelector('.table-cell');
         const thStyle = getComputedStyle(th);
         const margin = parseFloat(thStyle.getPropertyValue('padding-left')) + parseFloat(thStyle.getPropertyValue('padding-right'))
-        maxWidth = Math.max(maxWidth, calcCellWidth(span)) + margin;
+        maxWidth = Math.max(maxWidth, calcCellWidth(span) + margin);
     }
 
     if (table.options.autoFitColumnWidthCallback !== null) {