From 66075e196d472dcf8f08d84ef5940e39968ad5b8 Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Thu, 8 Dec 2022 17:09:20 +0300 Subject: [PATCH 1/4] export TreeNode Class add nzExpandChange output --- .../components/tree/src/lib/components/tree.component.ts | 2 ++ .../packages/components/tree/src/lib/utils/nz-tree-adapter.ts | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts index c61b9c3f22..f18c8e29f2 100644 --- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts +++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts @@ -36,6 +36,7 @@ export class TreeComponent { @Output() readonly expandedKeysChange = new EventEmitter(); @Output() readonly selectedNodeChange = new EventEmitter(); @Output() readonly dropOver = new EventEmitter(); + @Output() readonly nzExpandChange = new EventEmitter(); @Input() noAnimation = true; @Input() draggable: boolean; @Input() checkable: boolean; @@ -71,6 +72,7 @@ export class TreeComponent { onExpandedKeysChange(event) { this.expandedKeys = [...event.keys]; this.expandedKeysChange.emit(event.keys); + this.nzExpandChange.emit(event); } onDrop(event: DropEvent) { diff --git a/npm/ng-packs/packages/components/tree/src/lib/utils/nz-tree-adapter.ts b/npm/ng-packs/packages/components/tree/src/lib/utils/nz-tree-adapter.ts index d5d32f0146..0130b2f2c0 100644 --- a/npm/ng-packs/packages/components/tree/src/lib/utils/nz-tree-adapter.ts +++ b/npm/ng-packs/packages/components/tree/src/lib/utils/nz-tree-adapter.ts @@ -5,7 +5,7 @@ export abstract class BaseNode { constructor(public id: string, public parentId: string | null) {} } -class TreeNode extends BaseNode { +export class TreeNode extends BaseNode { title: string | undefined; key: string; icon: string | null = null; @@ -89,7 +89,6 @@ function createTreeFromList(list: T[]): TreeNode[] { tree.push(node); } }); - return tree; } From 8d9bf3c3213d774c6d0b9c550db7f1356fa5fd06 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 9 Dec 2022 15:35:43 +0300 Subject: [PATCH 2/4] Cli: Add missing brackett in angular module source code adder --- .../Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs index 48413da847..c8d3aeb75b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs @@ -249,7 +249,7 @@ public class AngularSourceCodeAdder : ITransientDependency fileContent = Regex.Replace(fileContent, @"apis\s*:\s*{", "apis: {"+ Environment.NewLine + - " " + moduleName.Split(".").Last() + ":"+ Environment.NewLine + + " " + moduleName.Split(".").Last() + ": {"+ Environment.NewLine + " rootNamespace: '" + moduleName + "',"+ Environment.NewLine + " },"); From a26c21435522b589ab03ac02aded1381e59cd2d8 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Fri, 9 Dec 2022 18:07:19 +0300 Subject: [PATCH 3/4] Update common.props --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index 2b4840f50a..be14865156 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 7.0.0-rc.3 + 7.0.0-rc.4 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ From 79e569f0235a7d107719ec1db1271d3dc8431814 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Sun, 11 Dec 2022 23:53:14 +0800 Subject: [PATCH 4/4] Skip bundle For OSX --- .../Volo/Abp/Cli/Bundling/BundlingService.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs index 7580b7e5be..c535ed51b0 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; +using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; using System.Xml; @@ -31,6 +32,12 @@ public class BundlingService : IBundlingService, ITransientDependency public async Task BundleAsync(string directory, bool forceBuild, string projectType = BundlingConsts.WebAssembly) { + if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && projectType == BundlingConsts.MauiBlazor) + { + Logger.LogWarning("ABP bundle command does not support OSX for MAUI Blazor"); + return; + } + var projectFiles = Directory.GetFiles(directory, "*.csproj"); if (!projectFiles.Any()) { @@ -52,7 +59,7 @@ public class BundlingService : IBundlingService, ITransientDependency new DotNetProjectInfo(string.Empty, projectFilePath, true) }; - DotNetProjectBuilder.BuildProjects(projects, string.Empty); + DotNetProjectBuilder.BuildProjects(projects, string.Empty); } var frameworkVersion = GetTargetFrameworkVersion(projectFilePath, projectType);