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 fa3ec9cce6..de8416f9b5 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 @@ -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.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(model.ModelExplorer); var abpRadioInputTagHelper = _serviceProvider.GetRequiredService(); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelperService.cs index b095a8a0a0..e78d59ee82 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelperService.cs +++ b/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) { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelper.cs deleted file mode 100644 index b8b439ff3f..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelper.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Label -{ - public class AbpLabelTagHelper : AbpTagHelper - { - public AbpLabelTagHelper(AbpLabelTagHelperService tagHelperService) - : base(tagHelperService) - { - - } - } -} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelperService.cs deleted file mode 100644 index bca82d56d5..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Label/AbpLabelTagHelperService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Microsoft.AspNetCore.Razor.TagHelpers; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Label -{ - public class AbpLabelTagHelperService : AbpTagHelperService - { - public override void Process(TagHelperContext context, TagHelperOutput output) - { - //TODO: fill - } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs index 30b1ae3017..b7bda04134 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Popover/AbpPopoverTagHelperService.cs +++ b/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 = ""; - + var titleAsHtml = titleAttribute == null ? "" : "title=\"" + titleAttribute.Value + "\" "; + var preElementHtml = ""; var postElementHtml = ""; output.PreElement.SetHtmlContent(preElementHtml); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/ProgressBar/AbpProgressGroupTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/ProgressBar/AbpProgressGroupTagHelperService.cs index 5dd4b8aded..f7ec9f6057 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/ProgressBar/AbpProgressGroupTagHelperService.cs +++ b/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"; } - } } \ No newline at end of file