From 95bfca085e7363a2151bbbf4f5a165408a087c93 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 14 Jun 2024 13:18:52 +0800 Subject: [PATCH] Remove `LeptonXFooter` if current theme is not `LeptonX`. --- .../Building/Steps/RemoveFileStep.cs | 13 ++++++++----- .../Templates/App/AppNoLayersTemplateBase.cs | 5 +++++ .../Templates/App/AppTemplateBase.cs | 4 ++++ .../Microservice/MicroserviceTemplateBase.cs | 4 ++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFileStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFileStep.cs index 8e66d26547..13880fef9d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFileStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFileStep.cs @@ -1,18 +1,21 @@ -using System; - -namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; +namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps; public class RemoveFileStep : ProjectBuildPipelineStep { private readonly string _filePath; - public RemoveFileStep(string filePath) + private readonly bool _fullPath; + + public RemoveFileStep(string filePath, bool fullPath = true) { _filePath = filePath; + _fullPath = fullPath; } public override void Execute(ProjectBuildContext context) { - var fileToRemove = context.Files.Find(x => x.Name == _filePath);; + var fileToRemove = _fullPath + ? context.Files.Find(x => x.Name == _filePath) + : context.Files.Find(x => x.Name.EndsWith(_filePath)); if (fileToRemove != null) { context.Files.Remove(fileToRemove); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs index 6ce94eaaae..c83a5fc29d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs @@ -249,6 +249,11 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo steps.Add(new ChangeThemeStyleStep()); } + if (context.BuildArgs.Theme != Theme.LeptonX) + { + steps.Add(new RemoveFileStep("LeptonXFooter.razor", false)); + } + RemoveThemeLogoFolders(context, steps); if (IsDefaultThemeForTemplate(context.BuildArgs)) 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 77da8469a7..ff656d7598 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 @@ -235,6 +235,10 @@ public abstract class AppTemplateBase : TemplateInfo { steps.Add(new ChangeThemeStyleStep()); } + else + { + steps.Add(new RemoveFileStep("LeptonXFooter.razor", false)); + } RemoveThemeLogoFolders(context, steps); 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 a70f1db649..c462be1a60 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 @@ -49,6 +49,10 @@ public abstract class MicroserviceTemplateBase : TemplateInfo steps.Add(new ChangeThemeStyleStep()); return; } + else + { + steps.Add(new RemoveFileStep("LeptonXFooter.razor", false)); + } steps.Add(new ChangeThemeStep()); ReplaceLeptonXThemePackagesFromPackageJsonFiles(steps, uiFramework: context.BuildArgs.UiFramework, theme: context.BuildArgs.Theme, version: context.BuildArgs.Version ?? context.TemplateFile.Version);