Browse Source

Merge pull request #24102 from abpframework/auto-merge/rel-10-0/4099

Merge branch dev with rel-10.0
article/angular-multithreading
Ma Liming 3 months ago
committed by GitHub
parent
commit
07139c2be3
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
  2. 2
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor

2
modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml

@ -41,7 +41,7 @@
<h4>@featureGroup.DisplayName</h4>
<hr class="mt-2 mb-3"/>
<div class="custom-scroll-content" style="height: 400px;">
<div class="pl-1 pt-1">
<div class="ps-1 pt-1">
@for (var j = 0; j < featureGroup.Features.Count; j++)
{
var feature = featureGroup.Features[j];

2
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor

@ -64,7 +64,7 @@
@foreach (var group in _groups)
{
<TabPanel Name="@GetNormalizedGroupName(group.Name)">
<div class="w-100" style="height: 500px;overflow-y: auto">
<div class="w-100 ps-1" style="height: 500px;overflow-y: auto">
<Field>
<Check
Disabled="@(IsPermissionGroupDisabled(group))"

Loading…
Cancel
Save