Merge pull request #23680 from abpframework/auto-merge/rel-9-3/3970

Merge branch dev with rel-9.3

modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor

@@ -13,20 +13,19 @@
 </PageHeader>
 
 <Card>
-    <CardBody Class="pt-0">
+    <CardBody Class="pt-3">
-        <Tabs @bind-SelectedTab="@SelectedGroup" TabPosition="TabPosition.Start" Pills="true" RenderMode="TabsRenderMode.LazyReload" VerticalItemsColumnSize="ColumnSize.Is3.OnDesktop.Is6.OnTablet.Is12.OnMobile">
+        @if (!string.IsNullOrEmpty(SelectedGroup))
-            <Items>
+        {
-                <div class="pt-3">
+            <Tabs @bind-SelectedTab="@SelectedGroup" TabPosition="TabPosition.Start" Pills="true" RenderMode="TabsRenderMode.LazyReload" VerticalItemsColumnSize="ColumnSize.Is3.OnDesktop.Is6.OnTablet.Is12.OnMobile">
+                <Items>
                     @foreach (var group in SettingComponentCreationContext.Groups)
                     {
                         <Tab Name="@GetNormalizedString(group.Id)">
                             @group.DisplayName
                         </Tab>
                     }
-                </div>
+                </Items>
-            </Items>
+                <Content>
-            <Content>
-                <div class="pt-3">
                     @foreach (var group in SettingComponentCreationContext.Groups)
                     {
                         <TabPanel Name="@GetNormalizedString(group.Id)" class="abp-md-form">
@@ -41,8 +40,8 @@
                             @SettingItemRenders.Last()
                         </TabPanel>
                     }
-                </div>
+                </Content>
-            </Content>
+            </Tabs>
-        </Tabs>
+        }
     </CardBody>
 </Card>

modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs

@@ -43,23 +43,12 @@ public partial class SettingManagement
         SettingComponentCreationContext.Normalize();
         SettingItemRenders.Clear();
 
-        if (SettingComponentCreationContext.Groups.Any())
+        if(SelectedGroup.IsNullOrEmpty() && SettingComponentCreationContext.Groups.Any())
         {
             SelectedGroup = GetNormalizedString(SettingComponentCreationContext.Groups.First().Id);
         }
     }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-            await Task.Yield();
-            await InvokeAsync(StateHasChanged);
-        }
-
-        await base.OnAfterRenderAsync(firstRender);
-    }
-
     protected virtual string GetNormalizedString(string value)
     {
         return value.Replace('.', '_');