From 5c68affedb5a1571ae405f02a787ef6339171185 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Tue, 22 Dec 2020 11:47:15 +0800
Subject: [PATCH 1/5] Improved permission management modal performance

---
 .../PermissionManagementModal.cshtml          | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
index dd2c73eb23..f9de308033 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
@@ -20,25 +20,28 @@
             <abp-tabs name="PermissionsTabs" tab-style="PillVertical" vertical-header-size="_4" class="custom-scroll-container">
                 @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>
+                    var group = Model.Groups[i];
+                    <abp-tab title="@group.DisplayName" name="v-pills-tab-@group.GetNormalizedGroupName()">
+                        <h4>@group.DisplayName</h4>
                         <hr class="mt-2 mb-3"/>
                         <div class="custom-scroll-content">
                             <div class="pl-1 pt-1">
-                                <abp-input asp-for="@Model.Groups[i].IsAllPermissionsGranted" name="SelectAllInThisTab"
-                                           id="SelectAllInThisTab-@Model.Groups[i].GetNormalizedGroupName()"
-                                           data-tab-id="v-pills-tab-@Model.Groups[i].GetNormalizedGroupName()"
+                                <abp-input asp-for="@group.IsAllPermissionsGranted" name="SelectAllInThisTab"
+                                           id="SelectAllInThisTab-@group.GetNormalizedGroupName()"
+                                           data-tab-id="v-pills-tab-@group.GetNormalizedGroupName()"
                                            label="@L["SelectAllInThisTab"].Value"/>
                                 <hr class="mb-3"/>
-                                @for (var j = 0; j < Model.Groups[i].Permissions.Count; j++)
+                                @for (var j = 0; j < group.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"/>
+                                    var permission = group.Permissions[j];
+                                    <abp-input asp-for="@permission.IsGranted"
+                                               name="Groups[@(i)].Permissions[@(j)].IsGranted"
+                                               label="@permission.GetShownName(Model.ProviderName)"
+                                               disabled="@permission.IsDisabled(Model.ProviderName)"
+                                               group-data-permission-name="@permission.Name"
+                                               group-data-parent-name="@(permission.ParentName ?? "")"
+                                               group-style="margin-left: @(permission.Depth * 20)px"/>
+                                    <input asp-for="@permission.Name" id="Groups_@(i)__Permissions@(j).Name" name="Groups[@(i)].Permissions[@(j)].Name"/>
                                 }
                             </div>
                         </div>

From 01a84b3a38e585ad9878a161cfd4abb253b09806 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Tue, 22 Dec 2020 13:39:25 +0800
Subject: [PATCH 2/5] Update PermissionManagementModal

---
 .../AbpPermissionManagement/PermissionManagementModal.cshtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
index f9de308033..ff8f96c890 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
@@ -41,7 +41,7 @@
                                                group-data-permission-name="@permission.Name"
                                                group-data-parent-name="@(permission.ParentName ?? "")"
                                                group-style="margin-left: @(permission.Depth * 20)px"/>
-                                    <input asp-for="@permission.Name" id="Groups_@(i)__Permissions@(j).Name" name="Groups[@(i)].Permissions[@(j)].Name"/>
+                                    <input asp-for="@permission.Name" id="Groups_@(i)__Permissions_@(j)__Name" name="Groups[@(i)].Permissions[@(j)].Name"/>
                                 }
                             </div>
                         </div>

From aef5ffc2590a720ba4123b2fbd88341867005379 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Tue, 22 Dec 2020 13:42:44 +0800
Subject: [PATCH 3/5] Update PermissionManagementModal

---
 .../AbpPermissionManagement/PermissionManagementModal.cshtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
index ff8f96c890..1f9ab1ab91 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
@@ -41,7 +41,7 @@
                                                group-data-permission-name="@permission.Name"
                                                group-data-parent-name="@(permission.ParentName ?? "")"
                                                group-style="margin-left: @(permission.Depth * 20)px"/>
-                                    <input asp-for="@permission.Name" id="Groups_@(i)__Permissions_@(j)__Name" name="Groups[@(i)].Permissions[@(j)].Name"/>
+                                    <input asp-for="@permission.Name" name="Groups[@(i)].Permissions[@(j)].Name"/>
                                 }
                             </div>
                         </div>

From 863b3f936fd5ce2db45dba7e78dcdbe3b29e047e Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Tue, 22 Dec 2020 15:35:43 +0800
Subject: [PATCH 4/5] Update PermissionManagementModal

---
 .../AbpPermissionManagement/PermissionManagementModal.cshtml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
index 1f9ab1ab91..661c50677b 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
@@ -35,6 +35,7 @@
                                 {
                                     var permission = group.Permissions[j];
                                     <abp-input asp-for="@permission.IsGranted"
+                                               id="Groups_@(i)__Permissions_@(j)__IsGranted"
                                                name="Groups[@(i)].Permissions[@(j)].IsGranted"
                                                label="@permission.GetShownName(Model.ProviderName)"
                                                disabled="@permission.IsDisabled(Model.ProviderName)"

From b55c26399329c9383a6322002e7436a0c273b9a8 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Tue, 22 Dec 2020 20:46:04 +0800
Subject: [PATCH 5/5] Use AbpIdNameTagHelper

---
 .../AbpPermissionManagement/PermissionManagementModal.cshtml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
index 661c50677b..6d573b2ecb 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
@@ -35,14 +35,13 @@
                                 {
                                     var permission = group.Permissions[j];
                                     <abp-input asp-for="@permission.IsGranted"
-                                               id="Groups_@(i)__Permissions_@(j)__IsGranted"
-                                               name="Groups[@(i)].Permissions[@(j)].IsGranted"
+                                               abp-id-name="@Model.Groups[i].Permissions[j].IsGranted"
                                                label="@permission.GetShownName(Model.ProviderName)"
                                                disabled="@permission.IsDisabled(Model.ProviderName)"
                                                group-data-permission-name="@permission.Name"
                                                group-data-parent-name="@(permission.ParentName ?? "")"
                                                group-style="margin-left: @(permission.Depth * 20)px"/>
-                                    <input asp-for="@permission.Name" name="Groups[@(i)].Permissions[@(j)].Name"/>
+                                    <input asp-for="@permission.Name" abp-id-name="@Model.Groups[i].Permissions[j].Name"/>
                                 }
                             </div>
                         </div>