tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
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
parent
77408cd514 d676a4c470
commit
d5cce61c8a
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
  2. 28
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor

14
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
View File

@ -17,14 +17,12 @@
<ModalBody> <ModalBody>
<Tabs TabPosition="TabPosition.Start" Pills="true" @bind-SelectedTab="@SelectedTabName"> <Tabs TabPosition="TabPosition.Start" Pills="true" @bind-SelectedTab="@SelectedTabName">
<Items> <Items>
<div class="pt-3"> @foreach (var group in Groups)
@foreach (var group in Groups) {
{ <Tab Name="@GetNormalizedGroupName(group.Name)">
<Tab Name="@GetNormalizedGroupName(group.Name)"> <span>@group.DisplayName</span>
<span>@group.DisplayName</span> </Tab>
</Tab> }
}
</div>
</Items> </Items>
<Content> <Content>
@for (var i = 0; i < Groups.Count; i++) @for (var i = 0; i < Groups.Count; i++)

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

@ -24,20 +24,22 @@
</div> </div>
</Items> </Items>
<Content> <Content>
@foreach (var group in SettingComponentCreationContext.Groups) <div class="pt-3">
{ @foreach (var group in SettingComponentCreationContext.Groups)
<TabPanel Name="@GetNormalizedString(group.Id)" class="abp-md-form"> {
@{ <TabPanel Name="@GetNormalizedString(group.Id)" class="abp-md-form">
SettingItemRenders.Add(builder => @{
{ SettingItemRenders.Add(builder =>
builder.OpenComponent(0, group.ComponentType); {
builder.CloseComponent(); builder.OpenComponent(0, group.ComponentType);
}); builder.CloseComponent();
} });
}
@SettingItemRenders.Last() @SettingItemRenders.Last()
</TabPanel> </TabPanel>
} }
</div>
</Content> </Content>
</Tabs> </Tabs>
</CardBody> </CardBody>

Write Preview
Loading…
Cancel
Save