tag helpers minor refactor

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

@@ -156,7 +156,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 GetSelectTagHelper(model);
         }
 
-        private AbpTagHelper GetSelectTagHelper(ModelExpression model)
+        protected virtual AbpTagHelper GetSelectTagHelper(ModelExpression model)
         {
             var abpSelectTagHelper = _serviceProvider.GetRequiredService<AbpSelectTagHelper>();
             abpSelectTagHelper.AspFor = model;
@@ -165,7 +165,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             return abpSelectTagHelper;
         }
 
-        private AbpTagHelper GetAbpRadioInputTagHelper(ModelExpression model)
+        protected virtual AbpTagHelper GetAbpRadioInputTagHelper(ModelExpression model)
         {
             var radioButtonAttribute = GetAttribute<AbpRadioButton>(model.ModelExplorer);
             var abpRadioInputTagHelper = _serviceProvider.GetRequiredService<AbpRadioInputTagHelper>();

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelperService.cs

@@ -10,23 +10,31 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid
             output.TagName = "div";
             output.Attributes.AddClass("col");
 
-            ProcessSizeClass(output, TagHelper.Size, "");
-            ProcessSizeClass(output, TagHelper.SizeSm, "-sm");
-            ProcessSizeClass(output, TagHelper.SizeMd, "-md");
-            ProcessSizeClass(output, TagHelper.SizeLg, "-lg");
-            ProcessSizeClass(output, TagHelper.SizeXl, "-xl");
-
-            ProcessOffsetClass(output, TagHelper.Offset, "");
-            ProcessOffsetClass(output, TagHelper.OffsetSm, "-sm");
-            ProcessOffsetClass(output, TagHelper.OffsetMd, "-md");
-            ProcessOffsetClass(output, TagHelper.OffsetLg, "-lg");
-            ProcessOffsetClass(output, TagHelper.OffsetXl, "-xl");
-
-            ProcessColumnOrder(output);
-            ProcessVerticalAlign(output);
+            ProcessSizeClasses(context, output);
+            ProcessOffsetClasses(context, output);
+            ProcessColumnOrder(context, output);
+            ProcessVerticalAlign(context, output);
         }
 
-        protected virtual void ProcessSizeClass(TagHelperOutput output, ColumnSize size, string breakpoint)
+        protected virtual void ProcessSizeClasses(TagHelperContext context, TagHelperOutput output)
+        {
+            ProcessSizeClass(context, output, TagHelper.Size, "");
+            ProcessSizeClass(context, output, TagHelper.SizeSm, "-sm");
+            ProcessSizeClass(context, output, TagHelper.SizeMd, "-md");
+            ProcessSizeClass(context, output, TagHelper.SizeLg, "-lg");
+            ProcessSizeClass(context, output, TagHelper.SizeXl, "-xl");
+        }
+
+        protected virtual void ProcessOffsetClasses(TagHelperContext context, TagHelperOutput output)
+        {
+            ProcessOffsetClass(context, output, TagHelper.Offset, "");
+            ProcessOffsetClass(context, output, TagHelper.OffsetSm, "-sm");
+            ProcessOffsetClass(context, output, TagHelper.OffsetMd, "-md");
+            ProcessOffsetClass(context, output, TagHelper.OffsetLg, "-lg");
+            ProcessOffsetClass(context, output, TagHelper.OffsetXl, "-xl");
+        }
+
+        protected virtual void ProcessSizeClass(TagHelperContext context, TagHelperOutput output, ColumnSize size, string breakpoint)
         {
             if (size == ColumnSize.Undefined)
             {
@@ -47,7 +55,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid
             output.Attributes.AddClass(classString);
         }
 
-        protected virtual void ProcessOffsetClass(TagHelperOutput output, ColumnSize size, string breakpoint)
+        protected virtual void ProcessOffsetClass(TagHelperContext context, TagHelperOutput output, ColumnSize size, string breakpoint)
         {
             if (size == ColumnSize.Undefined)
             {
@@ -68,7 +76,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid
             output.Attributes.AddClass(classString);
         }
 
-        protected virtual void ProcessVerticalAlign(TagHelperOutput output)
+        protected virtual void ProcessVerticalAlign(TagHelperContext context, TagHelperOutput output)
         {
             if (TagHelper.VAlign == VerticalAlign.Default)
             {
@@ -78,7 +86,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid
             output.Attributes.AddClass("align-self-" + TagHelper.VAlign.ToString().ToLowerInvariant());
         }
 
-        protected virtual void ProcessColumnOrder(TagHelperOutput output)
+        protected virtual void ProcessColumnOrder(TagHelperContext context, TagHelperOutput output)
         {
             if (TagHelper.ColumnOrder == ColumnOrder.Undefined)
             {

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelper.cs

@@ -1,11 +0,0 @@
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Label
-{
-    public class AbpLabelTagHelper : AbpTagHelper<AbpLabelTagHelper, AbpLabelTagHelperService>
-    {
-        public AbpLabelTagHelper(AbpLabelTagHelperService tagHelperService)
-            : base(tagHelperService)
-        {
-
-        }
-    }
-}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelperService.cs

@@ -1,12 +0,0 @@
-using Microsoft.AspNetCore.Razor.TagHelpers;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Label
-{
-    public class AbpLabelTagHelperService : AbpTagHelperService<AbpLabelTagHelper>
-    {
-        public override void Process(TagHelperContext context, TagHelperOutput output)
-        {
-            //TODO: fill
-        }
-    }
-}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs

@@ -7,7 +7,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Popover
     {
         public override void Process(TagHelperContext context, TagHelperOutput output)
         {
-            if (!TagHelper.Disabled??true)
+            if (!TagHelper.Disabled ?? true)
             {
                 SetDataToggle(context, output);
                 SetDataPlacement(context, output);
@@ -16,21 +16,17 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Popover
             }
             else
             {
-                SetDisabled(context,output);
+                SetDisabled(context, output);
             }
         }
 
         protected virtual void SetDisabled(TagHelperContext context, TagHelperOutput output)
         {
             var triggerAsHtml = TagHelper.Dismissible ?? false ? "datatrigger=\"focus\" " : "";
-
-            var dataPlacementAsHtml = "data-placement=\"" +GetDirectory().ToString().ToLowerInvariant() + "\" ";
-
+            var dataPlacementAsHtml = "data-placement=\"" + GetDirectory().ToString().ToLowerInvariant() + "\" ";
             var titleAttribute = output.Attributes.FirstOrDefault(at => at.Name == "title");
-            var titleAsHtml = titleAttribute == null? "":"title=\""+ titleAttribute.Value +"\" ";
-
-            var preElementHtml = "<span class=\"d-inline-block\" "+ titleAsHtml + triggerAsHtml + dataPlacementAsHtml + "data-toggle=\"popover\" data-content=\"" +GetDataContent()+"\">";
-
+            var titleAsHtml = titleAttribute == null ? "" : "title=\"" + titleAttribute.Value + "\" ";
+            var preElementHtml = "<span class=\"d-inline-block\" " + titleAsHtml + triggerAsHtml + dataPlacementAsHtml + "data-toggle=\"popover\" data-content=\"" + GetDataContent() + "\">";
             var postElementHtml = "</span>";
 
             output.PreElement.SetHtmlContent(preElementHtml);

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/ProgressBar/AbpProgressGroupTagHelperService.cs

@@ -10,6 +10,5 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.ProgressBar
             output.Attributes.AddClass("progress");
             output.TagName = "div";
         }
-        
     }
 }