diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
index 87c2c0db91..7992764c00 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
@@ -37,22 +37,25 @@
@if (_groups != null && _groups.Any())
{
-
+
@foreach (var group in _groups)
{
@if (group.Permissions.Any(x => x.IsGranted))
{
-
- @group.DisplayName ( @(group.Permissions.Count(x => x.IsGranted)) )
-
+ @group.DisplayName (@(group.Permissions.Count(x => x.IsGranted)))
}
else
{
-
- @group.DisplayName ( @(group.Permissions.Count(x => x.IsGranted)) )
-
+
+ @group.DisplayName (@(group.Permissions.Count(x => x.IsGranted)))
+
}
}
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
index d2c2e092d5..cd3be870a1 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
@@ -58,7 +58,7 @@ public partial class PermissionManagementModal
var result = await PermissionAppService.GetAsync(_providerName, _providerKey);
_entityDisplayName = entityDisplayName ?? result.EntityDisplayName;
- _allGroups = result.Groups;
+ _allGroups = result.Groups.OrderBy(x => x.DisplayName).ToList();
_groups = _allGroups.ToList();
NormalizePermissionGroup();
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.css b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.css
index f6870a7a16..a0b6579faf 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.css
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.css
@@ -15,7 +15,7 @@ fieldset legend {
}
::deep .lpx-scroll-pills-container ul li {
- border: 1px solid #e8eef3;
+ border: 1px solid var(--lpx-border-color);
margin-bottom: 10px;
border-radius: 10px;
}
@@ -26,6 +26,15 @@ fieldset legend {
background-color: #6c5dd3 !important;
}
-::deep .lpx-theme-dark .lpx-scroll-pills-container ul li {
- border: 1px solid #23262a;
-}
\ No newline at end of file
+::deep .nav-pills .nav-link {
+ background: none;
+ border: 0;
+ border-radius: var(--bs-nav-pills-border-radius);
+}
+
+::deep .nav-pills .nav-link:disabled {
+ color: var(--bs-nav-link-disabled-color);
+ background-color: transparent;
+ border-color: transparent;
+}
+