diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index fa0cc26d11..b3064146fc 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -560,10 +560,11 @@ public abstract class ProjectCreationCommandBase } var themeStyle = commandLineArgs.Options.GetOrNull(Options.ThemeStyle.Long)?.ToLower(); + return themeStyle switch { - // null => ThemeStyle.NotSpecified, TODO: remove it!!! - "dim" or null => ThemeStyle.Dim, + "system" or null => ThemeStyle.System, + "dim" => ThemeStyle.Dim, "light" => ThemeStyle.Light, "dark" => ThemeStyle.Dark, _ => null diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStyleStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStyleStep.cs index ef6a1e9474..5f4a0e5917 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStyleStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStyleStep.cs @@ -14,6 +14,9 @@ public class ChangeThemeStyleStep : ProjectBuildPipelineStep switch (context.BuildArgs.ThemeStyle) { + case ThemeStyle.Dim: + ChangeThemeStyle(context, themeStyleName: "Dim"); + break; case ThemeStyle.Light: ChangeThemeStyle(context, themeStyleName: "Light"); break; @@ -25,7 +28,7 @@ public class ChangeThemeStyleStep : ProjectBuildPipelineStep private void ChangeThemeStyle(ProjectBuildContext context, string themeStyleName) { - var defaultThemeStyleName = "LeptonXStyleNames.Dim"; + var defaultThemeStyleName = "LeptonXStyleNames.System"; var newThemeStyleName = $"LeptonXStyleNames.{themeStyleName}"; var filePaths = new List diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs index e9a8804f70..eae3a303ff 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs @@ -1,7 +1,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building; public enum ThemeStyle : byte { - NotSpecified = 0, + System = 0, Dim = 1, Light = 2, Dark = 3