Browse Source

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

Resolve #17948
pull/17960/head
maliming 3 years ago
parent
commit
5381c9e722
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardTagHelper.cs
  2. 6
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Card/AbpCardTagHelperService.cs
  3. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs
  4. 8
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
  5. 4
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelper.cs
  6. 9
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
  7. 14
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelper.cs
  8. 14
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs

2
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 AbpCardBorderColorType Border { get; set; } = AbpCardBorderColorType.Default;
public bool AddMarginBottomClass { get; set; } = true;
public AbpCardTagHelper(AbpCardTagHelperService tagHelperService) public AbpCardTagHelper(AbpCardTagHelperService tagHelperService)
: base(tagHelperService) : base(tagHelperService)
{ {

6
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) public override void Process(TagHelperContext context, TagHelperOutput output)
{ {
output.TagName = "div"; output.TagName = "div";
output.Attributes.AddClass("card mb-3"); output.Attributes.AddClass("card");
if (TagHelper.AddMarginBottomClass)
{
output.Attributes.AddClass("mb-3");
}
SetBorder(context, output); SetBorder(context, output);
} }

2
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 CheckBoxHiddenInputRenderMode? CheckBoxHiddenInputRenderMode { get; set; }
public bool AddMarginBottomClass { get; set; } = true;
public AbpInputTagHelper(AbpInputTagHelperService tagHelperService) public AbpInputTagHelper(AbpInputTagHelperService tagHelperService)
: base(tagHelperService) : base(tagHelperService)
{ {

8
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("form-floating");
} }
output.Attributes.AddClass(isCheckBox ? "mb-2" : "mb-3"); if (TagHelper.AddMarginBottomClass)
{
output.Attributes.AddClass(isCheckBox ? "mb-2" : "mb-3");
}
if (isCheckBox) if (isCheckBox)
{ {
output.Attributes.AddClass("custom-checkbox"); 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) 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 + Environment.NewLine + innerHtml + Environment.NewLine +
"</div>"; "</div>";
} }

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

9
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("form-floating");
} }
output.Attributes.AddClass("mb-3");
if (TagHelper.AddMarginBottomClass)
{
output.Attributes.AddClass("mb-3");
}
output.TagMode = TagMode.StartTagAndEndTag; output.TagMode = TagMode.StartTagAndEndTag;
output.Content.SetHtmlContent(innerHtml); output.Content.SetHtmlContent(innerHtml);
} }
@ -79,7 +83,8 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
protected virtual string SurroundInnerHtmlAndGet(TagHelperContext context, TagHelperOutput output, string innerHtml) 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) protected virtual async Task<TagHelperOutput> GetSelectTagAsync(TagHelperContext context, TagHelperOutput output, TagHelperContent childContent)

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

14
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> public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelperService<TTagHelper>
where TTagHelper : AbpDatePickerBaseTagHelper<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 => typeof(string), o =>
@ -42,7 +42,7 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
{ {
return dt.ToString("O"); return dt.ToString("O");
} }
return string.Empty; return string.Empty;
} }
}, },
@ -54,7 +54,7 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
{ {
return dto.ToString("O"); return dto.ToString("O");
} }
return string.Empty; return string.Empty;
} }
}, },
@ -161,7 +161,10 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
output.TagMode = TagMode.StartTagAndEndTag; output.TagMode = TagMode.StartTagAndEndTag;
output.TagName = "div"; output.TagName = "div";
LeaveOnlyGroupAttributes(context, output); LeaveOnlyGroupAttributes(context, output);
output.Attributes.AddClass("mb-3"); if (TagHelper.AddMarginBottomClass)
{
output.Attributes.AddClass("mb-3");
}
output.Content.AppendHtml(innerHtml); output.Content.AppendHtml(innerHtml);
} }
@ -224,7 +227,8 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
protected virtual string SurroundInnerHtmlAndGet(TagHelperContext context, TagHelperOutput output, string innerHtml) 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 + Environment.NewLine + innerHtml + Environment.NewLine +
"</div>"; "</div>";
} }

Loading…
Cancel
Save