Browse Source
Merge pull request #10596 from abpframework/maliming/CheckBoxHiddenInputRenderMode
Nullable `CheckBoxHiddenInputRenderMode`.
pull/10603/head
liangshiwei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
6 additions and
6 deletions
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
-
modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
|
|
|
@ -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) |
|
|
|
|
|
|
|
@ -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(); |
|
|
|
|
|
|
|
@ -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)" |
|
|
|
|