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

Author: ArgoZhang

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);
         }
     }
 
@@ -1101,7 +1101,7 @@ private async Task OnTableRenderAsync(bool firstRender)
 
     private readonly JsonSerializerOptions _serializerOption = new(JsonSerializerDefaults.Web);
 
-    private async Task ReloadColumnWidthFromBrowserAsync()
+    private async Task ReloadColumnWidthFromBrowserAsync(List<ITableColumn> columns)
     {
         List<ColumnWidth>? ret = null;
         if (!string.IsNullOrEmpty(ClientTableName) && AllowResizing)
@@ -1125,6 +1125,8 @@ private async Task ReloadColumnWidthFromBrowserAsync()
             }
         }
         _clientColumnWidths = ret ?? [];
+
+        ResetColumnWidth(columns);
     }
 
     private async Task ReloadColumnOrdersFromBrowserAsync(List<ITableColumn> columns)
@@ -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();
     }