fix(Table): update table column order in OnColumnCreating not work (#6242)

* bugfix: Table控件中，如果OnColumnCreating回调中修改了Column项的Order，并不会起作用

* revert: 撤销更改

* refactor: 代码格式化

* refactor: 私有变量内部化提高可读性

* refactor: 更改为结构体

* refactor: 使用中间变量传递列集合

* fix: 修复排序逻辑混乱问题

* chore: bump version 9.7.4-beta07

Co-Authored-By: yacper <[email protected]>

---------

Co-authored-by: Argo Zhang <[email protected]>
Co-authored-by: yacper <[email protected]>

Author: yacper

src/BootstrapBlazor/BootstrapBlazor.csproj

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

src/BootstrapBlazor/Components/Table/ColumnWidth.cs

@@ -8,7 +8,7 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// 列宽设置类
 /// </summary>
-class ColumnWidth
+struct ColumnWidth
 {
     /// <summary>
     /// 获得/设置 列名称

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

@@ -1102,7 +1102,7 @@ private void ResetDynamicContext()
             FirstFixedColumnCache.Clear();
             LastFixedColumnCache.Clear();
 
-            InternalResetVisibleColumns();
+            InternalResetVisibleColumns(Columns);
 
             var queryOption = BuildQueryPageOptions();
             // 设置是否为首次查询

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

@@ -963,7 +963,7 @@ protected override void OnParametersSet()
             ResetDynamicContext();
 
             // resize column width;
-            ResetColumnWidth();
+            ResetColumnWidth(Columns);
         }
     }
 
@@ -1022,7 +1022,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
             await InvokeVoidAsync("scrollTo", Id);
         }
 
-        if(_shouldScrollTop)
+        if (_shouldScrollTop)
         {
             _shouldScrollTop = false;
             await InvokeVoidAsync("scrollTo", Id);
@@ -1101,7 +1101,7 @@ private async Task OnTableRenderAsync(bool firstRender)
 
     private readonly JsonSerializerOptions _serializerOption = new(JsonSerializerDefaults.Web);
 
-    private async Task<List<ColumnWidth>> ReloadColumnWidthFromBrowserAsync()
+    private async Task ReloadColumnWidthFromBrowserAsync(List<ITableColumn> columns)
     {
         List<ColumnWidth>? ret = null;
         if (!string.IsNullOrEmpty(ClientTableName) && AllowResizing)
@@ -1124,7 +1124,9 @@ private async Task<List<ColumnWidth>> ReloadColumnWidthFromBrowserAsync()
                 catch { }
             }
         }
-        return ret ?? [];
+        _clientColumnWidths = ret ?? [];
+
+        ResetColumnWidth(columns);
     }
 
     private async Task ReloadColumnOrdersFromBrowserAsync(List<ITableColumn> columns)
@@ -1174,19 +1176,19 @@ private async Task ProcessFirstRender()
         }
 
         await ReloadColumnOrdersFromBrowserAsync(cols);
-        Columns.Clear();
-        Columns.AddRange(cols.OrderFunc());
 
         // 查看是否开启列宽序列化
-        _clientColumnWidths = await ReloadColumnWidthFromBrowserAsync();
-        ResetColumnWidth();
+        await ReloadColumnWidthFromBrowserAsync(cols);
 
         if (OnColumnCreating != null)
         {
-            await OnColumnCreating(Columns);
+            await OnColumnCreating(cols);
         }
 
-        InternalResetVisibleColumns();
+        InternalResetVisibleColumns(cols);
+
+        Columns.Clear();
+        Columns.AddRange(cols.OrderFunc());
 
         // set default sortName
         var col = Columns.Find(i => i is { Sortable: true, DefaultSort: true });
@@ -1222,21 +1224,21 @@ protected override async Task InvokeInitAsync()
         }
     }
 
-    private void ResetColumnWidth()
+    private void ResetColumnWidth(List<ITableColumn> columns)
     {
         foreach (var cw in _clientColumnWidths.Where(c => c.Width > 0))
         {
-            var c = Columns.Find(c => c.GetFieldName() == cw.Name);
+            var c = columns.Find(c => c.GetFieldName() == cw.Name);
             if (c != null)
             {
                 c.Width = cw.Width;
             }
         }
     }
 
-    private void InternalResetVisibleColumns(IEnumerable<ColumnVisibleItem>? items = null)
+    private void InternalResetVisibleColumns(List<ITableColumn> columns, IEnumerable<ColumnVisibleItem>? items = null)
     {
-        var cols = Columns.Select(i => new ColumnVisibleItem(i.GetFieldName(), i.GetVisible()) { DisplayName = i.GetDisplayName() }).ToList();
+        var cols = columns.Select(i => new ColumnVisibleItem(i.GetFieldName(), i.GetVisible()) { DisplayName = i.GetDisplayName() }).ToList();
         if (items != null)
         {
             foreach (var column in cols)
@@ -1262,7 +1264,7 @@ private void InternalResetVisibleColumns(IEnumerable<ColumnVisibleItem>? items =
     /// <param name="columns"></param>
     public void ResetVisibleColumns(IEnumerable<ColumnVisibleItem> columns)
     {
-        InternalResetVisibleColumns(columns);
+        InternalResetVisibleColumns(Columns, columns);
         StateHasChanged();
     }