Browse Source

Merge pull request #16308 from abpframework/auto-merge/rel-7-2/1877

Merge branch dev with rel-7.2
pull/16309/head
maliming 4 years ago
committed by GitHub
parent
commit
8cc4e2d649
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/AbpInputTagHelperService.cs
  2. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
  3. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs

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

@ -269,7 +269,7 @@ public class AbpInputTagHelperService : AbpTagHelperService<AbpInputTagHelper>
var label = new TagBuilder("label"); var label = new TagBuilder("label");
label.Attributes.Add("for", GetIdAttributeValue(inputTag)); label.Attributes.Add("for", GetIdAttributeValue(inputTag));
label.InnerHtml.AppendHtml(TagHelper.Label); label.InnerHtml.AppendHtml(_encoder.Encode(TagHelper.Label));
label.AddCssClass(isCheckbox ? "form-check-label" : "form-label"); label.AddCssClass(isCheckbox ? "form-check-label" : "form-label");

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

@ -183,7 +183,7 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
var label = new TagBuilder("label"); var label = new TagBuilder("label");
label.AddCssClass("form-label"); label.AddCssClass("form-label");
label.Attributes.Add("for", GetIdAttributeValue(selectTag)); label.Attributes.Add("for", GetIdAttributeValue(selectTag));
label.InnerHtml.AppendHtml(TagHelper.Label); label.InnerHtml.AppendHtml(_encoder.Encode(TagHelper.Label));
return label.ToHtmlString() + GetRequiredSymbol(context, output); return label.ToHtmlString() + GetRequiredSymbol(context, output);
} }

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

@ -502,7 +502,7 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
var label = new TagBuilder("label"); var label = new TagBuilder("label");
label.Attributes.Add("for", GetIdAttributeValue(inputTag)); label.Attributes.Add("for", GetIdAttributeValue(inputTag));
label.InnerHtml.AppendHtml(TagHelper.Label); label.InnerHtml.AppendHtml(Encoder.Encode(TagHelper.Label));
label.AddCssClass("form-label"); label.AddCssClass("form-label");

Loading…
Cancel
Save