Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch dev with rel-7.3 #17010

Merged
merged 5 commits into from
Jul 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/en/UI/AspNetCore/Tag-Helpers/Form-elements.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 2 additions & 0 deletions docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Form-elements.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ Model:
- `AbpFormControlSize.Large`
- `label`: 为输入设置标签。
- `display-required-symbol`: 如果输入是必需的,则向标签添加必需符号 (*)。默认为 `True`。
- `floating-label`: 设置输入的标签是否应该是浮动的。默认为 `False`。


### 标签和本地化

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading