Browse Source
Merge pull request #23157 from abpframework/auto-merge/rel-9-3/3814
Merge branch dev with rel-9.3
pull/23167/head
maliming
8 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
21 additions and
21 deletions
-
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
-
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor
|
|
|
@ -17,14 +17,12 @@ |
|
|
|
<ModalBody> |
|
|
|
<Tabs TabPosition="TabPosition.Start" Pills="true" @bind-SelectedTab="@SelectedTabName"> |
|
|
|
<Items> |
|
|
|
<div class="pt-3"> |
|
|
|
@foreach (var group in Groups) |
|
|
|
{ |
|
|
|
<Tab Name="@GetNormalizedGroupName(group.Name)"> |
|
|
|
<span>@group.DisplayName</span> |
|
|
|
</Tab> |
|
|
|
} |
|
|
|
</div> |
|
|
|
@foreach (var group in Groups) |
|
|
|
{ |
|
|
|
<Tab Name="@GetNormalizedGroupName(group.Name)"> |
|
|
|
<span>@group.DisplayName</span> |
|
|
|
</Tab> |
|
|
|
} |
|
|
|
</Items> |
|
|
|
<Content> |
|
|
|
@for (var i = 0; i < Groups.Count; i++) |
|
|
|
|
|
|
|
@ -24,20 +24,22 @@ |
|
|
|
</div> |
|
|
|
</Items> |
|
|
|
<Content> |
|
|
|
@foreach (var group in SettingComponentCreationContext.Groups) |
|
|
|
{ |
|
|
|
<TabPanel Name="@GetNormalizedString(group.Id)" class="abp-md-form"> |
|
|
|
@{ |
|
|
|
SettingItemRenders.Add(builder => |
|
|
|
{ |
|
|
|
builder.OpenComponent(0, group.ComponentType); |
|
|
|
builder.CloseComponent(); |
|
|
|
}); |
|
|
|
} |
|
|
|
<div class="pt-3"> |
|
|
|
@foreach (var group in SettingComponentCreationContext.Groups) |
|
|
|
{ |
|
|
|
<TabPanel Name="@GetNormalizedString(group.Id)" class="abp-md-form"> |
|
|
|
@{ |
|
|
|
SettingItemRenders.Add(builder => |
|
|
|
{ |
|
|
|
builder.OpenComponent(0, group.ComponentType); |
|
|
|
builder.CloseComponent(); |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
@SettingItemRenders.Last() |
|
|
|
</TabPanel> |
|
|
|
} |
|
|
|
@SettingItemRenders.Last() |
|
|
|
</TabPanel> |
|
|
|
} |
|
|
|
</div> |
|
|
|
</Content> |
|
|
|
</Tabs> |
|
|
|
</CardBody> |
|
|
|
|
