Merge pull request #14977 from abpframework/auto-merge/rel-7-0/1544

Merge branch dev with rel-7.0

docs/en/CLI.md

@@ -353,6 +353,7 @@ abp generate-proxy -t csharp -url https://localhost:44302/
 
 * `--type` or `-t`: The name of client type. Available clients:
   * `csharp`: C#, work in the `*.HttpApi.Client` project directory. There are some additional options for this client:
+    * `--without-contracts`: Avoid generating the application service interface, class, enum and dto types.
     * `--folder`: Folder name to place generated CSharp code in. Default value: `ClientProxies`.
   * `ng`: Angular. There are some additional options for this client:
     * `--api-name` or `-a`: The name of the API endpoint defined in the `/src/environments/environment.ts`. Default value: `default`.

docs/zh-Hans/CLI.md

@@ -259,6 +259,7 @@ abp generate-proxy -t csharp -url https://localhost:44302/
 
 * `--type` 或 `-t`: 客户端类型的名称. 可用的客户端有:
   * `csharp`: C#, 工作在 `*.HttpApi.Client` 项目目录. 此客户端有一些可选选项:
+    * `--without-contracts`: 取消生成应用程序服务接口,类,枚举和DTO.
     * `--folder`: 放置生成的 CSharp 代码的文件夹名称. 默认值: `ClientProxies`.
   * `ng`: Angular. 此客户端有一些可选选项:
     * `--api-name` 或 `-a`: 在 `/src/environments/environment.ts` 中定义的API端点名称。. 默认值: `default`.

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs

@@ -29,6 +29,7 @@ public class GenerateProxyCommand : ProxyCommandBase<GenerateProxyCommand>
         sb.AppendLine("  abp generate-proxy -t ng");
         sb.AppendLine("  abp generate-proxy -t js -m identity -o Pages/Identity/client-proxies.js -url https://localhost:44302/");
         sb.AppendLine("  abp generate-proxy -t csharp --folder MyProxies/InnerFolder -url https://localhost:44302/");
+        sb.AppendLine("  abp generate-proxy -t csharp -url https://localhost:44302/ --without-contracts");
 
         return sb.ToString();
     }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs

@@ -102,6 +102,7 @@ public abstract class ProxyCommandBase<T> : IConsoleCommand, ITransientDependenc
         sb.AppendLine("-u|--url <url>                                    API definition URL from.");
         sb.AppendLine("-t|--type <generate-type>                         The name of generate type (csharp, js, ng).");
         sb.AppendLine("  csharp");
+        sb.AppendLine("     --without-contracts                               Avoid generating the application service interface, class, enum and dto types.");
         sb.AppendLine("     --folder <folder-name>                            (default: 'ClientProxies') Folder name to place generated CSharp code in.");
         sb.AppendLine("  js");
         sb.AppendLine("     -o|--output <output-name>                         JavaScript file path or folder to place generated code in.");

npm/ng-packs/packages/components/tree/src/lib/components/tree.component.scss

@@ -1,4 +1,4 @@
-.ant-tree {
+abp-tree .ant-tree {
   color: inherit;
 
   .ant-tree-node-content-wrapper.ant-tree-node-selected {
@@ -7,6 +7,9 @@
 
   .ant-tree-switcher {
     line-height: 17px;
+    align-items: center;
+    justify-content: center;
+    display: inline-flex;
   }
 
   .ant-tree-node-content-wrapper {
@@ -19,13 +22,12 @@
     position: relative;
     display: inline-block;
     margin: 0;
-    padding: 0 5px;
     line-height: 30px;
     text-decoration: none;
     vertical-align: top;
     border-radius: 2px;
     cursor: pointer;
-    padding-left: 8px;
+    padding: 0 5px 0 8px;
     border: 1px solid transparent;
   }
 

npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts

@@ -12,22 +12,27 @@ import { of } from 'rxjs';
 import { TreeNodeTemplateDirective } from '../templates/tree-node-template.directive';
 import { ExpandedIconTemplateDirective } from '../templates/expanded-icon-template.directive';
 import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
+import { LazyLoadService, LOADING_STRATEGY, SubscriptionService } from '@abp/ng.core';
 
 export type DropEvent = NzFormatEmitEvent & { pos: number };
 
 @Component({
   selector: 'abp-tree',
   templateUrl: 'tree.component.html',
-  styleUrls: [
-    '../../../../../../node_modules/ng-zorro-antd/tree/style/index.min.css',
-    'tree.component.scss',
-  ],
+  styleUrls: ['tree.component.scss'],
   encapsulation: ViewEncapsulation.None,
+  providers: [SubscriptionService],
 })
 export class TreeComponent {
   dropPosition: number;
 
   dropdowns = {} as { [key: string]: NgbDropdown };
+  constructor(private lazyLoadService: LazyLoadService, subscriptionService: SubscriptionService) {
+    const loaded$ = this.lazyLoadService.load(
+      LOADING_STRATEGY.AppendAnonymousStyleToHead('ng-zorro-antd-tree.css'),
+    );
+    subscriptionService.addOne(loaded$);
+  }
 
   @ContentChild('menu') menu: TemplateRef<any>;
   @ContentChild(TreeNodeTemplateDirective) customNodeTemplate: TreeNodeTemplateDirective;