Merge branch 'feat-table' into refactor-table

# Conflicts:
#	src/BootstrapBlazor/Components/Table/Table.razor.Checkbox.cs

Author: ArgoZhang

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

@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
 
+using System.Text.Json;
+
 namespace BootstrapBlazor.Components;
 
 public partial class Table<TItem>

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

@@ -502,7 +502,7 @@ public async Task AddAsync()
         {
             // 数据源为 DataTable 新建后重建行与列
             await DynamicContext.AddAsync(SelectedRows.OfType<IDynamicObject>());
-            ResetDynamicContext();
+            await ResetDynamicContext();
 
             if (!IsKeepSelectedRowAfterAdd)
             {
@@ -1030,7 +1030,7 @@ protected async Task DeleteAsync()
         if (DynamicContext != null)
         {
             await DynamicContext.DeleteAsync(SelectedRows.OfType<IDynamicObject>());
-            ResetDynamicContext();
+            await ResetDynamicContext();
             SelectedRows.Clear();
             await OnSelectedRowsChanged();
         }
@@ -1098,7 +1098,7 @@ async Task<bool> DeleteItemsAsync()
         }
     }
 
-    private void ResetDynamicContext()
+    private async Task ResetDynamicContext()
     {
         if (DynamicContext != null)
         {
@@ -1112,7 +1112,7 @@ private void ResetDynamicContext()
             FirstFixedColumnCache.Clear();
             LastFixedColumnCache.Clear();
 
-            InternalResetVisibleColumns(Columns);
+            await InternalResetVisibleColumns(Columns);
 
             var queryOption = BuildQueryPageOptions();
             // 设置是否为首次查询

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

@@ -1225,7 +1225,7 @@ private async Task ProcessFirstRender()
             await OnColumnCreating(cols);
         }
 
-        InternalResetVisibleColumns(cols);
+        await InternalResetVisibleColumns(cols);
 
         await ReloadColumnVisibleFromBrowserAsync();
 
@@ -1278,9 +1278,33 @@ private void ResetColumnWidth(List<ITableColumn> columns)
         }
     }
 
-    private void InternalResetVisibleColumns(List<ITableColumn> columns, IEnumerable<ColumnVisibleItem>? items = null)
+    private async Task InternalResetVisibleColumns(List<ITableColumn> columns, IEnumerable<ColumnVisibleItem>? items = null)
     {
         var cols = columns.Select(i => new ColumnVisibleItem(i.GetFieldName(), i.GetVisible()) { DisplayName = i.GetDisplayName() }).ToList();
+        List<ColumnVisibleItem>? ret = null;
+        if (ClientTableName != null && ShowColumnList)
+        {
+            var jsonData = await JSRuntime.InvokeAsync<string>("localStorage.getItem", "bb-table-column-visiable-" + ClientTableName);
+            if (!string.IsNullOrEmpty(jsonData))
+            {
+                try
+                {
+                    ret = JsonSerializer.Deserialize<List<ColumnVisibleItem>>(jsonData, _serializerOption);
+                }
+                catch { }
+                if(ret != null)
+                {
+                    foreach (var i in ret)
+                    {
+                        var col = cols.FirstOrDefault(d => d.Name == i.Name && d.DisplayName == i.DisplayName);
+                        if (col != null)
+                        {
+                            col.Visible = i.Visible;
+                        }
+                    }
+                }
+            }
+        }
         if (items != null)
         {
             foreach (var column in cols)
@@ -1304,15 +1328,15 @@ private void InternalResetVisibleColumns(List<ITableColumn> columns, IEnumerable
     /// 设置 列可见方法
     /// </summary>
     /// <param name="columns"></param>
-    public void ResetVisibleColumns(IEnumerable<ColumnVisibleItem> columns)
+    public async Task ResetVisibleColumns(IEnumerable<ColumnVisibleItem> columns)
     {
         // https://github.com/dotnetcore/BootstrapBlazor/issues/6823
         if (AllowResizing)
         {
             _resetColumns = true;
         }
 
-        InternalResetVisibleColumns(Columns, columns);
+        await InternalResetVisibleColumns(Columns, columns);
         StateHasChanged();
     }