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

zaktecs · Apr 20, 2020 · 2a255e5 · 2a255e5
2 parents 68b2b4b + 0a1dc67
commit 2a255e5
Show file tree

Hide file tree

Showing 93 changed files with 1,097 additions and 994 deletions.
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.6.0</Version>
+    <Version>2.7.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io</PackageProjectUrl>

diff --git a/npm/lerna.json b/npm/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "packages": [
     "packs/*"
   ],

diff --git a/npm/ng-packs/lerna.version.json b/npm/ng-packs/lerna.version.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "packages": [
     "packages/*"
   ],

diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json
@@ -24,11 +24,11 @@
   "devDependencies": {
     "@abp/ng.account": "^2.5.0",
     "@abp/ng.account.config": "^2.5.0",
-    "@abp/ng.core": "^2.5.0",
-    "@abp/ng.feature-management": "^2.5.0",
+    "@abp/ng.core": "~2.5.0",
+    "@abp/ng.feature-management": "~2.5.0",
     "@abp/ng.identity": "^2.5.0",
     "@abp/ng.identity.config": "^2.5.0",
-    "@abp/ng.permission-management": "^2.5.0",
+    "@abp/ng.permission-management": "~2.5.0",
     "@abp/ng.setting-management": "^2.5.0",
     "@abp/ng.setting-management.config": "^2.5.0",
     "@abp/ng.tenant-management": "^2.5.0",

diff --git a/npm/ng-packs/packages/account-config/package.json b/npm/ng-packs/packages/account-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.account.config",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",

diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@abp/ng.account",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.account.config": "~2.5.0",
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.account.config": "^2.6.0",
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.core",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",

diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.feature-management",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/npm/ng-packs/packages/identity-config/package.json b/npm/ng-packs/packages/identity-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.identity.config",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",

diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json
@@ -1,15 +1,15 @@
 {
   "name": "@abp/ng.identity",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.identity.config": "~2.5.0",
-    "@abp/ng.permission-management": "~2.5.0",
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.identity.config": "^2.6.0",
+    "@abp/ng.permission-management": "^2.6.0",
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.permission-management",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/npm/ng-packs/packages/setting-management-config/package.json b/npm/ng-packs/packages/setting-management-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.setting-management.config",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",

diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@abp/ng.setting-management",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.setting-management.config": "~2.5.0",
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.setting-management.config": "^2.6.0",
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/npm/ng-packs/packages/tenant-management-config/package.json b/npm/ng-packs/packages/tenant-management-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.tenant-management.config",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",

diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json
@@ -1,15 +1,15 @@
 {
   "name": "@abp/ng.tenant-management",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.feature-management": "~2.5.0",
-    "@abp/ng.tenant-management.config": "~2.5.0",
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.feature-management": "^2.6.0",
+    "@abp/ng.tenant-management.config": "^2.6.0",
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.theme.basic",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~2.5.0"
+    "@abp/ng.theme.shared": "^2.6.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.theme.shared",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.core": "~2.5.0",
+    "@abp/ng.core": "^2.6.0",
     "@fortawesome/fontawesome-free": "^5.12.1",
     "@ng-bootstrap/ng-bootstrap": "^5.3.0",
     "@ngx-validate/core": "^0.0.7",

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
@@ -27,6 +27,7 @@ export type ModalSize = 'sm' | 'md' | 'lg' | 'xl';
   templateUrl: './modal.component.html',
   animations: [fadeAnimation],
   styleUrls: ['./modal.component.scss'],
+  providers: [ModalService],
 })
 export class ModalComponent implements OnDestroy {
   @Input()

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/services/modal.service.ts b/npm/ng-packs/packages/theme-shared/src/lib/services/modal.service.ts
@@ -1,11 +1,11 @@
 import { ContentProjectionService, PROJECTION_STRATEGY } from '@abp/ng.core';
-import { ComponentRef, Injectable, TemplateRef, ViewContainerRef } from '@angular/core';
+import { ComponentRef, Injectable, TemplateRef, ViewContainerRef, OnDestroy } from '@angular/core';
 import { ModalContainerComponent } from '../components/modal/modal-container.component';
 
 @Injectable({
   providedIn: 'root',
 })
-export class ModalService {
+export class ModalService implements OnDestroy {
   private containerComponentRef: ComponentRef<ModalContainerComponent>;
 
   constructor(private contentProjectionService: ContentProjectionService) {
@@ -44,4 +44,8 @@ export class ModalService {
 
     this.contentProjectionService.projectContent(strategy);
   }
+
+  ngOnDestroy() {
+    this.containerComponentRef.destroy();
+  }
 }
diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock
@@ -18,7 +18,7 @@
     "@abp/ng.theme.shared" "^2.5.0"
     tslib "^1.9.0"
 
-"@abp/ng.core@^2.5.0":
+"@abp/ng.core@^2.5.0", "@abp/ng.core@~2.5.0":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-2.5.0.tgz#e7168615b4078e3fa494c4efcc69842acbd2c627"
   integrity sha512-opYkOFCKeU17YvNJhfcG1dOwZZ4F2QGspTNTagNZ9fepmeNl0yqFamFdRM6irfEEL3cOBQhUpI2NQZP+ugLOEg==
@@ -35,7 +35,7 @@
     ts-toolbelt "^6.3.6"
     tslib "^1.9.0"
 
-"@abp/ng.feature-management@^2.5.0":
+"@abp/ng.feature-management@^2.5.0", "@abp/ng.feature-management@~2.5.0":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-2.5.0.tgz#3bc4501a2abbe6b6447e5b4a2b2d86fb07ce8a59"
   integrity sha512-keZ3gCDMvU/e17tsBBrZpLmpIpDm/2TTSAmCoRRy3GH4BQICXr/XJmssStNx7V7sdo6vAPiW9pcM9zI/C8IrBw==
@@ -60,7 +60,7 @@
     "@abp/ng.theme.shared" "^2.5.0"
     tslib "^1.9.0"
 
-"@abp/ng.permission-management@^2.5.0":
+"@abp/ng.permission-management@^2.5.0", "@abp/ng.permission-management@~2.5.0":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-2.5.0.tgz#c769a97aee8517ec724dc5b7756e1dfc8fe7fcf1"
   integrity sha512-grmJ46Qf26cwGfDt5acL6eXXWBDgjvL/04/ZLtxsP4Hf+tSlnL/1rWz5fxMF8548sQ6vZlVIdrSa4Tz/Dh0WLw==

diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json
@@ -1,12 +1,12 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/anchor-js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "^2.5.0",
+    "@abp/core": "^2.6.0",
     "anchor-js": "^4.2.2"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }
diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/aspnetcore.mvc.ui.theme.basic",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "^2.5.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared": "^2.6.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }
diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json
@@ -1,24 +1,24 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/aspnetcore.mvc.ui.theme.shared",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui": "^2.5.0",
-    "@abp/bootstrap": "^2.5.0",
-    "@abp/bootstrap-datepicker": "^2.5.0",
-    "@abp/datatables.net-bs4": "^2.5.0",
-    "@abp/font-awesome": "^2.5.0",
-    "@abp/jquery-form": "^2.5.0",
-    "@abp/jquery-validation-unobtrusive": "^2.5.0",
-    "@abp/lodash": "^2.5.0",
-    "@abp/luxon": "^2.5.0",
-    "@abp/malihu-custom-scrollbar-plugin": "^2.5.0",
-    "@abp/select2": "^2.5.0",
-    "@abp/sweetalert": "^2.5.0",
-    "@abp/timeago": "^2.5.0",
-    "@abp/toastr": "^2.5.0"
+    "@abp/aspnetcore.mvc.ui": "^2.6.0",
+    "@abp/bootstrap": "^2.6.0",
+    "@abp/bootstrap-datepicker": "^2.6.0",
+    "@abp/datatables.net-bs4": "^2.6.0",
+    "@abp/font-awesome": "^2.6.0",
+    "@abp/jquery-form": "^2.6.0",
+    "@abp/jquery-validation-unobtrusive": "^2.6.0",
+    "@abp/lodash": "^2.6.0",
+    "@abp/luxon": "^2.6.0",
+    "@abp/malihu-custom-scrollbar-plugin": "^2.6.0",
+    "@abp/select2": "^2.6.0",
+    "@abp/sweetalert": "^2.6.0",
+    "@abp/timeago": "^2.6.0",
+    "@abp/toastr": "^2.6.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }
diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/aspnetcore.mvc.ui",
   "publishConfig": {
     "access": "public"
@@ -12,5 +12,5 @@
     "path": "^0.12.7",
     "rimraf": "^3.0.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }
diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json
@@ -1,13 +1,13 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/blogging",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "^2.5.0",
-    "@abp/owl.carousel": "^2.5.0",
-    "@abp/tui-editor": "^2.5.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared": "^2.6.0",
+    "@abp/owl.carousel": "^2.6.0",
+    "@abp/tui-editor": "^2.6.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }
diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "2.5.0",
+  "version": "2.6.0",
   "name": "@abp/bootstrap-datepicker",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "bootstrap-datepicker": "^1.9.0"
   },
-  "gitHead": "a9a36b8a4681df04377497addf94b15e6c521664"
+  "gitHead": "03238c9aa7d4090b7c6ae9cc8c790bc0545501eb"
 }