Merge branch 'master' of https://github.com/volosoft/abp

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml

@@ -14,23 +14,24 @@
         <abp-modal-body>
             <input asp-for="@Model.ProviderKey" />
             <input asp-for="@Model.ProviderName" />
-            <abp-tabs tab-style="PillVertical" vertical-header-size="_4">
+            <abp-tabs name="PermissionsTabs" tab-style="PillVertical" vertical-header-size="_4">
                 @for (var i = 0; i < Model.Groups.Count; i++)
                 {
                     <abp-tab title="@Model.Groups[i].DisplayName" name="v-pills-tab-@Model.Groups[i].GetNormalizedGroupName()">
                         <h4>@Model.Groups[i].DisplayName</h4>
                         <hr class="mt-3 mb-4" />
-
-                        @for (var j = 0; j < Model.Groups[i].Permissions.Count; j++)
-                        {
-                            <abp-input asp-for="@Model.Groups[i].Permissions[j].IsGranted"
-                                       label="@Model.Groups[i].Permissions[j].GetShownName(Model.ProviderName)"
-                                       disabled="@Model.Groups[i].Permissions[j].IsDisabled(Model.ProviderName)"
-                                       group-data-permission-name="@Model.Groups[i].Permissions[j].Name"
-                                       group-data-parent-name="@(Model.Groups[i].Permissions[j].ParentName ?? "")"
-                                       group-style="margin-left: @(Model.Groups[i].Permissions[j].Depth * 20)px" />
-                            <input asp-for="@Model.Groups[i].Permissions[j].Name" />
-                        }
+                        <div class="pl-1 pt-1" style="height: 450px; overflow: auto;">
+                                @for (var j = 0; j < Model.Groups[i].Permissions.Count; j++)
+                                {
+                                    <abp-input asp-for="@Model.Groups[i].Permissions[j].IsGranted"
+                                               label="@Model.Groups[i].Permissions[j].GetShownName(Model.ProviderName)"
+                                               disabled="@Model.Groups[i].Permissions[j].IsDisabled(Model.ProviderName)"
+                                               group-data-permission-name="@Model.Groups[i].Permissions[j].Name"
+                                               group-data-parent-name="@(Model.Groups[i].Permissions[j].ParentName ?? "")"
+                                               group-style="margin-left: @(Model.Groups[i].Permissions[j].Depth * 20)px" />
+                                    <input asp-for="@Model.Groups[i].Permissions[j].Name" />
+                                }
+                        </div>
                     </abp-tab>
                 }
             </abp-tabs>