From 0bfce28af10ac9ba4ab369a45f418a5e8cfbfef5 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 2 Sep 2022 10:17:40 +0800 Subject: [PATCH] Add Theme to Symbols --- .../Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs | 8 ++++++-- .../Templates/Microservice/MicroserviceTemplateBase.cs | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index 2d7da80211..16bea2740f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs @@ -194,12 +194,16 @@ public abstract class AppTemplateBase : TemplateInfo return; } + if (context.BuildArgs.Theme != Theme.NotSpecified) + { + context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper()); + } + if (context.BuildArgs.Theme == Theme.LeptonX) { - context.Symbols.Add("LEPTONX"); steps.Add(new ChangeThemeStyleStep()); } - + if (IsDefaultThemeForTemplate(context.BuildArgs.Theme.Value)) { return; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs index c6a15389ef..319326f3d4 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs @@ -35,10 +35,14 @@ public abstract class MicroserviceTemplateBase : TemplateInfo { return; } + + if (context.BuildArgs.Theme != Theme.NotSpecified) + { + context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper()); + } if (context.BuildArgs.Theme == Theme.LeptonX) { - context.Symbols.Add("LEPTONX"); steps.Add(new ChangeThemeStyleStep()); return; }