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] 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<AbpDynamicFormTagHelper, Abp
     [HtmlAttributeName("abp-model")]
     public ModelExpression Model { get; set; }
 
+    [HtmlAttributeName("abp-column")]
+    public int Column { get; set; }
+
     public bool? SubmitButton { get; set; }
 
     public bool? RequiredSymbols { get; set; } = true;
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 38f55ca04e..0b900a5968 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
@@ -97,11 +97,15 @@ public class AbpDynamicFormTagHelperService : AbpTagHelperService<AbpDynamicForm
     {
         var contentBuilder = new StringBuilder("");
 
+        contentBuilder.AppendLine("<div class=\"row\">");
+
         foreach (var item in items.OrderBy(o => o.Order))
         {
-            contentBuilder.AppendLine(item.HtmlContent);
+            contentBuilder.AppendLine(SetColumn(item.HtmlContent));
         }
 
+        contentBuilder.AppendLine("</div>");
+
         var content = childContent.GetContent();
         if (content.Contains(AbpFormContentPlaceHolder))
         {
@@ -115,6 +119,18 @@ public class AbpDynamicFormTagHelperService : AbpTagHelperService<AbpDynamicForm
         output.Content.SetHtmlContent(content);
     }
 
+    protected virtual string SetColumn(string htmlContent)
+    {
+        if (TagHelper.Column < 2 || TagHelper.Column > 6)
+        {
+            return htmlContent;
+        }
+
+        var col_class = $"col-12 col-sm-" + (12 / TagHelper.Column);
+
+        return $"<div class=\"{col_class}\">{htmlContent}</div>";
+    }
+
     protected virtual async Task SetSubmitButton(TagHelperContext context, TagHelperOutput output)
     {
         if (!TagHelper.SubmitButton ?? true)