From d602a2a3c0113c24bd3cdbd2914d01ce97439ab6 Mon Sep 17 00:00:00 2001 From: wangjun Date: Wed, 5 Jul 2023 21:12:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9Setting=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lion/AbpPro/Core/AbpProSettingConsts.cs | 17 ++++++++ .../Settings/SettingAppService.cs | 6 +-- .../Seeds/AbpSettingDataSeedContributor.cs | 1 - ...asicManagementSettingDefinitionProvider.cs | 43 ++++++++----------- .../Settings/BasicManagementSettings.cs | 12 ------ 5 files changed, 39 insertions(+), 40 deletions(-) create mode 100644 aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/AbpProSettingConsts.cs diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/AbpProSettingConsts.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/AbpProSettingConsts.cs new file mode 100644 index 00000000..b1782f05 --- /dev/null +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/AbpProSettingConsts.cs @@ -0,0 +1,17 @@ +namespace Lion.AbpPro.Core; + +public class AbpProSettingConsts +{ + public const string Prefix = "setting_"; + + /// + /// 前端控件类型 + /// + public static class ControlType + { + public const string Default = "Type"; + public const string TypeText = "Text"; + public const string TypeCheckBox = "CheckBox"; + public const string Number = "Number"; + } +} \ No newline at end of file diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Settings/SettingAppService.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Settings/SettingAppService.cs index 570da059..1e968b59 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Settings/SettingAppService.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Settings/SettingAppService.cs @@ -41,7 +41,7 @@ namespace Lion.AbpPro.BasicManagement.Settings { var value = await SettingProvider.GetOrNullAsync(itemDefinition.Name); var type = itemDefinition.Properties - .FirstOrDefault(f => f.Key == BasicManagementSettings.ControlType.Default).Value + .FirstOrDefault(f => f.Key == AbpProSettingConsts.ControlType.Default).Value .ToString(); item.SettingItemOutput.Add(new SettingItemOutput( @@ -62,12 +62,12 @@ namespace Lion.AbpPro.BasicManagement.Settings { // The key of the settingValues is in camel_Case, like "setting_Abp_Localization_DefaultLanguage", // change it to "Abp.Localization.DefaultLanguage" form - if (!kv.Key.StartsWith(BasicManagementSettings.Prefix)) + if (!kv.Key.StartsWith(AbpProSettingConsts.Prefix)) { continue; } - string name = kv.Key.RemovePreFix(BasicManagementSettings.Prefix); + string name = kv.Key.RemovePreFix(AbpProSettingConsts.Prefix); var setting = _settingDefinitionManager.GetOrNull(name); if (setting == null) { diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Data/Seeds/AbpSettingDataSeedContributor.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Data/Seeds/AbpSettingDataSeedContributor.cs index c8e3e3f2..c307dc30 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Data/Seeds/AbpSettingDataSeedContributor.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Data/Seeds/AbpSettingDataSeedContributor.cs @@ -1,7 +1,6 @@ using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; -using Volo.Abp.Localization; namespace Lion.AbpPro.BasicManagement.Data.Seeds { diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettingDefinitionProvider.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettingDefinitionProvider.cs index 56c54192..50f0aa30 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettingDefinitionProvider.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettingDefinitionProvider.cs @@ -1,16 +1,11 @@ -using Lion.AbpPro.BasicManagement.Localization; -using Volo.Abp.Localization; -using Volo.Abp.Settings; -using Volo.Abp.Timing; - -namespace Lion.AbpPro.BasicManagement.Settings; +namespace Lion.AbpPro.BasicManagement.Settings; public class BasicManagementSettingDefinitionProvider : SettingDefinitionProvider { public override void Define(ISettingDefinitionContext context) { //Define your own settings here. Example: - //context.Add(new SettingDefinition(BasicManagementSettings.MySetting1)); + //context.Add(new SettingDefinition(AbpProSettingConsts.MySetting1)); OverrideDefaultSettings(context); } @@ -22,7 +17,7 @@ public class BasicManagementSettingDefinitionProvider : SettingDefinitionProvide context.GetOrNull(LocalizationSettingNames.DefaultLanguage) .WithProperty(BasicManagementSettings.Group.Default, BasicManagementSettings.Group.SystemManagement) - .WithProperty(BasicManagementSettings.ControlType.Default, BasicManagementSettings.ControlType.TypeText); + .WithProperty(AbpProSettingConsts.ControlType.Default, AbpProSettingConsts.ControlType.TypeText); context.Add( new SettingDefinition(TimingSettingNames.TimeZone, @@ -31,50 +26,50 @@ public class BasicManagementSettingDefinitionProvider : SettingDefinitionProvide L("Description:Abp.Timing.Timezone")) .WithProperty(BasicManagementSettings.Group.Default, BasicManagementSettings.Group.SystemManagement) - .WithProperty(BasicManagementSettings.ControlType.Default, - BasicManagementSettings.ControlType.TypeText)); + .WithProperty(AbpProSettingConsts.ControlType.Default, + AbpProSettingConsts.ControlType.TypeText)); context.GetOrNull("Abp.Identity.Password.RequiredLength") .WithProperty(BasicManagementSettings.Group.Default, BasicManagementSettings.Group.SystemManagement) - .WithProperty(BasicManagementSettings.ControlType.Default, - BasicManagementSettings.ControlType.Number); + .WithProperty(AbpProSettingConsts.ControlType.Default, + AbpProSettingConsts.ControlType.Number); context.GetOrNull("Abp.Identity.Password.RequiredLength") .WithProperty(BasicManagementSettings.Group.Default, BasicManagementSettings.Group.SystemManagement) - .WithProperty(BasicManagementSettings.ControlType.Default, - BasicManagementSettings.ControlType.Number); + .WithProperty(AbpProSettingConsts.ControlType.Default, + AbpProSettingConsts.ControlType.Number); context.GetOrNull("Abp.Identity.Password.RequiredUniqueChars") .WithProperty(BasicManagementSettings.Group.Default, BasicManagementSettings.Group.SystemManagement) - .WithProperty(BasicManagementSettings.ControlType.Default, - BasicManagementSettings.ControlType.Number); + .WithProperty(AbpProSettingConsts.ControlType.Default, + AbpProSettingConsts.ControlType.Number); context.GetOrNull("Abp.Identity.Password.RequireNonAlphanumeric") .WithProperty(BasicManagementSettings.Group.Default, BasicManagementSettings.Group.SystemManagement) - .WithProperty(BasicManagementSettings.ControlType.Default, - BasicManagementSettings.ControlType.TypeCheckBox); + .WithProperty(AbpProSettingConsts.ControlType.Default, + AbpProSettingConsts.ControlType.TypeCheckBox); context.GetOrNull("Abp.Identity.Password.RequireLowercase") .WithProperty(BasicManagementSettings.Group.Default, BasicManagementSettings.Group.SystemManagement) - .WithProperty(BasicManagementSettings.ControlType.Default, - BasicManagementSettings.ControlType.TypeCheckBox); + .WithProperty(AbpProSettingConsts.ControlType.Default, + AbpProSettingConsts.ControlType.TypeCheckBox); context.GetOrNull("Abp.Identity.Password.RequireUppercase") .WithProperty(BasicManagementSettings.Group.Default, BasicManagementSettings.Group.SystemManagement) - .WithProperty(BasicManagementSettings.ControlType.Default, - BasicManagementSettings.ControlType.TypeCheckBox); + .WithProperty(AbpProSettingConsts.ControlType.Default, + AbpProSettingConsts.ControlType.TypeCheckBox); context.GetOrNull("Abp.Identity.Password.RequireDigit") .WithProperty(BasicManagementSettings.Group.Default, BasicManagementSettings.Group.SystemManagement) - .WithProperty(BasicManagementSettings.ControlType.Default, - BasicManagementSettings.ControlType.TypeCheckBox); + .WithProperty(AbpProSettingConsts.ControlType.Default, + AbpProSettingConsts.ControlType.TypeCheckBox); } diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettings.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettings.cs index 9b8bc947..7e2707e0 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettings.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettings.cs @@ -2,18 +2,6 @@ public static class BasicManagementSettings { - public const string Prefix = "setting_"; - - /// - /// 前端控件类型 - /// - public static class ControlType - { - public const string Default = "Type"; - public const string TypeText = "Text"; - public const string TypeCheckBox = "CheckBox"; - public const string Number = "Number"; - } /// /// 系统控制分组