From 892ec7698a5d12fe4380ac3ad996c0d241fc674f Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 26 Feb 2025 16:57:44 +0800 Subject: [PATCH 1/3] Refactor AbpDatePickerBaseTagHelper to accept IOptions for improved configuration --- .../TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelper.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelper.cs index 64dfdc0fdb..e69c4300e3 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelper.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Razor.TagHelpers; +using Microsoft.Extensions.Options; namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form.DatePicker; @@ -45,9 +46,9 @@ public abstract class public bool AddMarginBottomClass { get; set; } = true; - protected AbpDatePickerBaseTagHelper(AbpDatePickerBaseTagHelperService service) : base(service) + protected AbpDatePickerBaseTagHelper(AbpDatePickerBaseTagHelperService service, IOptions options) : base(service) { - _abpDatePickerOptionsImplementation = new AbpDatePickerOptions(); + _abpDatePickerOptionsImplementation = options.Value; } public void SetDatePickerOptions(IAbpDatePickerOptions options) From ba9cafc2dbfaff374891636b5a6311a4076a0905 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 26 Feb 2025 17:15:46 +0800 Subject: [PATCH 2/3] Refactor AbpDatePickerTagHelper and AbpDateRangePickerTagHelper --- .../TagHelpers/Form/DatePicker/AbpDatePickerTagHelper.cs | 3 ++- .../Form/DatePicker/AbpDateRangePickerTagHelper.cs | 5 +++-- .../AbpAspNetCoreMvcUiThemeBasicDemoModule.cs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelper.cs index e8a8a60b3c..047e6f2720 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelper.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Razor.TagHelpers; +using Microsoft.Extensions.Options; namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form.DatePicker; @@ -8,7 +9,7 @@ public class AbpDatePickerTagHelper : AbpDatePickerBaseTagHelper options) : base(service, options) { } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDateRangePickerTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDateRangePickerTagHelper.cs index 5a052d8877..7ccd3afc80 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDateRangePickerTagHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDateRangePickerTagHelper.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Razor.TagHelpers; +using Microsoft.Extensions.Options; namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form.DatePicker; @@ -10,8 +11,8 @@ public class AbpDateRangePickerTagHelper : AbpDatePickerBaseTagHelper options) : + base(tagHelperService, options) { } } \ No newline at end of file diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs index 4ebeb18498..e835f5f362 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs @@ -55,7 +55,7 @@ public class AbpAspNetCoreMvcUiThemeBasicDemoModule : AbpModule app.UseDeveloperExceptionPage(); } - app.MapAbpStaticAssets(); + app.UseStatic(); app.UseRouting(); app.UseConfiguredEndpoints(); } From 9f54e6fba5ac38bf67e6680bfffa4a84a5ddddaf Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 26 Feb 2025 17:17:20 +0800 Subject: [PATCH 3/3] Update AbpAspNetCoreMvcUiThemeBasicDemoModule.cs --- .../AbpAspNetCoreMvcUiThemeBasicDemoModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs index e835f5f362..4ebeb18498 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs @@ -55,7 +55,7 @@ public class AbpAspNetCoreMvcUiThemeBasicDemoModule : AbpModule app.UseDeveloperExceptionPage(); } - app.UseStatic(); + app.MapAbpStaticAssets(); app.UseRouting(); app.UseConfiguredEndpoints(); }