From e2bf648d99ac5d67597fff29261138d03ce95b3e Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Fri, 4 Nov 2022 09:17:33 +0300 Subject: [PATCH] Update ProjectCreationCommandBase.cs --- .../Cli/Commands/ProjectCreationCommandBase.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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 70ea71cab8..b1aab6c7ca 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 @@ -19,6 +19,7 @@ using Volo.Abp.Cli.ProjectBuilding.Events; using Volo.Abp.Cli.ProjectBuilding.Templates.App; using Volo.Abp.Cli.ProjectBuilding.Templates.Microservice; using Volo.Abp.Cli.ProjectBuilding.Templates.Module; +using Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule; using Volo.Abp.Cli.Utils; using Volo.Abp.EventBus.Local; @@ -673,11 +674,21 @@ public abstract class ProjectCreationCommandBase protected void ConfigureAngularJsonForThemeSelection(ProjectBuildArgs projectArgs) { - //TODO: do not run if the theme is default - if (projectArgs.Theme.HasValue && projectArgs.UiFramework == UiFramework.Angular) + var isProTemplate = !projectArgs.TemplateName.IsNullOrEmpty() && projectArgs.TemplateName.EndsWith("-pro", StringComparison.OrdinalIgnoreCase); + var theme = projectArgs.Theme; + + var isDefaultTheme = (isProTemplate && theme == AppProTemplate.DefaultTheme) || + (!isProTemplate && theme == AppTemplate.DefaultTheme); + + if (isDefaultTheme || projectArgs.TemplateName == ModuleTemplate.TemplateName) + { + return; + } + + if (theme.HasValue && projectArgs.UiFramework == UiFramework.Angular) { AngularThemeConfigurer.Configure(new AngularThemeConfigurationArgs( - theme: projectArgs.Theme.Value, + theme: theme.Value, projectName: projectArgs.SolutionName.FullName, angularFolderPath: projectArgs.OutputFolder + Path.DirectorySeparatorChar + "angular")); }