Merge pull request #18688 from abpframework/auto-merge/rel-8-0/2414

Merge branch dev with rel-8.0
3 years ago · 391820cd22
2 changed files with 6 additions and 1 deletions
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
@ -62,7 +62,7 @@
                                
                                @foreach (var permission in group.Permissions)
                                {
-                                    <Field Style="@($"margin-inline-start: {_permissionDepths[permission.Name] * 20}px")">
+                                    <Field Style="@($"margin-inline-start: {GetPermissionDepthOrDefault(permission.Name) * 20}px")">
                                        <Check
                                            Disabled="@(IsDisabledPermission(permission))"
                                            Cursor="Cursor.Pointer"
--- 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
@ -182,6 +182,11 @@ public partial class PermissionManagementModal
            }
        }
    }
+    
+    protected virtual int GetPermissionDepthOrDefault(string name)
+    {
+        return _permissionDepths.GetValueOrDefault(name, 0);
+    }

    protected virtual void GroupGrantAllChanged(bool value, PermissionGroupDto permissionGroup)
    {