Merge branch 'dev' of https://github.com/abpframework/abp into dev

docs/en/CLI.md

@@ -61,6 +61,7 @@ abp new Acme.BookStore
 * `--template-source` or `-ts`: Specifies a custom template source to use to build the project. Local and network sources can be used(Like `D\localTemplate` or `https://<your url>.zip`).
 * `--create-solution-folder` or `-csf`: Specifies if the project will be in a new folder in the output folder or directly the output folder.
 * `--connection-string` or `-cs`:  Overwrites the default connection strings in all `appsettings.json` files. The default connection string is `Server=localhost;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true`. You can set your own connection string if you don't want to use the default. Be aware that the default database provider is `SQL Server`, therefore you can only enter connection string for SQL Server!
+* `--local-framework-ref --abp-path`: keeps local references to projects instead of replacing with NuGet package references.
 
 ### add-package
 

docs/zh-Hans/CLI.md

@@ -56,12 +56,12 @@ abp new Acme.BookStore
       * `mongodb`: MongoDB.
   * `module`: [Module template](Startup-Templates/Module.md). 其他选项:
     * `--no-ui`: 不包含UI.仅创建服务模块(也称为微服务 - 没有UI).
-    * 
 * `--output-folder` 或者 `-o`: 指定输出文件夹,默认是当前目录.
 * `--version` 或者 `-v`: 指定ABP和模板的版本.它可以是 [release tag](https://github.com/abpframework/abp/releases) 或者 [branch name](https://github.com/abpframework/abp/branches). 如果没有指定,则使用最新版本.大多数情况下,您会希望使用最新的版本.
 * `--template-source` 或者 `-ts`: 指定自定义模板源用于生成项目,可以使用本地源和网络源(例如 `D\localTemplate` 或 `https://<your url>.zip`).
 * `--create-solution-folder` 或者 `-csf`: 指定项目是在输出文件夹中的新文件夹中还是直接在输出文件夹中.
 * `--connection-string` 或者 `-cs`:  重写所有 `appsettings.json` 文件的默认连接字符串. 默认连接字符串是 `Server=localhost;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true`. 如果你不想使用默认,你可以设置自己的连接字符串. 默认的数据库提供程序是 `SQL Server`, 所以你只能输入SQL Server连接字符串!
+* `--local-framework-ref --abp-path`: 使用对项目的本地引用,而不是替换为NuGet包引用.
 
 ### add-package
 

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

@@ -199,6 +199,8 @@ namespace Volo.Abp.Cli.Commands
             sb.AppendLine("-o|--output-folder <output-folder>          (default: current folder)");
             sb.AppendLine("-v|--version <version>                      (default: latest version)");
             sb.AppendLine("-ts|--template-source <template-source>     (your local or network abp template source)");
+            sb.AppendLine("-csf|--create-solution-folder               (default: true)");
+            sb.AppendLine("-cs|--connection-string <connection-string> (your database connection string)");
             sb.AppendLine("--tiered                                    (if supported by the template)");
             sb.AppendLine("--no-ui                                     (if supported by the template)");
             sb.AppendLine("--separate-identity-server                  (if supported by the template)");
@@ -217,6 +219,7 @@ namespace Volo.Abp.Cli.Commands
             sb.AppendLine("  abp new Acme.BookStore -t module");
             sb.AppendLine("  abp new Acme.BookStore -t module --no-ui");
             sb.AppendLine("  abp new Acme.BookStore -ts \"D:\\localTemplate\\abp\"");
+            sb.AppendLine("  abp new Acme.BookStore -csf false");
             sb.AppendLine("  abp new Acme.BookStore --local-framework-ref --abp-path \"D:\\github\\abp\"");
             sb.AppendLine("  abp new Acme.BookStore --connection-string \"Server=myServerName\\myInstanceName;Database=myDatabase;User Id=myUsername;Password=myPassword\"");
             sb.AppendLine("");

framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="2.5.2" />
+    <PackageReference Include="MailKit" Version="2.6.0" />
   </ItemGroup>
 
   <ItemGroup>

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json

@@ -45,7 +45,7 @@
     "PagerInfo": "Showing _START_ to _END_ of _TOTAL_ entries",
     "PagerInfoEmpty": "Showing 0 to 0 of 0 entries",
     "PagerInfoFiltered": "(filtered from _MAX_ total entries)",
-    "NoDataAvailableInDatatable": "No data available in table",
+    "NoDataAvailableInDatatable": "No data available",
     "PagerShowMenuEntries": "Show _MENU_ entries",
     "DatatableActionDropdownDefaultText": "Actions",
     "ChangePassword": "Change password",

npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.html

@@ -1,5 +1,16 @@
-<div #container id="abp-http-error-container" class="error" [style.backgroundColor]="backgroundColor">
-  <button *ngIf="!hideCloseIcon" id="abp-close-button" type="button" class="close mr-2" (click)="destroy()">
+<div
+  #container
+  id="abp-http-error-container"
+  class="error"
+  [style.backgroundColor]="backgroundColor"
+>
+  <button
+    *ngIf="!hideCloseIcon"
+    id="abp-close-button"
+    type="button"
+    class="close mr-2"
+    (click)="destroy()"
+  >
     <span aria-hidden="true">&times;</span>
   </button>
 
@@ -11,7 +22,11 @@
           {{ details | abpLocalization }}
         </div>
         <div class="error-actions">
-          <a (click)="destroy()" routerLink="/" class="btn btn-primary btn-md mt-2"
+          <a
+            *ngIf="isHomeShow"
+            (click)="destroy()"
+            routerLink="/"
+            class="btn btn-primary btn-md mt-2"
             ><span class="glyphicon glyphicon-home"></span>
             {{ { key: '::Menu:Home', defaultValue: 'Home' } | abpLocalization }}
           </a>

npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts

@@ -42,6 +42,8 @@ export class HttpErrorWrapperComponent implements AfterViewInit, OnDestroy, OnIn
 
   backgroundColor: string;
 
+  isHomeShow = true;
+
   @ViewChild('container', { static: false })
   containerRef: ElementRef<HTMLDivElement>;
 
@@ -51,16 +53,21 @@ export class HttpErrorWrapperComponent implements AfterViewInit, OnDestroy, OnIn
 
   ngOnInit() {
     this.backgroundColor =
-      snq(() => window.getComputedStyle(document.body).getPropertyValue('background-color')) || '#fff';
+      snq(() => window.getComputedStyle(document.body).getPropertyValue('background-color')) ||
+      '#fff';
   }
 
   ngAfterViewInit() {
     if (this.customComponent) {
-      const customComponentRef = this.cfRes.resolveComponentFactory(this.customComponent).create(this.injector);
+      const customComponentRef = this.cfRes
+        .resolveComponentFactory(this.customComponent)
+        .create(this.injector);
       customComponentRef.instance.errorStatus = this.status;
       customComponentRef.instance.destroy$ = this.destroy$;
       this.appRef.attachView(customComponentRef.hostView);
-      this.containerRef.nativeElement.appendChild((customComponentRef.hostView as EmbeddedViewRef<any>).rootNodes[0]);
+      this.containerRef.nativeElement.appendChild(
+        (customComponentRef.hostView as EmbeddedViewRef<any>).rootNodes[0],
+      );
       customComponentRef.changeDetectorRef.detectChanges();
     }
 

npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts

@@ -138,6 +138,8 @@ export class ErrorHandler {
                       key: 'AbpAccount::DefaultErrorMessage',
                       defaultValue: DEFAULT_ERROR_MESSAGES.defaultError.title,
                     },
+                    details: err.message,
+                    isHomeShow: false,
                   });
                 }
                 break;