fix(Table): column DefaultSortOrder only work on first render (#8062)

* fix(Table): 默认排序仅首次加载时生效

* test: 增加单元测试

* chore: bump version 10.6.4

Author: ArgoZhang

src/BootstrapBlazor/BootstrapBlazor.csproj

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

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

@@ -1126,6 +1126,14 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
             // 构建列信息
             await BuildTableColumnsAsync();
 
+            // set default sortName
+            var col = Columns.Find(i => i is { Sortable: true, DefaultSort: true });
+            if (col != null)
+            {
+                SortName = col.GetFieldName();
+                SortOrder = col.DefaultSortOrder;
+            }
+
             // 调用查询方法渲染 UI
             await QueryAsync(true, 1, false, true, IsAutoQueryFirstRender);
             return;
@@ -1315,14 +1323,6 @@ private async Task BuildTableColumnsAsync()
         Columns.Clear();
         Columns.AddRange(cols.OrderFunc());
 
-        // set default sortName
-        var col = Columns.Find(i => i is { Sortable: true, DefaultSort: true });
-        if (col != null)
-        {
-            SortName = col.GetFieldName();
-            SortOrder = col.DefaultSortOrder;
-        }
-
         // 加载客户端持久化列状态
         ResetTableColumns();
     }

test/UnitTest/Components/TableTest.cs

@@ -3486,6 +3486,59 @@ public async Task Sortable_Ok()
         await cut.InvokeAsync(() => table.Instance.QueryAsync());
     }
 
+    [Fact]
+    public async Task DefaultSortOrder_FirstRenderQuery_Ok()
+    {
+        var sortName = string.Empty;
+        var sortOrder = SortOrder.Unset;
+        var isFirstQuery = false;
+        var localizer = Context.Services.GetRequiredService<IStringLocalizer<Foo>>();
+        var cut = Context.Render<BootstrapBlazorRoot>(pb =>
+        {
+            pb.AddChildContent<Table<Foo>>(pb =>
+            {
+                pb.Add(a => a.RenderMode, TableRenderMode.Table);
+                pb.Add(a => a.OnQueryAsync, option =>
+                {
+                    sortName = option.SortName;
+                    sortOrder = option.SortOrder;
+                    isFirstQuery = option.IsFirstQuery;
+                    var items = Foo.GenerateFoo(localizer, 5);
+                    return Task.FromResult(new QueryData<Foo>()
+                    {
+                        Items = items,
+                        TotalCount = items.Count,
+                        IsAdvanceSearch = true,
+                        IsFiltered = true,
+                        IsSearch = true,
+                        IsSorted = true
+                    });
+                });
+                pb.Add(a => a.TableColumns, foo => builder =>
+                {
+                    builder.OpenComponent<TableColumn<Foo, string>>(0);
+                    builder.AddAttribute(1, "Field", "Name");
+                    builder.AddAttribute(2, "FieldExpression", Utility.GenerateValueExpression(foo, "Name", typeof(string)));
+                    builder.AddAttribute(3, "Sortable", true);
+                    builder.AddAttribute(4, "DefaultSort", true);
+                    builder.AddAttribute(5, "DefaultSortOrder", SortOrder.Desc);
+                    builder.CloseComponent();
+                });
+            });
+        });
+
+        Assert.True(isFirstQuery);
+        Assert.Equal(nameof(Foo.Name), sortName);
+        Assert.Equal(SortOrder.Desc, sortOrder);
+
+        // 模拟点击表头排序
+        var th = cut.Find("th");
+        await cut.InvokeAsync(() => th.Click());
+        Assert.False(isFirstQuery);
+        Assert.Equal(nameof(Foo.Name), sortName);
+        Assert.Equal(SortOrder.Unset, sortOrder);
+    }
+
     [Fact]
     public async Task OnSort_Ok()
     {