From ae40e9d75e80caaa4b4e248f76b481900819b188 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 10 Nov 2021 21:17:43 +0800
Subject: [PATCH 1/2] Nullable `CheckBoxHiddenInputRenderMode`.

Resolve #10593
---
 .../TagHelpers/Form/AbpInputTagHelper.cs                      | 2 +-
 .../TagHelpers/Form/AbpInputTagHelperService.cs               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs
index 268e5acf6d..fdab58203a 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs
@@ -38,7 +38,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
         public bool SuppressLabel { get; set; }
 
-        public CheckBoxHiddenInputRenderMode CheckBoxHiddenInputRenderMode { get; set; }
+        public CheckBoxHiddenInputRenderMode? CheckBoxHiddenInputRenderMode { get; set; }
 
         public AbpInputTagHelper(AbpInputTagHelperService tagHelperService)
             : base(tagHelperService)
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
index 90dbc5f198..6dc050b118 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
@@ -30,9 +30,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
         {
             var (innerHtml, isCheckBox) = await GetFormInputGroupAsHtmlAsync(context, output);
 
-            if (isCheckBox)
+            if (isCheckBox && TagHelper.CheckBoxHiddenInputRenderMode.HasValue)
             {
-                TagHelper.ViewContext.CheckBoxHiddenInputRenderMode = TagHelper.CheckBoxHiddenInputRenderMode;
+                TagHelper.ViewContext.CheckBoxHiddenInputRenderMode = TagHelper.CheckBoxHiddenInputRenderMode.Value;
             }
 
             var order = TagHelper.AspFor.ModelExplorer.GetDisplayOrder();

From c828a87c2eb33ead4c9f7462076db9b8a5d399fe Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 10 Nov 2021 22:01:55 +0800
Subject: [PATCH 2/2] Update PermissionManagementModal.cshtml

---
 .../PermissionManagementModal.cshtml                        | 6 +++---
 1 file changed, 3 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 c5dfed0c20..02743d2f3d 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
@@ -13,7 +13,7 @@
     <abp-modal size="Large">
         <abp-modal-header title="@(L["Permissions"].Value) - @Model.EntityDisplayName"></abp-modal-header>
         <abp-modal-body class="custom-scroll-container">
-            <abp-input asp-for="SelectAllInAllTabs" check-box-hidden-input-render-mode="None" label="@L["SelectAllInAllTabs"].Value"/>
+            <abp-input asp-for="SelectAllInAllTabs" check-box-hidden-input-render-mode="CheckBoxHiddenInputRenderMode.None" label="@L["SelectAllInAllTabs"].Value"/>
             <hr class="mt-2 mb-2"/>
             <input asp-for="@Model.ProviderKey"/>
             <input asp-for="@Model.ProviderName"/>
@@ -27,7 +27,7 @@
                         <div class="w-100" style="max-height: 640px;overflow-y: auto">
                             <div class="pl-1 pt-1">
                                 <abp-input asp-for="@group.IsAllPermissionsGranted"
-                                           check-box-hidden-input-render-mode="None"
+                                           check-box-hidden-input-render-mode="CheckBoxHiddenInputRenderMode.None"
                                            name="SelectAllInThisTab"
                                            id="SelectAllInThisTab-@group.GetNormalizedGroupName()"
                                            data-tab-id="v-pills-tab-@group.GetNormalizedGroupName()"
@@ -37,7 +37,7 @@
                                 {
                                     var permission = group.Permissions[j];
                                     <abp-input asp-for="@permission.IsGranted"
-                                               check-box-hidden-input-render-mode="None"
+                                               check-box-hidden-input-render-mode="CheckBoxHiddenInputRenderMode.None"
                                                abp-id-name="@Model.Groups[i].Permissions[j].IsGranted"
                                                label="@permission.GetShownName(Model.ProviderName)"
                                                disabled="@permission.IsDisabled(Model.ProviderName)"