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] 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<AbpDynamicFormTagHelper, Abp
     [HtmlAttributeName("abp-model")]
     public ModelExpression Model { get; set; }
 
-    [HtmlAttributeName("abp-column")]
-    public int Column { get; set; }
+    [HtmlAttributeName("column-size")]
+    public ColumnSize ColumnSize { get; set; }
 
     public bool? SubmitButton { get; set; }
 
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 0b900a5968..acd718757c 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
@@ -14,6 +14,7 @@ using Microsoft.Extensions.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Button;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
 
@@ -121,12 +122,12 @@ public class AbpDynamicFormTagHelperService : AbpTagHelperService<AbpDynamicForm
 
     protected virtual string SetColumn(string htmlContent)
     {
-        if (TagHelper.Column < 2 || TagHelper.Column > 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 $"<div class=\"{col_class}\">{htmlContent}</div>";
     }