From 13d2bfb4d259f499a87a7b81ed2f8402970b64a4 Mon Sep 17 00:00:00 2001 From: blackWinds <745673576@qq.com> Date: Tue, 28 Mar 2023 15:43:53 +0800 Subject: [PATCH 1/4] dynamicFormTagHelper add Column attribute --- .../TagHelpers/Form/AbpDynamicformTagHelper.cs | 3 +++ .../Form/AbpDynamicformTagHelperService.cs | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelper.cs index da4a567b5d..5f35731c8b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelper.cs @@ -12,6 +12,9 @@ public class AbpDynamicFormTagHelper : AbpTagHelper"); + foreach (var item in items.OrderBy(o => o.Order)) { - contentBuilder.AppendLine(item.HtmlContent); + contentBuilder.AppendLine(SetColumn(item.HtmlContent)); } + contentBuilder.AppendLine(""); + var content = childContent.GetContent(); if (content.Contains(AbpFormContentPlaceHolder)) { @@ -115,6 +119,18 @@ public class AbpDynamicFormTagHelperService : AbpTagHelperService 6) + { + return htmlContent; + } + + var col_class = $"col-12 col-sm-" + (12 / TagHelper.Column); + + return $"
{htmlContent}
"; + } + protected virtual async Task SetSubmitButton(TagHelperContext context, TagHelperOutput output) { if (!TagHelper.SubmitButton ?? true) From d52778a36676a64d6ea1e227de89d79fd4ff3451 Mon Sep 17 00:00:00 2001 From: blackWinds <745673576@qq.com> Date: Tue, 28 Mar 2023 16:34:10 +0800 Subject: [PATCH 2/4] update Dynamic-Forms document --- docs/en/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md | 4 ++++ docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/en/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md b/docs/en/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md index 0c374a9cf8..0750250fae 100644 --- a/docs/en/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md +++ b/docs/en/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md @@ -108,6 +108,10 @@ See the [dynamic forms demo page](https://bootstrap-taghelpers.abp.io/Components Sets the c# model for dynamic form. Properties of this modal are turned into inputs in the form. +### abp-column + +Set up columns in a dynamic form. The value is between 1~6 . + ### submit-button Can be `True` or `False`. diff --git a/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md b/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md index 5ec349b8b6..17fe65c892 100644 --- a/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md +++ b/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md @@ -110,6 +110,10 @@ public class DynamicFormsModel : PageModel 为动态表单设置c#模型,模型的属性以表单形式转化为输入. +### abp-column + +设置动态表单控件展示列数，值范围：1~6. + ### submit-button 可以为 `True` 或 `False`. From e4bbc1ba9d4eab17f207f1c4e2cb68fd3eb02ddc Mon Sep 17 00:00:00 2001 From: blackWinds <745673576@qq.com> Date: Tue, 11 Apr 2023 18:36:00 +0800 Subject: [PATCH 3/4] Modify the abp-column property name --- docs/en/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md | 4 ++-- docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md | 4 ++-- .../TagHelpers/Form/AbpDynamicformTagHelper.cs | 5 +++-- .../TagHelpers/Form/AbpDynamicformTagHelperService.cs | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/en/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md b/docs/en/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md index 0750250fae..9d996a45dd 100644 --- a/docs/en/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md +++ b/docs/en/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md @@ -108,9 +108,9 @@ See the [dynamic forms demo page](https://bootstrap-taghelpers.abp.io/Components Sets the c# model for dynamic form. Properties of this modal are turned into inputs in the form. -### abp-column +### column-size -Set up columns in a dynamic form. The value is between 1~6 . +Here, use 'col-sm' to set the size . When setting this property 'col-12' will be added at the same time. ### submit-button diff --git a/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md b/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md index 17fe65c892..5672eebe09 100644 --- a/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md +++ b/docs/zh-Hans/UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md @@ -110,9 +110,9 @@ public class DynamicFormsModel : PageModel 为动态表单设置c#模型,模型的属性以表单形式转化为输入. -### abp-column +### column-size -设置动态表单控件展示列数，值范围：1~6. +此处使用 `col-sm` 来设置大小。当设置该属性是会同时添加 `col-12` . ### submit-button diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelper.cs index 5f35731c8b..463cd73971 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelper.cs @@ -3,6 +3,7 @@ using System.ComponentModel; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Razor.TagHelpers; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid; namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form; @@ -12,8 +13,8 @@ public class AbpDynamicFormTagHelper : AbpTagHelper 6) + if (TagHelper.ColumnSize == ColumnSize.Undefined || TagHelper.ColumnSize == ColumnSize._) { return htmlContent; } - var col_class = $"col-12 col-sm-" + (12 / TagHelper.Column); + var col_class = $"col-12 col-sm-" + TagHelper.ColumnSize; return $"
{htmlContent}
"; } From b4060005f46efdbab73ba0351dbda65d49f2583f Mon Sep 17 00:00:00 2001 From: blackWinds <745673576@qq.com> Date: Tue, 11 Apr 2023 19:13:26 +0800 Subject: [PATCH 4/4] Fix the splicing of incorrect parameters --- .../TagHelpers/Form/AbpDynamicformTagHelperService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs index acd718757c..733d56b1f2 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpDynamicformTagHelperService.cs @@ -127,7 +127,7 @@ public class AbpDynamicFormTagHelperService : AbpTagHelperService{htmlContent}"; }