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

Author: actions-user

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/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) {

src/BootstrapBlazor/wwwroot/modules/upload.js

@@ -93,12 +93,10 @@ export function preview(previewerId, index) {
 export function getPreviewUrl(id, fileName) {
     let url = '';
     const upload = Data.get(id);
-    const { files } = upload;
-    if (files) {
-        const file = [...files].find(v => v.name === fileName);
-        if (file) {
-            url = URL.createObjectURL(file);
-        }
+    const { files, inputFile } = upload;
+    const file = [...(files || inputFile.files)].find(v => v.name === fileName);
+    if (file) {
+        url = URL.createObjectURL(file);
     }
     return url;
 }

test/UnitTest/Components/TableTest.cs

@@ -8383,6 +8383,7 @@ public async Task OnAutoFitColumnWidthCallback_Ok()
                 pb.Add(a => a.AllowDragColumn, true);
                 pb.Add(a => a.ClientTableName, "table-unit-test");
                 pb.Add(a => a.OnQueryAsync, OnQueryAsync(localizer));
+                pb.Add(a => a.FitColumnWidthIncludeHeader, true);
                 pb.Add(a => a.OnAutoFitColumnWidthCallback, (fieldName, calcWidth) =>
                 {
                     name = fieldName;