Browse Source

Merge pull request #8810 from abpframework/maliming/CheckBoxHiddenInputRenderMode

Add CheckBoxHiddenInputRenderMode to input tag helper.
pull/8811/head
liangshiwei 6 years ago
committed by GitHub
parent
commit
d878b3ebb4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs
  2. 5
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
  3. 9
      modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs

@ -38,6 +38,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
public bool SuppressLabel { get; set; } public bool SuppressLabel { get; set; }
public CheckBoxHiddenInputRenderMode CheckBoxHiddenInputRenderMode { get; set; }
public AbpInputTagHelper(AbpInputTagHelperService tagHelperService) public AbpInputTagHelper(AbpInputTagHelperService tagHelperService)
: base(tagHelperService) : base(tagHelperService)
{ {

5
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs

@ -30,6 +30,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
{ {
var (innerHtml, isCheckBox) = await GetFormInputGroupAsHtmlAsync(context, output); var (innerHtml, isCheckBox) = await GetFormInputGroupAsHtmlAsync(context, output);
if (isCheckBox)
{
TagHelper.ViewContext.CheckBoxHiddenInputRenderMode = TagHelper.CheckBoxHiddenInputRenderMode;
}
var order = TagHelper.AspFor.ModelExplorer.GetDisplayOrder(); var order = TagHelper.AspFor.ModelExplorer.GetDisplayOrder();
AddGroupToFormGroupContents( AddGroupToFormGroupContents(

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

@ -1,4 +1,4 @@
@page @page
@using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.AspNetCore.Mvc.Localization
@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
@using Volo.Abp.PermissionManagement.Localization @using Volo.Abp.PermissionManagement.Localization
@ -13,7 +13,7 @@
<abp-modal size="Large"> <abp-modal size="Large">
<abp-modal-header title="@(L["Permissions"].Value) - @Model.EntityDisplayName"></abp-modal-header> <abp-modal-header title="@(L["Permissions"].Value) - @Model.EntityDisplayName"></abp-modal-header>
<abp-modal-body class="custom-scroll-container"> <abp-modal-body class="custom-scroll-container">
<abp-input asp-for="SelectAllInAllTabs" label="@L["SelectAllInAllTabs"].Value"/> <abp-input asp-for="SelectAllInAllTabs" check-box-hidden-input-render-mode="None" label="@L["SelectAllInAllTabs"].Value"/>
<hr class="mt-2 mb-2"/> <hr class="mt-2 mb-2"/>
<input asp-for="@Model.ProviderKey"/> <input asp-for="@Model.ProviderKey"/>
<input asp-for="@Model.ProviderName"/> <input asp-for="@Model.ProviderName"/>
@ -26,7 +26,9 @@
<hr class="mt-2 mb-3"/> <hr class="mt-2 mb-3"/>
<div class="custom-scroll-content"> <div class="custom-scroll-content">
<div class="pl-1 pt-1"> <div class="pl-1 pt-1">
<abp-input asp-for="@group.IsAllPermissionsGranted" name="SelectAllInThisTab" <abp-input asp-for="@group.IsAllPermissionsGranted"
check-box-hidden-input-render-mode="None"
name="SelectAllInThisTab"
id="SelectAllInThisTab-@group.GetNormalizedGroupName()" id="SelectAllInThisTab-@group.GetNormalizedGroupName()"
data-tab-id="v-pills-tab-@group.GetNormalizedGroupName()" data-tab-id="v-pills-tab-@group.GetNormalizedGroupName()"
label="@L["SelectAllInThisTab"].Value"/> label="@L["SelectAllInThisTab"].Value"/>
@ -35,6 +37,7 @@
{ {
var permission = group.Permissions[j]; var permission = group.Permissions[j];
<abp-input asp-for="@permission.IsGranted" <abp-input asp-for="@permission.IsGranted"
check-box-hidden-input-render-mode="None"
abp-id-name="@Model.Groups[i].Permissions[j].IsGranted" abp-id-name="@Model.Groups[i].Permissions[j].IsGranted"
label="@permission.GetShownName(Model.ProviderName)" label="@permission.GetShownName(Model.ProviderName)"
disabled="@permission.IsDisabled(Model.ProviderName)" disabled="@permission.IsDisabled(Model.ProviderName)"

Loading…
Cancel
Save