From b5f936c748ea9bd5550ebee36b8abf341072aca1 Mon Sep 17 00:00:00 2001 From: Salih Date: Thu, 30 Nov 2023 11:11:51 +0300 Subject: [PATCH] Fix floating label --- .../TagHelpers/Form/AbpInputTagHelperService.cs | 4 +++- .../TagHelpers/Form/AbpSelectTagHelperService.cs | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) 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 877fe05e37..37343b72ed 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 @@ -271,7 +271,7 @@ public class AbpInputTagHelperService : AbpTagHelperService if (string.IsNullOrEmpty(TagHelper.Label)) { - return await GetLabelAsHtmlUsingTagHelperAsync(context, output, isCheckbox) + GetRequiredSymbol(context, output); + return await GetLabelAsHtmlUsingTagHelperAsync(context, output, isCheckbox); } var label = new TagBuilder("label"); @@ -392,6 +392,8 @@ public class AbpInputTagHelperService : AbpTagHelperService } innerOutput.Content.AppendHtml($" "); } + + innerOutput.Content.AppendHtml(GetRequiredSymbol(context, output)); return innerOutput.Render(_encoder); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs index 428080db40..b7777f48e0 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs @@ -185,11 +185,12 @@ public class AbpSelectTagHelperService : AbpTagHelperService label.AddCssClass("form-label"); label.Attributes.Add("for", GetIdAttributeValue(selectTag)); label.InnerHtml.AppendHtml(_encoder.Encode(TagHelper.Label)); + label.InnerHtml.AppendHtml(GetRequiredSymbol(context, output)); - return label.ToHtmlString() + GetRequiredSymbol(context, output); + return label.ToHtmlString(); } - return await GetLabelAsHtmlUsingTagHelperAsync(context, output) + GetRequiredSymbol(context, output); + return await GetLabelAsHtmlUsingTagHelperAsync(context, output); } protected virtual string GetRequiredSymbol(TagHelperContext context, TagHelperOutput output) @@ -304,7 +305,11 @@ public class AbpSelectTagHelperService : AbpTagHelperService ViewContext = TagHelper.ViewContext, }; - return await labelTagHelper.RenderAsync(new TagHelperAttributeList { { "class", "form-label" } }, context, _encoder, "label", TagMode.StartTagAndEndTag); + var innerOutput = await labelTagHelper.ProcessAndGetOutputAsync(new TagHelperAttributeList { { "class", "form-label" } }, context, "label", TagMode.StartTagAndEndTag); + + innerOutput.Content.AppendHtml(GetRequiredSymbol(context, output)); + + return innerOutput.Render(_encoder); } protected virtual async Task GetValidationAsHtmlAsync(TagHelperContext context, TagHelperOutput output, TagHelperOutput inputTag)