Merge pull request #17010 from abpframework/auto-merge/rel-7-3/2048

Merge branch dev with rel-7.3
abpframework · Jul 3, 2023 · 13fe1e6 · 13fe1e6
2 parents 1d1cf75 + 9e61fd6
commit 13fe1e6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/docs/en/UI/AspNetCore/Tag-Helpers/Form-elements.md b/docs/en/UI/AspNetCore/Tag-Helpers/Form-elements.md
@@ -87,6 +87,7 @@ You can set some of the attributes on your c# property, or directly on HTML tag.
 * `readonly`: Sets the input as read-only.
 * `label`: Sets the label of input.
 * `required-symbol`: Adds the required symbol `(*)` to the label when the input is required. The default value is `True`.
+* `floating-label`: Sets the label as floating label. The default value is `False`.
 
 `asp-format`, `name` and `value` attributes of [Asp.Net Core Input Tag Helper](https://docs.microsoft.com/en-us/aspnet/core/mvc/views/working-with-forms?view=aspnetcore-7.0#the-input-tag-helper) are also valid for `abp-input` tag helper.
 

diff --git a/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Form-elements.md b/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Form-elements.md
@@ -196,6 +196,8 @@ Model:
   - `AbpFormControlSize.Large`
 - `label`: 为输入设置标签。
 - `display-required-symbol`: 如果输入是必需的，则向标签添加必需符号 (*)。默认为 `True`。
+- `floating-label`: 设置输入的标签是否应该是浮动的。默认为 `False`。
+
 
 ### 标签和本地化
 

diff --git a/...work/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs b/...work/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
@@ -101,7 +101,7 @@ protected virtual async Task<string> GetValidationAsHtmlAsync(TagHelperContext c
 
     protected virtual string GetContent(TagHelperContext context, TagHelperOutput output, string label, string inputHtml, string validation, string infoHtml, bool isCheckbox)
     {
-        var innerContent = isCheckbox ?
+        var innerContent = isCheckbox || TagHelper.FloatingLabel ?
             inputHtml + label :
             label + inputHtml;