Browse Source

Update AppTemplateBase.cs

pull/15516/head
Engincan VESKE 3 years ago
parent
commit
f3e5a609cf
  1. 14
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

14
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

@ -216,7 +216,7 @@ public abstract class AppTemplateBase : TemplateInfo
RemoveThemeLogoFolders(context, steps); RemoveThemeLogoFolders(context, steps);
if (IsDefaultThemeForTemplate(context.BuildArgs.Theme.Value)) if (IsDefaultThemeForTemplate(context.BuildArgs))
{ {
return; return;
} }
@ -238,15 +238,17 @@ public abstract class AppTemplateBase : TemplateInfo
} }
} }
private static bool IsDefaultThemeForTemplate(Theme theme) private static bool IsDefaultThemeForTemplate(ProjectBuildArgs args)
{ {
var defaultThemesForTemplates = new[] var templateThemes = new Dictionary<string, Theme>
{ {
AppTemplate.DefaultTheme, AppProTemplate.DefaultTheme, { AppTemplate.TemplateName, AppTemplate.DefaultTheme },
AppNoLayersTemplate.DefaultTheme, AppNoLayersProTemplate.DefaultTheme { AppProTemplate.TemplateName, AppProTemplate.DefaultTheme },
{ AppNoLayersTemplate.TemplateName, AppNoLayersTemplate.DefaultTheme },
{ AppNoLayersProTemplate.TemplateName, AppNoLayersProTemplate.DefaultTheme }
}; };
return defaultThemesForTemplates.Any(defaultTheme => defaultTheme == theme); return templateThemes.TryGetValue(args.TemplateName!, out var templateTheme) && templateTheme == args.Theme;
} }
private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List<ProjectBuildPipelineStep> steps, bool isProTemplate, UiFramework uiFramework) private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List<ProjectBuildPipelineStep> steps, bool isProTemplate, UiFramework uiFramework)

Loading…
Cancel
Save