Browse Source

feat: 修改Setting常量位置

pull/126/head
wangjun 3 years ago
parent
commit
d602a2a3c0
  1. 17
      aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/AbpProSettingConsts.cs
  2. 6
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Settings/SettingAppService.cs
  3. 1
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Data/Seeds/AbpSettingDataSeedContributor.cs
  4. 43
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettingDefinitionProvider.cs
  5. 12
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettings.cs

17
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_";
/// <summary>
/// 前端控件类型
/// </summary>
public static class ControlType
{
public const string Default = "Type";
public const string TypeText = "Text";
public const string TypeCheckBox = "CheckBox";
public const string Number = "Number";
}
}

6
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 value = await SettingProvider.GetOrNullAsync(itemDefinition.Name);
var type = itemDefinition.Properties var type = itemDefinition.Properties
.FirstOrDefault(f => f.Key == BasicManagementSettings.ControlType.Default).Value .FirstOrDefault(f => f.Key == AbpProSettingConsts.ControlType.Default).Value
.ToString(); .ToString();
item.SettingItemOutput.Add(new SettingItemOutput( 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", // The key of the settingValues is in camel_Case, like "setting_Abp_Localization_DefaultLanguage",
// change it to "Abp.Localization.DefaultLanguage" form // change it to "Abp.Localization.DefaultLanguage" form
if (!kv.Key.StartsWith(BasicManagementSettings.Prefix)) if (!kv.Key.StartsWith(AbpProSettingConsts.Prefix))
{ {
continue; continue;
} }
string name = kv.Key.RemovePreFix(BasicManagementSettings.Prefix); string name = kv.Key.RemovePreFix(AbpProSettingConsts.Prefix);
var setting = _settingDefinitionManager.GetOrNull(name); var setting = _settingDefinitionManager.GetOrNull(name);
if (setting == null) if (setting == null)
{ {

1
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Data/Seeds/AbpSettingDataSeedContributor.cs

@ -1,7 +1,6 @@
using Volo.Abp.Data; using Volo.Abp.Data;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Guids; using Volo.Abp.Guids;
using Volo.Abp.Localization;
namespace Lion.AbpPro.BasicManagement.Data.Seeds namespace Lion.AbpPro.BasicManagement.Data.Seeds
{ {

43
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettingDefinitionProvider.cs

@ -1,16 +1,11 @@
using Lion.AbpPro.BasicManagement.Localization; namespace Lion.AbpPro.BasicManagement.Settings;
using Volo.Abp.Localization;
using Volo.Abp.Settings;
using Volo.Abp.Timing;
namespace Lion.AbpPro.BasicManagement.Settings;
public class BasicManagementSettingDefinitionProvider : SettingDefinitionProvider public class BasicManagementSettingDefinitionProvider : SettingDefinitionProvider
{ {
public override void Define(ISettingDefinitionContext context) public override void Define(ISettingDefinitionContext context)
{ {
//Define your own settings here. Example: //Define your own settings here. Example:
//context.Add(new SettingDefinition(BasicManagementSettings.MySetting1)); //context.Add(new SettingDefinition(AbpProSettingConsts.MySetting1));
OverrideDefaultSettings(context); OverrideDefaultSettings(context);
} }
@ -22,7 +17,7 @@ public class BasicManagementSettingDefinitionProvider : SettingDefinitionProvide
context.GetOrNull(LocalizationSettingNames.DefaultLanguage) context.GetOrNull(LocalizationSettingNames.DefaultLanguage)
.WithProperty(BasicManagementSettings.Group.Default, BasicManagementSettings.Group.SystemManagement) .WithProperty(BasicManagementSettings.Group.Default, BasicManagementSettings.Group.SystemManagement)
.WithProperty(BasicManagementSettings.ControlType.Default, BasicManagementSettings.ControlType.TypeText); .WithProperty(AbpProSettingConsts.ControlType.Default, AbpProSettingConsts.ControlType.TypeText);
context.Add( context.Add(
new SettingDefinition(TimingSettingNames.TimeZone, new SettingDefinition(TimingSettingNames.TimeZone,
@ -31,50 +26,50 @@ public class BasicManagementSettingDefinitionProvider : SettingDefinitionProvide
L("Description:Abp.Timing.Timezone")) L("Description:Abp.Timing.Timezone"))
.WithProperty(BasicManagementSettings.Group.Default, .WithProperty(BasicManagementSettings.Group.Default,
BasicManagementSettings.Group.SystemManagement) BasicManagementSettings.Group.SystemManagement)
.WithProperty(BasicManagementSettings.ControlType.Default, .WithProperty(AbpProSettingConsts.ControlType.Default,
BasicManagementSettings.ControlType.TypeText)); AbpProSettingConsts.ControlType.TypeText));
context.GetOrNull("Abp.Identity.Password.RequiredLength") context.GetOrNull("Abp.Identity.Password.RequiredLength")
.WithProperty(BasicManagementSettings.Group.Default, .WithProperty(BasicManagementSettings.Group.Default,
BasicManagementSettings.Group.SystemManagement) BasicManagementSettings.Group.SystemManagement)
.WithProperty(BasicManagementSettings.ControlType.Default, .WithProperty(AbpProSettingConsts.ControlType.Default,
BasicManagementSettings.ControlType.Number); AbpProSettingConsts.ControlType.Number);
context.GetOrNull("Abp.Identity.Password.RequiredLength") context.GetOrNull("Abp.Identity.Password.RequiredLength")
.WithProperty(BasicManagementSettings.Group.Default, .WithProperty(BasicManagementSettings.Group.Default,
BasicManagementSettings.Group.SystemManagement) BasicManagementSettings.Group.SystemManagement)
.WithProperty(BasicManagementSettings.ControlType.Default, .WithProperty(AbpProSettingConsts.ControlType.Default,
BasicManagementSettings.ControlType.Number); AbpProSettingConsts.ControlType.Number);
context.GetOrNull("Abp.Identity.Password.RequiredUniqueChars") context.GetOrNull("Abp.Identity.Password.RequiredUniqueChars")
.WithProperty(BasicManagementSettings.Group.Default, .WithProperty(BasicManagementSettings.Group.Default,
BasicManagementSettings.Group.SystemManagement) BasicManagementSettings.Group.SystemManagement)
.WithProperty(BasicManagementSettings.ControlType.Default, .WithProperty(AbpProSettingConsts.ControlType.Default,
BasicManagementSettings.ControlType.Number); AbpProSettingConsts.ControlType.Number);
context.GetOrNull("Abp.Identity.Password.RequireNonAlphanumeric") context.GetOrNull("Abp.Identity.Password.RequireNonAlphanumeric")
.WithProperty(BasicManagementSettings.Group.Default, .WithProperty(BasicManagementSettings.Group.Default,
BasicManagementSettings.Group.SystemManagement) BasicManagementSettings.Group.SystemManagement)
.WithProperty(BasicManagementSettings.ControlType.Default, .WithProperty(AbpProSettingConsts.ControlType.Default,
BasicManagementSettings.ControlType.TypeCheckBox); AbpProSettingConsts.ControlType.TypeCheckBox);
context.GetOrNull("Abp.Identity.Password.RequireLowercase") context.GetOrNull("Abp.Identity.Password.RequireLowercase")
.WithProperty(BasicManagementSettings.Group.Default, .WithProperty(BasicManagementSettings.Group.Default,
BasicManagementSettings.Group.SystemManagement) BasicManagementSettings.Group.SystemManagement)
.WithProperty(BasicManagementSettings.ControlType.Default, .WithProperty(AbpProSettingConsts.ControlType.Default,
BasicManagementSettings.ControlType.TypeCheckBox); AbpProSettingConsts.ControlType.TypeCheckBox);
context.GetOrNull("Abp.Identity.Password.RequireUppercase") context.GetOrNull("Abp.Identity.Password.RequireUppercase")
.WithProperty(BasicManagementSettings.Group.Default, .WithProperty(BasicManagementSettings.Group.Default,
BasicManagementSettings.Group.SystemManagement) BasicManagementSettings.Group.SystemManagement)
.WithProperty(BasicManagementSettings.ControlType.Default, .WithProperty(AbpProSettingConsts.ControlType.Default,
BasicManagementSettings.ControlType.TypeCheckBox); AbpProSettingConsts.ControlType.TypeCheckBox);
context.GetOrNull("Abp.Identity.Password.RequireDigit") context.GetOrNull("Abp.Identity.Password.RequireDigit")
.WithProperty(BasicManagementSettings.Group.Default, .WithProperty(BasicManagementSettings.Group.Default,
BasicManagementSettings.Group.SystemManagement) BasicManagementSettings.Group.SystemManagement)
.WithProperty(BasicManagementSettings.ControlType.Default, .WithProperty(AbpProSettingConsts.ControlType.Default,
BasicManagementSettings.ControlType.TypeCheckBox); AbpProSettingConsts.ControlType.TypeCheckBox);
} }

12
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Settings/BasicManagementSettings.cs

@ -2,18 +2,6 @@
public static class BasicManagementSettings public static class BasicManagementSettings
{ {
public const string Prefix = "setting_";
/// <summary>
/// 前端控件类型
/// </summary>
public static class ControlType
{
public const string Default = "Type";
public const string TypeText = "Text";
public const string TypeCheckBox = "CheckBox";
public const string Number = "Number";
}
/// <summary> /// <summary>
/// 系统控制分组 /// 系统控制分组

Loading…
Cancel
Save