Browse Source

Merge pull request #10596 from abpframework/maliming/CheckBoxHiddenInputRenderMode

Nullable `CheckBoxHiddenInputRenderMode`.
pull/10603/head
liangshiwei 5 years ago
committed by GitHub
parent
commit
885b75bb5c
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. 4
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
  3. 6
      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,7 +38,7 @@ 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 CheckBoxHiddenInputRenderMode? CheckBoxHiddenInputRenderMode { get; set; }
public AbpInputTagHelper(AbpInputTagHelperService tagHelperService) public AbpInputTagHelper(AbpInputTagHelperService tagHelperService)
: base(tagHelperService) : base(tagHelperService)

4
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); 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(); var order = TagHelper.AspFor.ModelExplorer.GetDisplayOrder();

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

@ -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" 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"/> <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"/>
@ -27,7 +27,7 @@
<div class="w-100" style="max-height: 640px;overflow-y: auto"> <div class="w-100" style="max-height: 640px;overflow-y: auto">
<div class="pl-1 pt-1"> <div class="pl-1 pt-1">
<abp-input asp-for="@group.IsAllPermissionsGranted" <abp-input asp-for="@group.IsAllPermissionsGranted"
check-box-hidden-input-render-mode="None" check-box-hidden-input-render-mode="CheckBoxHiddenInputRenderMode.None"
name="SelectAllInThisTab" 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()"
@ -37,7 +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" check-box-hidden-input-render-mode="CheckBoxHiddenInputRenderMode.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