fix(EditorForm): use GroupOrder group (#8030)

* refactor: 更改回使用 GroupOrder 分组

* chore: bump version 10.6.2-beta01

* test: 增加单元测试

Author: ArgoZhang

src/BootstrapBlazor/BootstrapBlazor.csproj

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

src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs

@@ -232,7 +232,7 @@ public partial class EditorForm<TModel> : IShowLabel, IDisposable
 
     private IEnumerable<KeyValuePair<string, IOrderedEnumerable<IEditorItem>>> GroupItems => RenderItems
         .Where(i => !string.IsNullOrEmpty(i.GroupName) && i.IsVisible(ItemChangedType, IsSearch.Value))
-        .GroupBy(i => i.GroupName).OrderBy(i => i.Key)
+        .GroupBy(i => i.GroupOrder).OrderBy(i => i.Key)
         .Select(i => new KeyValuePair<string, IOrderedEnumerable<IEditorItem>>(i.First().GroupName!, i.OrderBy(x => x.Order)));
 
     private List<IEditorItem>? _itemsCache;

test/UnitTest/Components/EditorFormTest.cs

@@ -587,7 +587,7 @@ public void GroupName_Order_Ok(bool showUnsetGroupItemsOnTop)
                 builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.Text), "Test-Text");
                 builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.Order), 1);
                 builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.GroupName), "Test-Group-1");
-                builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.GroupOrder), 1);
+                builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.GroupOrder), 2);
                 builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.EditTemplate), new RenderFragment<Foo>(foo => builder => builder.AddContent(0, "Test")));
                 builder.CloseComponent();
 
@@ -597,7 +597,7 @@ public void GroupName_Order_Ok(bool showUnsetGroupItemsOnTop)
                 builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.Text), "Test-Address");
                 builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.Order), 1);
                 builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.GroupName), "Test-Group-2");
-                builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.GroupOrder), 2);
+                builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.GroupOrder), 1);
                 builder.CloseComponent();
 
                 builder.OpenComponent<EditorItem<Foo, bool>>(index++);
@@ -608,6 +608,11 @@ public void GroupName_Order_Ok(bool showUnsetGroupItemsOnTop)
                 builder.CloseComponent();
             });
         });
+
+        var groups = cut.FindAll(".legend");
+        Assert.Equal(2, groups.Count);
+        Assert.Equal("Test-Group-2", groups[0].TextContent);
+        Assert.Equal("Test-Group-1", groups[1].TextContent);
     }
 
     private static RenderFragment<Foo> GenerateEditorItems(Foo foo) => f => builder =>