Merge pull request #17960 from abpframework/AddMarginBottomClass

Add `AddMarginBottomClass` to remove the `mb` class.

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardTagHelper.cs

@@ -4,6 +4,8 @@ public class AbpCardTagHelper : AbpTagHelper<AbpCardTagHelper, AbpCardTagHelperS
 {
     public AbpCardBorderColorType Border { get; set; } = AbpCardBorderColorType.Default;
 
+    public bool AddMarginBottomClass  { get; set; } = true;
+
     public AbpCardTagHelper(AbpCardTagHelperService tagHelperService)
         : base(tagHelperService)
     {

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardTagHelperService.cs

@@ -8,7 +8,11 @@ public class AbpCardTagHelperService : AbpTagHelperService<AbpCardTagHelper>
     public override void Process(TagHelperContext context, TagHelperOutput output)
     {
         output.TagName = "div";
-        output.Attributes.AddClass("card mb-3");
+        output.Attributes.AddClass("card");
+        if (TagHelper.AddMarginBottomClass)
+        {
+            output.Attributes.AddClass("mb-3");
+        }
 
         SetBorder(context, output);
     }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs

@@ -52,6 +52,8 @@ public class AbpInputTagHelper : AbpTagHelper<AbpInputTagHelper, AbpInputTagHelp
 
     public CheckBoxHiddenInputRenderMode? CheckBoxHiddenInputRenderMode { get; set; }
 
+    public bool AddMarginBottomClass  { get; set; } = true;
+
     public AbpInputTagHelper(AbpInputTagHelperService tagHelperService)
         : base(tagHelperService)
     {

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs

@@ -58,7 +58,10 @@ public class AbpInputTagHelperService : AbpTagHelperService<AbpInputTagHelper>
             {
                 output.Attributes.AddClass("form-floating");
             }
-            output.Attributes.AddClass(isCheckBox ? "mb-2" : "mb-3");
+            if (TagHelper.AddMarginBottomClass)
+            {
+                output.Attributes.AddClass(isCheckBox ? "mb-2" : "mb-3");
+            }
             if (isCheckBox)
             {
                 output.Attributes.AddClass("custom-checkbox");
@@ -110,7 +113,8 @@ public class AbpInputTagHelperService : AbpTagHelperService<AbpInputTagHelper>
 
     protected virtual string SurroundInnerHtmlAndGet(TagHelperContext context, TagHelperOutput output, string innerHtml, bool isCheckbox)
     {
-        return "<div class=\"" + (isCheckbox ? "custom-checkbox custom-control mb-2 form-check" : "mb-3") + "\">" +
+        var mb = TagHelper.AddMarginBottomClass ? (isCheckbox ? "mb-2" : "mb-3") : string.Empty;
+        return "<div class=\"" + (isCheckbox ? $"custom-checkbox custom-control {mb} form-check" : $"{mb}") + "\">" +
                 Environment.NewLine + innerHtml + Environment.NewLine +
                 "</div>";
     }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelper.cs

@@ -37,7 +37,7 @@ public class AbpSelectTagHelper : AbpTagHelper<AbpSelectTagHelper, AbpSelectTagH
     public string? AutocompleteSelectedItemName { get; set; }
 
     public string? AutocompleteSelectedItemValue { get; set; }
-    
+
     public string? AutocompleteParentSelector { get; set; }
 
     public string? AllowClear { get; set; }
@@ -48,6 +48,8 @@ public class AbpSelectTagHelper : AbpTagHelper<AbpSelectTagHelper, AbpSelectTagH
 
     public bool FloatingLabel { get; set; }
 
+    public bool AddMarginBottomClass  { get; set; } = true;
+
     public AbpSelectTagHelper(AbpSelectTagHelperService tagHelperService)
         : base(tagHelperService)
     {

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs

@@ -59,7 +59,11 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
             {
                 output.Attributes.AddClass("form-floating");
             }
-            output.Attributes.AddClass("mb-3");
+
+            if (TagHelper.AddMarginBottomClass)
+            {
+                output.Attributes.AddClass("mb-3");
+            }
             output.TagMode = TagMode.StartTagAndEndTag;
             output.Content.SetHtmlContent(innerHtml);
         }
@@ -79,7 +83,8 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
 
     protected virtual string SurroundInnerHtmlAndGet(TagHelperContext context, TagHelperOutput output, string innerHtml)
     {
-        return "<div class=\"mb-3\">" + Environment.NewLine + innerHtml + Environment.NewLine + "</div>";
+        var mb3 = TagHelper.AddMarginBottomClass ? "mb-3" : string.Empty;
+        return $"<div class=\"{mb3}\">" + Environment.NewLine + innerHtml + Environment.NewLine + "</div>";
     }
 
     protected virtual async Task<TagHelperOutput> GetSelectTagAsync(TagHelperContext context, TagHelperOutput output, TagHelperContent childContent)

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelper.cs

@@ -21,20 +21,20 @@ public abstract class
 
     public bool LabelTooltipHtml { get; set; } = false;
 
-    [HtmlAttributeName("info")] 
+    [HtmlAttributeName("info")]
     public string? InfoText { get; set; }
 
-    [HtmlAttributeName("disabled")] 
+    [HtmlAttributeName("disabled")]
     public bool IsDisabled { get; set; } = false;
 
-    [HtmlAttributeName("readonly")] 
+    [HtmlAttributeName("readonly")]
     public bool? IsReadonly { get; set; } = false;
 
     public bool AutoFocus { get; set; }
 
     public AbpFormControlSize Size { get; set; } = AbpFormControlSize.Default;
 
-    [HtmlAttributeName("required-symbol")] 
+    [HtmlAttributeName("required-symbol")]
     public bool DisplayRequiredSymbol { get; set; } = true;
 
     public string? Name { get; set; }
@@ -43,11 +43,13 @@ public abstract class
 
     public bool SuppressLabel { get; set; }
 
+    public bool AddMarginBottomClass  { get; set; } = true;
+
     protected AbpDatePickerBaseTagHelper(AbpDatePickerBaseTagHelperService<TTagHelper> service) : base(service)
     {
         _abpDatePickerOptionsImplementation = new AbpDatePickerOptions();
     }
-    
+
     public void SetDatePickerOptions(IAbpDatePickerOptions options)
     {
         _abpDatePickerOptionsImplementation = options;
@@ -217,4 +219,4 @@ public abstract class
         get => _abpDatePickerOptionsImplementation.Options;
         set => _abpDatePickerOptionsImplementation.Options = value;
     }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs

@@ -22,7 +22,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form.DatePicker;
 public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelperService<TTagHelper>
     where TTagHelper : AbpDatePickerBaseTagHelper<TTagHelper>
 {
-    protected readonly Dictionary<Type, Func<object, string>> SupportedInputTypes = new() 
+    protected readonly Dictionary<Type, Func<object, string>> SupportedInputTypes = new()
     {
         {
             typeof(string), o =>
@@ -42,7 +42,7 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
                 {
                     return dt.ToString("O");
                 }
-                
+
                 return string.Empty;
             }
         },
@@ -54,7 +54,7 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
                 {
                     return dto.ToString("O");
                 }
-                
+
                 return string.Empty;
             }
         },
@@ -161,7 +161,10 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
         output.TagMode = TagMode.StartTagAndEndTag;
         output.TagName = "div";
         LeaveOnlyGroupAttributes(context, output);
-        output.Attributes.AddClass("mb-3");
+        if (TagHelper.AddMarginBottomClass)
+        {
+            output.Attributes.AddClass("mb-3");
+        }
 
         output.Content.AppendHtml(innerHtml);
     }
@@ -224,7 +227,8 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
 
     protected virtual string SurroundInnerHtmlAndGet(TagHelperContext context, TagHelperOutput output, string innerHtml)
     {
-        return "<div class=\"mb-3\">" +
+        var mb = TagHelper.AddMarginBottomClass ? "mb-3" : string.Empty;
+        return $"<div class=\"{mb}\">" +
                Environment.NewLine + innerHtml + Environment.NewLine +
                "</div>";
     }