From 7fd9c6ab554cd7a0499960b52310b990e2bd62f2 Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Thu, 20 Aug 2020 17:06:52 +0300
Subject: [PATCH 01/20] docs: create environment docs for Angular

---
 docs/en/UI/Angular/Environment.md   | 99 +++++++++++++++++++++++++++++
 docs/en/UI/Angular/Multi-Tenancy.md |  2 +-
 docs/en/docs-nav.json               |  8 ++-
 3 files changed, 106 insertions(+), 3 deletions(-)
 create mode 100644 docs/en/UI/Angular/Environment.md

diff --git a/docs/en/UI/Angular/Environment.md b/docs/en/UI/Angular/Environment.md
new file mode 100644
index 0000000000..b1f47ac864
--- /dev/null
+++ b/docs/en/UI/Angular/Environment.md
@@ -0,0 +1,99 @@
+# Environment
+
+Current `Environment` Configuration holds sub config classes. 
+
+```typescript
+export interface Environment {
+  apis: Apis;
+  application: Application;
+  hmr?: boolean;
+  localization?: { defaultResourceName?: string };
+  oAuthConfig: AuthConfig;
+  production: boolean;
+  remoteEnv?: RemoteEnv;
+}
+```
+
+## Apis
+
+```typescript
+export interface Apis {
+  [key: string]: ApiConfig;
+  default: ApiConfig;
+}
+
+export interface ApiConfig {
+  [key: string]: string;
+  url: string;
+}
+```
+
+Api config has to have a default config and it may have some additional ones for different modules.
+I.e. you may want to connect to different Apis for different modules. 
+
+Take a look at example
+
+```json
+{
+  ...
+  "apis": {
+    "default": {
+      "url": "https://localhost:8080",
+    },
+    "AbpIdentity": {
+      "url": "https://localhost:9090",
+    }
+  }
+}
+```
+
+When an api from `AbpIdentity` is called, the request will be sent to `"https://localhost:9090"`. 
+Everything else will be sent to `"https://localhost:8080"`
+
+## Application
+
+```typescript
+ export interface Application {
+  name: string;
+  baseUrl?: string;
+  logoUrl?: string;
+}
+```
+
+* `name`: Name of the backend Application. It is also used by `logo.component` if `logoUrl` is not provided.
+* `logoUrl`: Url of application logo. It is used by `logo.component`
+* `baseUrl`: [For detailed information](./Multi-Tenancy.md#domain-tenant-resolver)
+
+## Localization
+
+You can read about `Localization` [here in detail](./Localization.md)
+
+## OAuthConfig
+
+.....
+
+## RemoteEnvironment
+
+To integrate an existing config json into environment, you need to set `remoteEnv`
+
+```typescript
+export type customMergeFn = (
+  localEnv: Partial<Config.Environment>,
+  remoteEnv: any,
+) => Config.Environment;
+
+export interface RemoteEnv {
+  url: string;
+  mergeStrategy: 'deepmerge' | 'overwrite' | customMergeFn;
+  method?: string;
+  headers?: ABP.Dictionary<string>;
+}
+```
+
+* `url` *: Required. The url to be used to retrieve environment config
+* `mergeStrategy`: Defines how local and remote environment json will be merged
+  * `deepmerge`: Both local and remote environment json will be merged recursively. If both config has same nested path, remote environment will be prioritized. 
+  * `overwrite`: Remote environment will be used and local environment will be ignored.
+  * `customMergeFn`: You can also provide your own merge function as shown in the example. It will take two parameters, `localEnv: Partial<Config.Environment>` and `remoteEnv` and it needs to return a `Config.Environment` object.
+* `method`: HTTP method to be used when retrieving environment config. Default: `GET`
+* `headers`: If extra headers are needed for the request, it can be set through this field.
\ No newline at end of file
diff --git a/docs/en/UI/Angular/Multi-Tenancy.md b/docs/en/UI/Angular/Multi-Tenancy.md
index fb9fb54f76..2f768de32a 100644
--- a/docs/en/UI/Angular/Multi-Tenancy.md
+++ b/docs/en/UI/Angular/Multi-Tenancy.md
@@ -20,7 +20,7 @@ On the page above, you can;
 You can switch between existing tenants by using the tenant switching component in the child pages of the `AccountLayoutComponent` (like Login page). Angular UI sends the selected tenant id to the backend as `__tenant` header on each request.
 
 
-## Domain Tenant Resolver
+<h2 id="domain-tenant-resolver">Domain Tenant Resolver</h2>
 
 Angular UI can get the tenant name from the app running URL. You can determine the current tenant by subdomain (like mytenant1.mydomain.com) or by the whole domain (like mytenant.com). To do this, you need to set the `application.baseUrl` property in the environment:
 
diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json
index 660f2b1b60..411cced68d 100644
--- a/docs/en/docs-nav.json
+++ b/docs/en/docs-nav.json
@@ -219,11 +219,11 @@
           "items": [
             {
               "text": "Email Sending System",
-              "path": "Emailing.md",
+              "path": "Emailing.md"
             },
             {
               "text": "MailKit Integration",
-              "path": "MailKit.md",
+              "path": "MailKit.md"
             }
           ]
         },
@@ -423,6 +423,10 @@
               "text": "Migration Guide v2.x to v3",
               "path": "UI/Angular/Migration-Guide-v3.md"
             },
+            {
+              "text": "Environment",
+              "path": "UI/Angular/Environment.md"
+            },
             {
               "text": "Service Proxies",
               "path": "UI/Angular/Service-Proxies.md"

From 1bb107bde4443854773c8509cd4d2cd005fdb80c Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Fri, 21 Aug 2020 09:02:33 +0300
Subject: [PATCH 02/20] docs: improve environment.md

---
 docs/en/UI/Angular/Environment.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/en/UI/Angular/Environment.md b/docs/en/UI/Angular/Environment.md
index b1f47ac864..22acc369d9 100644
--- a/docs/en/UI/Angular/Environment.md
+++ b/docs/en/UI/Angular/Environment.md
@@ -35,7 +35,7 @@ Take a look at example
 
 ```json
 {
-  ...
+  // ...
   "apis": {
     "default": {
       "url": "https://localhost:8080",
@@ -43,7 +43,8 @@ Take a look at example
     "AbpIdentity": {
       "url": "https://localhost:9090",
     }
-  }
+  },
+  // ...
 }
 ```
 
@@ -68,9 +69,9 @@ Everything else will be sent to `"https://localhost:8080"`
 
 You can read about `Localization` [here in detail](./Localization.md)
 
-## OAuthConfig
+## AuthConfig
 
-.....
+For authentication, we use [angular-oauth2-oidc](https://github.com/manfredsteyer/angular-oauth2-oidc)
 
 ## RemoteEnvironment
 

From 45458342e4fd46e6d51c8761000241bd00d57702 Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Fri, 21 Aug 2020 12:17:00 +0300
Subject: [PATCH 03/20] docs: improve environment md

---
 docs/en/UI/Angular/Environment.md | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/docs/en/UI/Angular/Environment.md b/docs/en/UI/Angular/Environment.md
index 22acc369d9..34b7a38370 100644
--- a/docs/en/UI/Angular/Environment.md
+++ b/docs/en/UI/Angular/Environment.md
@@ -1,6 +1,8 @@
 # Environment
 
-Current `Environment` Configuration holds sub config classes. 
+Every application needs some ** environment ** variables. In Angular world, this is usually managed by `environment.ts`, `environment.prod.ts` and so on. It is the same for Abp as well. 
+
+Current `Environment` configuration holds sub config classes as follows:
 
 ```typescript
 export interface Environment {
@@ -31,7 +33,7 @@ export interface ApiConfig {
 Api config has to have a default config and it may have some additional ones for different modules.
 I.e. you may want to connect to different Apis for different modules. 
 
-Take a look at example
+Take a look at following example
 
 ```json
 {
@@ -62,7 +64,7 @@ Everything else will be sent to `"https://localhost:8080"`
 ```
 
 * `name`: Name of the backend Application. It is also used by `logo.component` if `logoUrl` is not provided.
-* `logoUrl`: Url of application logo. It is used by `logo.component`
+* `logoUrl`: Url of the application logo. It is used by `logo.component`
 * `baseUrl`: [For detailed information](./Multi-Tenancy.md#domain-tenant-resolver)
 
 ## Localization
@@ -71,11 +73,14 @@ You can read about `Localization` [here in detail](./Localization.md)
 
 ## AuthConfig
 
-For authentication, we use [angular-oauth2-oidc](https://github.com/manfredsteyer/angular-oauth2-oidc)
+For authentication, we use angular-oauth2-oidc. Please check their [docs](https://github.com/manfredsteyer/angular-oauth2-oidc) out
 
 ## RemoteEnvironment
 
-To integrate an existing config json into environment, you need to set `remoteEnv`
+Some applications need to integrate an existing config into the `environment` used throughout the application. 
+Abp Framework supports this out of box.
+
+To integrate an existing config json into the `environment`, you need to set `remoteEnv`
 
 ```typescript
 export type customMergeFn = (
@@ -92,9 +97,9 @@ export interface RemoteEnv {
 ```
 
 * `url` *: Required. The url to be used to retrieve environment config
-* `mergeStrategy`: Defines how local and remote environment json will be merged
-  * `deepmerge`: Both local and remote environment json will be merged recursively. If both config has same nested path, remote environment will be prioritized. 
-  * `overwrite`: Remote environment will be used and local environment will be ignored.
+* `mergeStrategy` *: Required. Defines how the local and the remote `environment` json will be merged
+  * `deepmerge`: Both local and remote `environment` json will be merged recursively. If both configs have same nested path, the remote `environment` will be prioritized. 
+  * `overwrite`: Remote `environment` will be used and local environment will be ignored.
   * `customMergeFn`: You can also provide your own merge function as shown in the example. It will take two parameters, `localEnv: Partial<Config.Environment>` and `remoteEnv` and it needs to return a `Config.Environment` object.
 * `method`: HTTP method to be used when retrieving environment config. Default: `GET`
 * `headers`: If extra headers are needed for the request, it can be set through this field.
\ No newline at end of file

From 6db86830a9c1636b170d939011d82b6662a43928 Mon Sep 17 00:00:00 2001
From: Bunyamin Coskuner <bnymncoskuner@gmail.com>
Date: Mon, 24 Aug 2020 10:37:34 +0300
Subject: [PATCH 04/20] docs: capitalize ABP

Co-authored-by: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com>
---
 docs/en/UI/Angular/Environment.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/UI/Angular/Environment.md b/docs/en/UI/Angular/Environment.md
index 34b7a38370..cfdfb4cce1 100644
--- a/docs/en/UI/Angular/Environment.md
+++ b/docs/en/UI/Angular/Environment.md
@@ -1,6 +1,6 @@
 # Environment
 
-Every application needs some ** environment ** variables. In Angular world, this is usually managed by `environment.ts`, `environment.prod.ts` and so on. It is the same for Abp as well. 
+Every application needs some ** environment ** variables. In Angular world, this is usually managed by `environment.ts`, `environment.prod.ts` and so on. It is the same for ABP as well. 
 
 Current `Environment` configuration holds sub config classes as follows:
 
@@ -102,4 +102,4 @@ export interface RemoteEnv {
   * `overwrite`: Remote `environment` will be used and local environment will be ignored.
   * `customMergeFn`: You can also provide your own merge function as shown in the example. It will take two parameters, `localEnv: Partial<Config.Environment>` and `remoteEnv` and it needs to return a `Config.Environment` object.
 * `method`: HTTP method to be used when retrieving environment config. Default: `GET`
-* `headers`: If extra headers are needed for the request, it can be set through this field.
\ No newline at end of file
+* `headers`: If extra headers are needed for the request, it can be set through this field.

From b0dbd4e8f1a34e10942f92fa3ea89cec67ca2492 Mon Sep 17 00:00:00 2001
From: Bunyamin Coskuner <bnymncoskuner@gmail.com>
Date: Mon, 24 Aug 2020 10:38:51 +0300
Subject: [PATCH 05/20] docs: remove hmr and localization fields

Co-authored-by: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com>
---
 docs/en/UI/Angular/Environment.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/en/UI/Angular/Environment.md b/docs/en/UI/Angular/Environment.md
index cfdfb4cce1..5ffe7b1ba5 100644
--- a/docs/en/UI/Angular/Environment.md
+++ b/docs/en/UI/Angular/Environment.md
@@ -8,8 +8,6 @@ Current `Environment` configuration holds sub config classes as follows:
 export interface Environment {
   apis: Apis;
   application: Application;
-  hmr?: boolean;
-  localization?: { defaultResourceName?: string };
   oAuthConfig: AuthConfig;
   production: boolean;
   remoteEnv?: RemoteEnv;

From 9e4b2a7335259bf3cc20c795c687be0031adc15d Mon Sep 17 00:00:00 2001
From: Bunyamin Coskuner <bnymncoskuner@gmail.com>
Date: Mon, 24 Aug 2020 10:39:16 +0300
Subject: [PATCH 06/20] docs: remove localization part

Co-authored-by: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com>
---
 docs/en/UI/Angular/Environment.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/en/UI/Angular/Environment.md b/docs/en/UI/Angular/Environment.md
index 5ffe7b1ba5..af50e34155 100644
--- a/docs/en/UI/Angular/Environment.md
+++ b/docs/en/UI/Angular/Environment.md
@@ -65,9 +65,6 @@ Everything else will be sent to `"https://localhost:8080"`
 * `logoUrl`: Url of the application logo. It is used by `logo.component`
 * `baseUrl`: [For detailed information](./Multi-Tenancy.md#domain-tenant-resolver)
 
-## Localization
-
-You can read about `Localization` [here in detail](./Localization.md)
 
 ## AuthConfig
 

From 325f13020825f92f5c87e4a19ec0f3a06d1a67c3 Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Mon, 24 Aug 2020 15:46:01 +0300
Subject: [PATCH 07/20] docs: update nav between docs

---
 docs/en/UI/Angular/Environment.md        | 8 +++++++-
 docs/en/UI/Angular/Migration-Guide-v3.md | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/en/UI/Angular/Environment.md b/docs/en/UI/Angular/Environment.md
index 34b7a38370..ceacf8f038 100644
--- a/docs/en/UI/Angular/Environment.md
+++ b/docs/en/UI/Angular/Environment.md
@@ -102,4 +102,10 @@ export interface RemoteEnv {
   * `overwrite`: Remote `environment` will be used and local environment will be ignored.
   * `customMergeFn`: You can also provide your own merge function as shown in the example. It will take two parameters, `localEnv: Partial<Config.Environment>` and `remoteEnv` and it needs to return a `Config.Environment` object.
 * `method`: HTTP method to be used when retrieving environment config. Default: `GET`
-* `headers`: If extra headers are needed for the request, it can be set through this field.
\ No newline at end of file
+* `headers`: If extra headers are needed for the request, it can be set through this field.
+
+
+## What's Next?
+
+* [Service Proxies](./Service-Proxies.md)
+
diff --git a/docs/en/UI/Angular/Migration-Guide-v3.md b/docs/en/UI/Angular/Migration-Guide-v3.md
index 725a04c088..810d830ca3 100644
--- a/docs/en/UI/Angular/Migration-Guide-v3.md
+++ b/docs/en/UI/Angular/Migration-Guide-v3.md
@@ -473,5 +473,5 @@ Some interfaces have long been marked as deprecated and now they are removed.
 
 ## What's Next?
 
-* [Service Proxies](./Service-Proxies.md)
+* [Environment](./Environment.md)
 

From 8e2c8a51871865635409c1fd9094028159c12c52 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 25 Aug 2020 14:42:03 +0300
Subject: [PATCH 08/20] ABP CLI generate-proxy command checks if
 @abp/ng.schematics package was installed

resolves https://github.com/abpframework/abp/issues/5170
---
 .../Abp/Cli/Commands/GenerateProxyCommand.cs  | 49 ++++++++++++++++---
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs
index 74bc1bf9f5..ab680ce4b8 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs
@@ -2,6 +2,8 @@ using System;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Volo.Abp.Cli.Args;
 using Volo.Abp.Cli.Utils;
 using Volo.Abp.DependencyInjection;
@@ -12,19 +14,50 @@ namespace Volo.Abp.Cli.Commands
     {
         public Task ExecuteAsync(CommandLineArgs commandLineArgs)
         {
-            var angularPath = $"angular.json";
-            if (!File.Exists(angularPath))
+            CheckAngularJsonFile();
+            CheckNgSchematics();
+
+            CmdHelper.RunCmd("npx ng g @abp/ng.schematics:proxy");
+
+            return Task.CompletedTask;
+        }
+
+        private void CheckNgSchematics()
+        {
+            var packageJsonPath = $"package.json";
+
+            if (!File.Exists(packageJsonPath))
             {
                 throw new CliUsageException(
-                           "angular.json file not found. You must run this command in the angular folder." +
-                           Environment.NewLine + Environment.NewLine +
-                           GetUsageInfo()
-                       );
+                                            "package.json file not found" +
+                                            Environment.NewLine +
+                                            GetUsageInfo()
+                );
             }
 
-            CmdHelper.RunCmd("npx ng g @abp/ng.schematics:proxy");
+            var schematicsPackageNode = (string) JObject.Parse(File.ReadAllText(packageJsonPath))["devDependencies"]?["@abp/ng.schematics"];
 
-            return Task.CompletedTask;
+            if (schematicsPackageNode == null)
+            {
+                throw new CliUsageException(
+                                             "\"@abp/ng.schematics\" NPM package should be installed to the devDependencies before running this command!" +
+                                             Environment.NewLine +
+                                             GetUsageInfo()
+                );
+            }
+        }
+
+        private void CheckAngularJsonFile()
+        {
+            var angularPath = $"angular.json";
+            if (!File.Exists(angularPath))
+            {
+                throw new CliUsageException(
+                    "angular.json file not found. You must run this command in the angular folder." +
+                    Environment.NewLine + Environment.NewLine +
+                    GetUsageInfo()
+                );
+            }
         }
 
         public string GetUsageInfo()

From 8394ffcd422a3cb72e0bbc496843e90bb9e7d504 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Tue, 25 Aug 2020 17:48:32 +0300
Subject: [PATCH 09/20] feat: add utility fn to get root namespace from
 environment

---
 .../packages/schematics/src/utils/source.ts   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/npm/ng-packs/packages/schematics/src/utils/source.ts b/npm/ng-packs/packages/schematics/src/utils/source.ts
index e08ecec285..8a41776955 100644
--- a/npm/ng-packs/packages/schematics/src/utils/source.ts
+++ b/npm/ng-packs/packages/schematics/src/utils/source.ts
@@ -25,6 +25,31 @@ export async function getApiDefinition(url: string) {
   return body;
 }
 
+export function getRootNamespace(tree: Tree, project: Project, moduleName: string) {
+  const environmentExpr = readEnvironment(tree, project.definition);
+
+  if (!environmentExpr)
+    throw new SchematicsException(interpolate(Exception.NoEnvironment, project.name));
+
+  let assignment = getAssignedPropertyFromObjectliteral(environmentExpr, [
+    'apis',
+    moduleName,
+    'rootNamespace',
+  ]);
+
+  if (!assignment)
+    assignment = getAssignedPropertyFromObjectliteral(environmentExpr, [
+      'apis',
+      'default',
+      'rootNamespace',
+    ]);
+
+  if (!assignment)
+    throw new SchematicsException(interpolate(Exception.NoRootNamespace, project.name, moduleName));
+
+  return assignment.replace(/[`'"]/g, '');
+}
+
 export function getSourceUrl(tree: Tree, project: Project, moduleName: string) {
   const environmentExpr = readEnvironment(tree, project.definition);
 

From 060e3c4a0851d2699daa1063aa0695140b227210 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Tue, 25 Aug 2020 17:49:25 +0300
Subject: [PATCH 10/20] feat: add rootNamespace to core config model

---
 npm/ng-packs/packages/core/src/lib/models/config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/npm/ng-packs/packages/core/src/lib/models/config.ts b/npm/ng-packs/packages/core/src/lib/models/config.ts
index 5f19907388..be640a4dcf 100644
--- a/npm/ng-packs/packages/core/src/lib/models/config.ts
+++ b/npm/ng-packs/packages/core/src/lib/models/config.ts
@@ -24,6 +24,7 @@ export namespace Config {
 
   export interface ApiConfig {
     [key: string]: string;
+    rootNamespace?: string;
     url: string;
   }
 

From b672edafaae0efbf422ad9f0e6a8b7994635d1b5 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Tue, 25 Aug 2020 17:50:10 +0300
Subject: [PATCH 11/20] feat: add placeholder rootNamespace to all environments

---
 npm/ng-packs/apps/dev-app/src/environments/environment.ts       | 1 +
 templates/app/angular/src/environments/environment.ts           | 1 +
 .../angular/projects/dev-app/src/environments/environment.ts    | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/npm/ng-packs/apps/dev-app/src/environments/environment.ts b/npm/ng-packs/apps/dev-app/src/environments/environment.ts
index 2bf42cf7dc..e338675552 100644
--- a/npm/ng-packs/apps/dev-app/src/environments/environment.ts
+++ b/npm/ng-packs/apps/dev-app/src/environments/environment.ts
@@ -20,6 +20,7 @@ export const environment = {
   apis: {
     default: {
       url: 'https://localhost:44305',
+      rootNamespace: 'MyCompanyName.MyProjectName',
     },
   },
 } as Config.Environment;
diff --git a/templates/app/angular/src/environments/environment.ts b/templates/app/angular/src/environments/environment.ts
index cb0be073c2..bd2c831240 100644
--- a/templates/app/angular/src/environments/environment.ts
+++ b/templates/app/angular/src/environments/environment.ts
@@ -19,6 +19,7 @@ export const environment = {
   apis: {
     default: {
       url: 'https://localhost:44305',
+      rootNamespace: 'MyCompanyName.MyProjectName',
     },
   },
 } as Config.Environment;
diff --git a/templates/module/angular/projects/dev-app/src/environments/environment.ts b/templates/module/angular/projects/dev-app/src/environments/environment.ts
index 780fa891d9..b6467fa43c 100644
--- a/templates/module/angular/projects/dev-app/src/environments/environment.ts
+++ b/templates/module/angular/projects/dev-app/src/environments/environment.ts
@@ -18,9 +18,11 @@ export const environment = {
   apis: {
     default: {
       url: 'https://localhost:44301',
+      rootNamespace: 'MyCompanyName.MyProjectName',
     },
     MyProjectName: {
       url: 'https://localhost:44300',
+      rootNamespace: 'MyCompanyName.MyProjectName',
     },
   },
 } as Config.Environment;

From 6107bd58d3bb659b4c1432dfe9bc668a70fb9c5d Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Tue, 25 Aug 2020 17:51:21 +0300
Subject: [PATCH 12/20] feat: use same schema on proxy and api commands

---
 .../schematics/src/commands/api/schema.json   | 26 +++++++++----------
 .../schematics/src/commands/api/schema.ts     | 12 ++++-----
 .../schematics/src/commands/proxy/schema.json | 24 +++++------------
 .../schematics/src/commands/proxy/schema.ts   | 11 +++-----
 4 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/npm/ng-packs/packages/schematics/src/commands/api/schema.json b/npm/ng-packs/packages/schematics/src/commands/api/schema.json
index afed78c2ca..4411418c34 100644
--- a/npm/ng-packs/packages/schematics/src/commands/api/schema.json
+++ b/npm/ng-packs/packages/schematics/src/commands/api/schema.json
@@ -4,36 +4,36 @@
   "title": "ABP Generate API Schema",
   "type": "object",
   "properties": {
-    "solution": {
-      "alias": "x",
-      "description": "Solution name",
+    "module": {
+      "alias": "m",
+      "description": "Backend module to generate code for",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "Please enter the solution name. (case-sensitive, eg. Acme.BookStore)"
+      "x-prompt": "Please enter name of the backend module you wish to generate proxies for. (default: \"app\")"
     },
-    "target": {
-      "alias": "t",
-      "description": "Angular project to generate code in",
+    "source": {
+      "alias": "s",
+      "description": "Angular project to resolve root namespace & API definition URL from",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 1
       },
-      "x-prompt": "Plese enter Angular project name to place generated code in. (default: workspace \"defaultProject\")"
+      "x-prompt": "Plese enter Angular project name to resolve root namespace & API definition URL from. (default: workspace \"defaultProject\")"
     },
-    "module": {
-      "alias": "m",
-      "description": "Backend module to generate code for",
+    "target": {
+      "alias": "t",
+      "description": "Angular project to generate code in",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 2
       },
-      "x-prompt": "Please enter name of the backend module you wish to generate proxies for. (default: \"app\")"
+      "x-prompt": "Plese enter Angular project name to place generated code in. (default: workspace \"defaultProject\")"
     }
   },
-  "required": ["solution"]
+  "required": []
 }
diff --git a/npm/ng-packs/packages/schematics/src/commands/api/schema.ts b/npm/ng-packs/packages/schematics/src/commands/api/schema.ts
index 32e316cf53..0c26ce461f 100644
--- a/npm/ng-packs/packages/schematics/src/commands/api/schema.ts
+++ b/npm/ng-packs/packages/schematics/src/commands/api/schema.ts
@@ -1,16 +1,16 @@
 export interface Schema {
   /**
-   * Solution name
+   * Backend module to generate code for
    */
-  solution: string;
+  module?: string;
 
   /**
-   * Angular project to generate code in
+   * Angular project to resolve root namespace & API definition URL from
    */
-  target?: string;
+  source?: string;
 
   /**
-   * Backend module to generate code for
+   * Angular project to generate code in
    */
-  module?: string;
+  target?: string;
 }
diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy/schema.json b/npm/ng-packs/packages/schematics/src/commands/proxy/schema.json
index 7e4c0fc88e..f0b76bbdf6 100644
--- a/npm/ng-packs/packages/schematics/src/commands/proxy/schema.json
+++ b/npm/ng-packs/packages/schematics/src/commands/proxy/schema.json
@@ -4,25 +4,25 @@
   "title": "ABP Generate Proxy Schema",
   "type": "object",
   "properties": {
-    "solution": {
-      "alias": "x",
-      "description": "Solution name",
+    "module": {
+      "alias": "m",
+      "description": "Backend module to generate code for",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "Please enter the solution name. (case-sensitive, eg. Acme.BookStore)"
+      "x-prompt": "Please enter name of the backend module you wish to generate proxies for. (default: \"app\")"
     },
     "source": {
       "alias": "s",
-      "description": "Angular project to resolve API definition URL from",
+      "description": "Angular project to resolve root namespace & API definition URL from",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 1
       },
-      "x-prompt": "Plese enter Angular project name to resolve API definition URL from. (default: workspace \"defaultProject\")"
+      "x-prompt": "Plese enter Angular project name to resolve root namespace & API definition URL from. (default: workspace \"defaultProject\")"
     },
     "target": {
       "alias": "t",
@@ -33,17 +33,7 @@
         "index": 2
       },
       "x-prompt": "Plese enter Angular project name to place generated code in. (default: workspace \"defaultProject\")"
-    },
-    "module": {
-      "alias": "m",
-      "description": "Backend module to generate code for",
-      "type": "string",
-      "$default": {
-        "$source": "argv",
-        "index": 3
-      },
-      "x-prompt": "Please enter name of the backend module you wish to generate proxies for. (default: \"app\")"
     }
   },
-  "required": ["solution"]
+  "required": []
 }
diff --git a/npm/ng-packs/packages/schematics/src/commands/proxy/schema.ts b/npm/ng-packs/packages/schematics/src/commands/proxy/schema.ts
index 54f11b2da8..0c26ce461f 100644
--- a/npm/ng-packs/packages/schematics/src/commands/proxy/schema.ts
+++ b/npm/ng-packs/packages/schematics/src/commands/proxy/schema.ts
@@ -1,11 +1,11 @@
 export interface Schema {
   /**
-   * Solution name
+   * Backend module to generate code for
    */
-  solution: string;
+  module?: string;
 
   /**
-   * Angular project to resolve API definition URL from
+   * Angular project to resolve root namespace & API definition URL from
    */
   source?: string;
 
@@ -13,9 +13,4 @@ export interface Schema {
    * Angular project to generate code in
    */
   target?: string;
-
-  /**
-   * Backend module to generate code for
-   */
-  module?: string;
 }

From 2c46da86c38b7ff89aaf970acb9ae5bdf52d3a8d Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Tue, 25 Aug 2020 17:52:01 +0300
Subject: [PATCH 13/20] feat: add separate exception for invalid api definition

---
 npm/ng-packs/packages/schematics/src/enums/exception.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/schematics/src/enums/exception.ts b/npm/ng-packs/packages/schematics/src/enums/exception.ts
index b1402daf5c..6c2e635edf 100644
--- a/npm/ng-packs/packages/schematics/src/enums/exception.ts
+++ b/npm/ng-packs/packages/schematics/src/enums/exception.ts
@@ -1,12 +1,14 @@
 export const enum Exception {
   FileNotFound = '[File Not Found] There is no file at "{0}" path.',
   InvalidModule = '[Invalid Module] Backend module "{0}" does not exist in API definition.',
+  InvalidApiDefinition = '[Invalid API Definition] The provided API definition is invalid.',
   InvalidWorkspace = '[Invalid Workspace] The angular.json should be a valid JSON file.',
   NoApi = '[API Not Available] Please double-check the URL in the source project environment and make sure your application is up and running.',
-  NoApiDefinition = '[API Definition Not Found] There is no valid API definition file at "{0}".',
+  NoApiDefinition = '[API Definition Not Found] There is no API definition file at "{0}".',
   NoProject = '[Project Not Found] Either define a default project in your workspace or specify the project name in schematics options.',
   NoTypeDefinition = '[Type Definition Not Found] There is no type definition for "{0}".',
   NoWorkspace = '[Workspace Not Found] Make sure you are running schematics at the root directory of your workspace and it has an angular.json file.',
   NoEnvironment = '[Environment Not Found] An environment file cannot be located in "{0}" project.',
   NoApiUrl = '[API URL Not Found] Cannot resolve API URL for "{1}" module from "{0}" project.',
+  NoRootNamespace = '[Root Namespace Not Found] Cannot resolve root namespace for "{1}" module from "{0}" project.',
 }

From 63bb86a30662999e6aba5d52f143998ba2b26bab Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Tue, 25 Aug 2020 17:52:54 +0300
Subject: [PATCH 14/20] feat: resolve solution from rootNamespace in
 environment

---
 .../packages/schematics/src/commands/api/index.ts    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/npm/ng-packs/packages/schematics/src/commands/api/index.ts b/npm/ng-packs/packages/schematics/src/commands/api/index.ts
index 688430f35f..956e91e0b1 100644
--- a/npm/ng-packs/packages/schematics/src/commands/api/index.ts
+++ b/npm/ng-packs/packages/schematics/src/commands/api/index.ts
@@ -20,6 +20,7 @@ import {
   createImportRefToEnumMapper,
   EnumGeneratorParams,
   getEnumNamesFromImports,
+  getRootNamespace,
   interpolate,
   ModelGeneratorParams,
   resolveProject,
@@ -29,18 +30,21 @@ import * as cases from '../../utils/text';
 import { Schema as GenerateProxySchema } from './schema';
 
 export default function(params: GenerateProxySchema) {
-  const solution = params.solution;
   const moduleName = strings.camelize(params.module || 'app');
 
   return chain([
     async (tree: Tree, _context: SchematicContext) => {
+      const source = await resolveProject(tree, params.source!);
       const target = await resolveProject(tree, params.target!);
+      const solution = getRootNamespace(tree, source, moduleName);
       const targetPath = buildDefaultPath(target.definition);
-      const readApiDefinition = createApiDefinitionReader(
-        `${targetPath}/shared/api-definition.json`,
-      );
+      const definitionPath = `${targetPath}/shared/api-definition.json`;
+      const readApiDefinition = createApiDefinitionReader(definitionPath);
       const data = readApiDefinition(tree);
       const types = data.types;
+      const modules = data.modules;
+      if (!types || !modules) throw new SchematicsException(Exception.InvalidApiDefinition);
+
       const definition = data.modules[moduleName];
       if (!definition)
         throw new SchematicsException(interpolate(Exception.InvalidModule, moduleName));

From c61d273c5b62cdf24dfe6442f41d950a9b09aece Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Tue, 25 Aug 2020 18:28:05 +0300
Subject: [PATCH 15/20] docs: update ApiConfig with rootNamespace

---
 docs/en/UI/Angular/Environment.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/en/UI/Angular/Environment.md b/docs/en/UI/Angular/Environment.md
index 1119e7781a..86978cfa16 100644
--- a/docs/en/UI/Angular/Environment.md
+++ b/docs/en/UI/Angular/Environment.md
@@ -24,6 +24,7 @@ export interface Apis {
 
 export interface ApiConfig {
   [key: string]: string;
+  rootNamespace?: string;
   url: string;
 }
 ```
@@ -51,6 +52,8 @@ Take a look at following example
 When an api from `AbpIdentity` is called, the request will be sent to `"https://localhost:9090"`. 
 Everything else will be sent to `"https://localhost:8080"`
 
+* `rootNamespace` **(new)** : Root namespace of the related API. e.g. Acme.BookStore
+
 ## Application
 
 ```typescript

From d4852de457cb5c966708bc9d7023e57415426050 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Tue, 25 Aug 2020 18:39:03 +0300
Subject: [PATCH 16/20] fix: escape dot in parseNamespace regex

---
 npm/ng-packs/packages/schematics/src/utils/namespace.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm/ng-packs/packages/schematics/src/utils/namespace.ts b/npm/ng-packs/packages/schematics/src/utils/namespace.ts
index 8b7c1a8c66..c4d10ff9e6 100644
--- a/npm/ng-packs/packages/schematics/src/utils/namespace.ts
+++ b/npm/ng-packs/packages/schematics/src/utils/namespace.ts
@@ -8,8 +8,8 @@ export function parseNamespace(solution: string, type: string) {
     .join('.');
 
   solution.split('.').reduceRight((acc, part) => {
-    acc = part + '.' + acc;
-    const regex = new RegExp('^' + acc + '(Controllers.)?');
+    acc = `${part}\.${acc}`;
+    const regex = new RegExp(`^${acc}(Controllers\.)?`);
     namespace = namespace.replace(regex, '');
     return acc;
   }, '');

From 9e4ecc0a4a7d0cf56fc1487f5e671b5dc6497de4 Mon Sep 17 00:00:00 2001
From: Bunyamin Coskuner <bnymncoskuner@gmail.com>
Date: Tue, 25 Aug 2020 18:45:46 +0300
Subject: [PATCH 17/20] docs: revert title change
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Levent Arman Özak <arman@armanozak.com>
---
 docs/en/UI/Angular/Multi-Tenancy.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/UI/Angular/Multi-Tenancy.md b/docs/en/UI/Angular/Multi-Tenancy.md
index 2f768de32a..fb9fb54f76 100644
--- a/docs/en/UI/Angular/Multi-Tenancy.md
+++ b/docs/en/UI/Angular/Multi-Tenancy.md
@@ -20,7 +20,7 @@ On the page above, you can;
 You can switch between existing tenants by using the tenant switching component in the child pages of the `AccountLayoutComponent` (like Login page). Angular UI sends the selected tenant id to the backend as `__tenant` header on each request.
 
 
-<h2 id="domain-tenant-resolver">Domain Tenant Resolver</h2>
+## Domain Tenant Resolver
 
 Angular UI can get the tenant name from the app running URL. You can determine the current tenant by subdomain (like mytenant1.mydomain.com) or by the whole domain (like mytenant.com). To do this, you need to set the `application.baseUrl` property in the environment:
 

From ffa4c1a9ce08e9120e072ed27de0a4c17ac11c63 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Tue, 25 Aug 2020 20:14:31 +0300
Subject: [PATCH 18/20] fix: escape dot twice in parseNamespace regex

---
 npm/ng-packs/packages/schematics/src/utils/namespace.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm/ng-packs/packages/schematics/src/utils/namespace.ts b/npm/ng-packs/packages/schematics/src/utils/namespace.ts
index c4d10ff9e6..78ee91a02a 100644
--- a/npm/ng-packs/packages/schematics/src/utils/namespace.ts
+++ b/npm/ng-packs/packages/schematics/src/utils/namespace.ts
@@ -8,8 +8,8 @@ export function parseNamespace(solution: string, type: string) {
     .join('.');
 
   solution.split('.').reduceRight((acc, part) => {
-    acc = `${part}\.${acc}`;
-    const regex = new RegExp(`^${acc}(Controllers\.)?`);
+    acc = `${part}\\.${acc}`;
+    const regex = new RegExp(`^${acc}(Controllers\\.)?`);
     namespace = namespace.replace(regex, '');
     return acc;
   }, '');

From 78d927ada8250f53c7719e6e4b3a391ad2bcbb9f Mon Sep 17 00:00:00 2001
From: Erol Arkat <erol@erolarkat.com>
Date: Wed, 26 Aug 2020 09:32:03 +0300
Subject: [PATCH 19/20] version update

---
 common.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.props b/common.props
index 1d2d986131..185ff859c9 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup> 
     <LangVersion>latest</LangVersion> 
-    <Version>3.1.0-rc.1</Version>   
+    <Version>3.1.0-rc.2</Version>   
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io</PackageProjectUrl>

From 414e258f17223c7fb0eb4503f8db49e1df33ac17 Mon Sep 17 00:00:00 2001
From: erolarkat <erol@erolarkat.com>
Date: Wed, 26 Aug 2020 12:13:51 +0300
Subject: [PATCH 20/20] npm packages 3.1.0-rc.2

---
 .../package.json                              |   2 +-
 .../wwwroot/libs/abp/core/abp.js              |  16 +-
 .../wwwroot/libs/abp/jquery/abp.jquery.js     |  16 +-
 .../yarn.lock                                 | 222 ++++++------
 .../package.json                              |   2 +-
 .../wwwroot/libs/abp/core/abp.js              |  16 +-
 .../wwwroot/libs/abp/jquery/abp.jquery.js     |  16 +-
 .../yarn.lock                                 | 236 ++++++-------
 .../app/Volo.BloggingTestApp/package.json     |   4 +-
 .../wwwroot/libs/abp/core/abp.js              |  16 +-
 .../wwwroot/libs/abp/jquery/abp.jquery.js     |  16 +-
 .../app/Volo.BloggingTestApp/yarn.lock        | 330 +++++++++---------
 .../Volo.ClientSimulation.Demo/package.json   |   2 +-
 .../wwwroot/libs/abp/core/abp.js              |  16 +-
 .../wwwroot/libs/abp/jquery/abp.jquery.js     |  16 +-
 .../demo/Volo.ClientSimulation.Demo/yarn.lock | 236 ++++++-------
 modules/cms-kit/angular/package.json          |  10 +-
 .../angular/projects/cms-kit/package.json     |   4 +-
 .../Volo.CmsKit.IdentityServer/package.json   |   2 +-
 .../wwwroot/libs/abp/core/abp.js              |  16 +-
 .../wwwroot/libs/abp/jquery/abp.jquery.js     |  16 +-
 .../host/Volo.CmsKit.IdentityServer/yarn.lock | 236 ++++++-------
 .../host/Volo.CmsKit.Web.Host/package.json    |   2 +-
 .../wwwroot/libs/abp/core/abp.js              |  16 +-
 .../wwwroot/libs/abp/jquery/abp.jquery.js     |  16 +-
 .../host/Volo.CmsKit.Web.Host/yarn.lock       | 236 ++++++-------
 .../host/Volo.CmsKit.Web.Unified/package.json |   2 +-
 .../wwwroot/libs/abp/core/abp.js              |  16 +-
 .../wwwroot/libs/abp/jquery/abp.jquery.js     |  16 +-
 .../host/Volo.CmsKit.Web.Unified/yarn.lock    | 236 ++++++-------
 modules/docs/app/VoloDocs.Web/package.json    |   4 +-
 .../VoloDocs.Web/wwwroot/libs/abp/core/abp.js |  16 +-
 .../wwwroot/libs/abp/jquery/abp.jquery.js     |  16 +-
 modules/docs/app/VoloDocs.Web/yarn.lock       | 296 ++++++++--------
 npm/lerna.json                                |   2 +-
 npm/ng-packs/lerna.version.json               |   2 +-
 npm/ng-packs/package.json                     |  20 +-
 npm/ng-packs/packages/account/package.json    |   4 +-
 npm/ng-packs/packages/components/package.json |   4 +-
 npm/ng-packs/packages/core/package.json       |   4 +-
 .../packages/feature-management/package.json  |   4 +-
 npm/ng-packs/packages/identity/package.json   |   6 +-
 .../permission-management/package.json        |   4 +-
 npm/ng-packs/packages/schematics/package.json |   2 +-
 .../packages/setting-management/package.json  |   4 +-
 .../packages/tenant-management/package.json   |   6 +-
 .../packages/theme-basic/package.json         |   4 +-
 .../packages/theme-shared/package.json        |   4 +-
 npm/packs/anchor-js/package.json              |   4 +-
 .../package.json                              |   4 +-
 .../package.json                              |  30 +-
 npm/packs/aspnetcore.mvc.ui/package.json      |   2 +-
 npm/packs/blogging/package.json               |  10 +-
 npm/packs/bootstrap-datepicker/package.json   |   2 +-
 npm/packs/bootstrap/package.json              |   4 +-
 npm/packs/chart.js/package.json               |   2 +-
 npm/packs/clipboard/package.json              |   4 +-
 npm/packs/codemirror/package.json             |   4 +-
 npm/packs/core/package.json                   |   4 +-
 npm/packs/datatables.net-bs4/package.json     |   4 +-
 npm/packs/datatables.net/package.json         |   4 +-
 npm/packs/docs/package.json                   |  12 +-
 npm/packs/flag-icon-css/package.json          |   2 +-
 npm/packs/font-awesome/package.json           |   4 +-
 npm/packs/highlight.js/package.json           |   4 +-
 npm/packs/jquery-form/package.json            |   4 +-
 .../package.json                              |   4 +-
 npm/packs/jquery-validation/package.json      |   4 +-
 npm/packs/jquery/package.json                 |   4 +-
 npm/packs/jstree/package.json                 |   4 +-
 npm/packs/lodash/package.json                 |   4 +-
 npm/packs/luxon/package.json                  |   2 +-
 .../package.json                              |   4 +-
 npm/packs/markdown-it/package.json            |   4 +-
 npm/packs/owl.carousel/package.json           |   4 +-
 npm/packs/popper.js/package.json              |   4 +-
 npm/packs/prismjs/package.json                |   6 +-
 npm/packs/select2/package.json                |   4 +-
 npm/packs/signalr/package.json                |   4 +-
 npm/packs/sweetalert/package.json             |   4 +-
 npm/packs/timeago/package.json                |   4 +-
 npm/packs/toastr/package.json                 |   4 +-
 npm/packs/tui-editor/package.json             |  10 +-
 npm/packs/uppy/package.json                   |   4 +-
 npm/packs/utils/package.json                  |   2 +-
 npm/packs/virtual-file-explorer/package.json  |   6 +-
 templates/app/angular/package.json            |  12 +-
 .../package.json                              |   2 +-
 .../yarn.lock                                 | 236 ++++++-------
 .../package.json                              |   2 +-
 .../yarn.lock                                 | 236 ++++++-------
 .../package.json                              |   2 +-
 .../yarn.lock                                 | 236 ++++++-------
 .../package.json                              |   2 +-
 .../MyCompanyName.MyProjectName.Web/yarn.lock | 236 ++++++-------
 templates/module/angular/package.json         |  12 +-
 .../projects/my-project-name/package.json     |   4 +-
 .../package.json                              |   2 +-
 .../yarn.lock                                 | 236 ++++++-------
 .../package.json                              |   2 +-
 .../yarn.lock                                 | 236 ++++++-------
 .../package.json                              |   2 +-
 .../yarn.lock                                 | 236 ++++++-------
 103 files changed, 2144 insertions(+), 2128 deletions(-)

diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
index 9838b50651..60d92094ba 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
@@ -3,7 +3,7 @@
   "name": "asp.net",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "^3.0.5",
+    "@abp/aspnetcore.mvc.ui.theme.shared": "^3.1.0-rc.2",
     "highlight.js": "^9.13.1"
   },
   "devDependencies": {}
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js
index 41837d2368..20bd92147a 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js
@@ -706,18 +706,18 @@ var abp = abp || {};
 
     var toLocal = function (date) {
         return new Date(
-            date.getUTCFullYear(),
-            date.getUTCMonth(),
-            date.getUTCDate(),
-            date.getUTCHours(),
-            date.getUTCMinutes(),
-            date.getUTCSeconds(),
-            date.getUTCMilliseconds()
+            date.getFullYear(),
+            date.getMonth(),
+            date.getDate(),
+            date.getHours(),
+            date.getMinutes(),
+            date.getSeconds(),
+            date.getMilliseconds()
         );
     };
 
     var toUtc = function (date) {
-        Date.UTC(
+        return Date.UTC(
             date.getUTCFullYear(),
             date.getUTCMonth(),
             date.getUTCDate(),
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/jquery/abp.jquery.js b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/jquery/abp.jquery.js
index e6aff047f7..3087635e7d 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/jquery/abp.jquery.js
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/jquery/abp.jquery.js
@@ -79,13 +79,15 @@ var abp = abp || {};
         }
     };
 
-    new MutationObserver(mutationObserverCallback).observe(
-        $('body')[0],
-        {
-            subtree: true,
-            childList: true
-        }
-    );
+    $(function(){
+        new MutationObserver(mutationObserverCallback).observe(
+            $('body')[0],
+            {
+                subtree: true,
+                childList: true
+            }
+        );
+    });    
 
     // AJAX ///////////////////////////////////////////////////////////////////
 
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
index 3399733e18..fe5adc6229 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
@@ -2,30 +2,30 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.shared@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.0.5.tgz#5b370902cf229963f9aa10dd64482d57299dde76"
-  integrity sha512-iobAH39xrCdnqdaABaiYZg4lqNSOwPkMCLnyc+ytxOMbu/YnNKahXPmRhgd8dR/l+iQY1+6T4SWfLdGswi3gAg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.0.5"
-    "@abp/bootstrap" "~3.0.5"
-    "@abp/bootstrap-datepicker" "~3.0.5"
-    "@abp/datatables.net-bs4" "~3.0.5"
-    "@abp/font-awesome" "~3.0.5"
-    "@abp/jquery-form" "~3.0.5"
-    "@abp/jquery-validation-unobtrusive" "~3.0.5"
-    "@abp/lodash" "~3.0.5"
-    "@abp/luxon" "~3.0.5"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.0.5"
-    "@abp/select2" "~3.0.5"
-    "@abp/sweetalert" "~3.0.5"
-    "@abp/timeago" "~3.0.5"
-    "@abp/toastr" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.0.5.tgz#a050eaee328c56a3730f5abbf25035adf612d6f0"
-  integrity sha512-/EOgjXTzR+I1OK9KA7L3yzQ2RGSDW97+n3cQrSdLAUF+tnRvMJS0nytDlSJSRK2hb8/clFMaofZHCC81aUkYUg==
+"@abp/aspnetcore.mvc.ui.theme.shared@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -34,144 +34,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.0.5.tgz#3a7fd86dbcadc31c11be5b2b31c8cf8ac3035540"
-  integrity sha512-vIY1wT4RHoJAPhVK11Q5MS71iZbwsmM/0VTBvvs04mjRSSi6xhdyRYkA+l+P49fnOwhZNaaK19XwQdVVScDuhA==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.0.5.tgz#91f2c8fe6a57fc5789ae8fe9c206b2c159e55880"
-  integrity sha512-LdydeJIbw5k1k7FkWaI1lTectZeTXmEIoccJtj9Qx4N9yGt40wGsjz9SOvUdJ0IKAgntIWNQP8ohWiBPgzT7Xg==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.0.5.tgz#9a7bd990d02edc8128a5be3233b6fbb5669b15b8"
-  integrity sha512-LdkSkZQfN4hugcGNxBkje0+eQomivwNFbnAkMFQbvCwYLwKB2yvk7GCemEetW1piqvyrUGz4jqhtunjoXps5JA==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.0.5"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.0.5.tgz#9b79935970d2d4074994240b5deb01dff5987c0a"
-  integrity sha512-jIWRBEG/NlhaE43i6Xzr18XJ5aTWA+WWslf7WgNOArG5slGBbH4lLLja4HswLP3NGdSmzIyHJR1p9XQ82nBkbQ==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.0.5"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.0.5.tgz#0a0a39e8fa54522bf8a09ce76ff3927207a79491"
-  integrity sha512-HClQ2tcZuWBAChf9oOJOtMP1zHv8jqloPEcw3iqbhS/tWZBw5VQ4TO+BVfZsqHDXZNnWSmR6/2xiKsK32nliew==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.0.5.tgz#62d58c34f0abf268e30bdf788dfbd3f45b19b412"
-  integrity sha512-/+31Vtw1S9vvuNy/rN/Q6awkgUaYNNYXESgfvqI0pqIkvlPgigvS8E68mHqGzsxyRqdZisI6JGd94AF+vJD7sQ==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.0.5.tgz#9d2ea9b2509448ee163a163298a7a09480865f78"
-  integrity sha512-RKgvQciaMml33NvzA28aYyfNI+WQHRfKLFWvOvqc8qO4C3BvyrnwepuzZcnI/9UsELKLSLoFrfk3rJHhxnTJhg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.0.5.tgz#b8912e1c4cfdd4fdff6ad4aa7ee8693b55a3be1f"
-  integrity sha512-kPifDA+1ErbeQBwn+BzwtWuTHXzBke/EMCmITuj59plM/60gZ1ZfVm8EzzTmKS7iLaVVeOqTKf0vEQTobNYffw==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.0.5"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.0.5.tgz#55e36b3c832a35447fac69af312dedf1dee22279"
-  integrity sha512-fdqxc5CJ6TpUAF8+NEsKCmXvvZiOPR5bzczcfvfovxLOjvHvdEO74XPGjsjlBNTdaKMhmNGZRK4JRLUz7fvTng==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.0.5.tgz#2e43ac19a8df6e1e0220d6d4991d33a93d890754"
-  integrity sha512-2d2l+smWKAVP4/b6GSO+8rmJ7pFXiUewpBDwkHm5qgkK6n6UGqIcK9lIgiS2YQ6rmL6qdtuNhhqtC9GF2TF2kQ==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.0.5.tgz#d5d9f14095d76239bc0e6f9804c24d1f92ffcab4"
-  integrity sha512-+B2vxfPwxoIIb8Ac8eHi6OgAn0qbjmPZuun7/es0/ouYYTbEhvhTAD20X3PGZlHrIYeDyS2ansuXm8gJI+/BzA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.0.5.tgz#083042c939ea58bf719e35114a6c8efb07b68688"
-  integrity sha512-0UVHO2CO89t34O35OA3JzWGWLBpg+e1NQXSfVtK90nmg/QmzGkHVM9m7Su0jjLNBt3N5EA5OPOhriot3bCKItw==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.0.5.tgz#f908289927a63fd76fb8f60b00a37747d9edbe39"
-  integrity sha512-3GoXA8VtGyZWKiqaPCipPXYLLM7h2Y5Oecq5c5YlMQyW2akv7uHiQQF2GZW/nVsFu3HBbGTOWpKRRmVk3PEO9Q==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.0.5.tgz#79d7754713c64a6549da520dc6867ef3e3dd0350"
-  integrity sha512-VbeSHdAdDy8exrjplHMMhLVV4oG7Gq9zBb5M52f0sIkA4DkXFhksXHcHNoOCfhaKAXpenGA03Z9GJewZ3MTpMw==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.0.5.tgz#e3b92d23cf3633983980b6255bf63c43d422ceab"
-  integrity sha512-OUt4ANgj14GESfRG7+UqdONS8daOu+8x2OZDWv98hriuX0uCVBjwB2J0jRI/n653C68Mi0yHixGONDv9OLy/lg==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.0.5.tgz#b191a7c43f3dc77645fe27273f2f6619f7d4eb31"
-  integrity sha512-QhvAOU4C+Qxh/gFuCSGZtLU4KwVhdv/jtK8ovWyqbGvQMCCIimqa8BFKIz0H5XWIJhHwwWblkpjICWgjWh6uXw==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.0.5.tgz#fc83b678f5be3a22040d0421ad9db5b2eac9d4fc"
-  integrity sha512-qgi2DEu6FYpN/DYcOZrmXsAr1HqcIKMhBWeXgjfoYUIl/K5+OuUgbQ69D/jdc0jz8HU9a4Cw7Q8hhe4CkgssEw==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.0.5.tgz#66b3da953500e73ff1f23d1b41168cde8216ce49"
-  integrity sha512-X9V1xLIEazItaf93nFSA4p94WT6QK3yA4eIyvU7GyyEkkOQdaakNwPbRwy930sd+I+/oXnIqM1vDsJu9QDhgvg==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json
index 8f9f972442..66d620dc75 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json
@@ -3,7 +3,7 @@
   "name": "asp.net",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2"
   },
   "devDependencies": {}
 }
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/core/abp.js b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/core/abp.js
index 41837d2368..20bd92147a 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/core/abp.js
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/core/abp.js
@@ -706,18 +706,18 @@ var abp = abp || {};
 
     var toLocal = function (date) {
         return new Date(
-            date.getUTCFullYear(),
-            date.getUTCMonth(),
-            date.getUTCDate(),
-            date.getUTCHours(),
-            date.getUTCMinutes(),
-            date.getUTCSeconds(),
-            date.getUTCMilliseconds()
+            date.getFullYear(),
+            date.getMonth(),
+            date.getDate(),
+            date.getHours(),
+            date.getMinutes(),
+            date.getSeconds(),
+            date.getMilliseconds()
         );
     };
 
     var toUtc = function (date) {
-        Date.UTC(
+        return Date.UTC(
             date.getUTCFullYear(),
             date.getUTCMonth(),
             date.getUTCDate(),
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/jquery/abp.jquery.js b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/jquery/abp.jquery.js
index e6aff047f7..3087635e7d 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/jquery/abp.jquery.js
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/jquery/abp.jquery.js
@@ -79,13 +79,15 @@ var abp = abp || {};
         }
     };
 
-    new MutationObserver(mutationObserverCallback).observe(
-        $('body')[0],
-        {
-            subtree: true,
-            childList: true
-        }
-    );
+    $(function(){
+        new MutationObserver(mutationObserverCallback).observe(
+            $('body')[0],
+            {
+                subtree: true,
+                childList: true
+            }
+        );
+    });    
 
     // AJAX ///////////////////////////////////////////////////////////////////
 
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock
index b30d4d2f76..f1b72d84a6 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.0.5.tgz#c146f20226522f0305cc0fa31cfcf9d39be78901"
-  integrity sha512-ptNhD4xV2wSLW7vQ5KUgaRiH5Ov1OscZW2ZEoivnt3kqgtIC3DGw+SiE9vjFCvyY83fjRkIlW2PIfQxSySbteQ==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.0.5.tgz#5b370902cf229963f9aa10dd64482d57299dde76"
-  integrity sha512-iobAH39xrCdnqdaABaiYZg4lqNSOwPkMCLnyc+ytxOMbu/YnNKahXPmRhgd8dR/l+iQY1+6T4SWfLdGswi3gAg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.0.5"
-    "@abp/bootstrap" "~3.0.5"
-    "@abp/bootstrap-datepicker" "~3.0.5"
-    "@abp/datatables.net-bs4" "~3.0.5"
-    "@abp/font-awesome" "~3.0.5"
-    "@abp/jquery-form" "~3.0.5"
-    "@abp/jquery-validation-unobtrusive" "~3.0.5"
-    "@abp/lodash" "~3.0.5"
-    "@abp/luxon" "~3.0.5"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.0.5"
-    "@abp/select2" "~3.0.5"
-    "@abp/sweetalert" "~3.0.5"
-    "@abp/timeago" "~3.0.5"
-    "@abp/toastr" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.0.5.tgz#a050eaee328c56a3730f5abbf25035adf612d6f0"
-  integrity sha512-/EOgjXTzR+I1OK9KA7L3yzQ2RGSDW97+n3cQrSdLAUF+tnRvMJS0nytDlSJSRK2hb8/clFMaofZHCC81aUkYUg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.0.5.tgz#3a7fd86dbcadc31c11be5b2b31c8cf8ac3035540"
-  integrity sha512-vIY1wT4RHoJAPhVK11Q5MS71iZbwsmM/0VTBvvs04mjRSSi6xhdyRYkA+l+P49fnOwhZNaaK19XwQdVVScDuhA==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.0.5.tgz#91f2c8fe6a57fc5789ae8fe9c206b2c159e55880"
-  integrity sha512-LdydeJIbw5k1k7FkWaI1lTectZeTXmEIoccJtj9Qx4N9yGt40wGsjz9SOvUdJ0IKAgntIWNQP8ohWiBPgzT7Xg==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.0.5.tgz#9a7bd990d02edc8128a5be3233b6fbb5669b15b8"
-  integrity sha512-LdkSkZQfN4hugcGNxBkje0+eQomivwNFbnAkMFQbvCwYLwKB2yvk7GCemEetW1piqvyrUGz4jqhtunjoXps5JA==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.0.5"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.0.5.tgz#9b79935970d2d4074994240b5deb01dff5987c0a"
-  integrity sha512-jIWRBEG/NlhaE43i6Xzr18XJ5aTWA+WWslf7WgNOArG5slGBbH4lLLja4HswLP3NGdSmzIyHJR1p9XQ82nBkbQ==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.0.5"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.0.5.tgz#0a0a39e8fa54522bf8a09ce76ff3927207a79491"
-  integrity sha512-HClQ2tcZuWBAChf9oOJOtMP1zHv8jqloPEcw3iqbhS/tWZBw5VQ4TO+BVfZsqHDXZNnWSmR6/2xiKsK32nliew==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.0.5.tgz#62d58c34f0abf268e30bdf788dfbd3f45b19b412"
-  integrity sha512-/+31Vtw1S9vvuNy/rN/Q6awkgUaYNNYXESgfvqI0pqIkvlPgigvS8E68mHqGzsxyRqdZisI6JGd94AF+vJD7sQ==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.0.5.tgz#9d2ea9b2509448ee163a163298a7a09480865f78"
-  integrity sha512-RKgvQciaMml33NvzA28aYyfNI+WQHRfKLFWvOvqc8qO4C3BvyrnwepuzZcnI/9UsELKLSLoFrfk3rJHhxnTJhg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.0.5.tgz#b8912e1c4cfdd4fdff6ad4aa7ee8693b55a3be1f"
-  integrity sha512-kPifDA+1ErbeQBwn+BzwtWuTHXzBke/EMCmITuj59plM/60gZ1ZfVm8EzzTmKS7iLaVVeOqTKf0vEQTobNYffw==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.0.5"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.0.5.tgz#55e36b3c832a35447fac69af312dedf1dee22279"
-  integrity sha512-fdqxc5CJ6TpUAF8+NEsKCmXvvZiOPR5bzczcfvfovxLOjvHvdEO74XPGjsjlBNTdaKMhmNGZRK4JRLUz7fvTng==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.0.5.tgz#2e43ac19a8df6e1e0220d6d4991d33a93d890754"
-  integrity sha512-2d2l+smWKAVP4/b6GSO+8rmJ7pFXiUewpBDwkHm5qgkK6n6UGqIcK9lIgiS2YQ6rmL6qdtuNhhqtC9GF2TF2kQ==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.0.5.tgz#d5d9f14095d76239bc0e6f9804c24d1f92ffcab4"
-  integrity sha512-+B2vxfPwxoIIb8Ac8eHi6OgAn0qbjmPZuun7/es0/ouYYTbEhvhTAD20X3PGZlHrIYeDyS2ansuXm8gJI+/BzA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.0.5.tgz#083042c939ea58bf719e35114a6c8efb07b68688"
-  integrity sha512-0UVHO2CO89t34O35OA3JzWGWLBpg+e1NQXSfVtK90nmg/QmzGkHVM9m7Su0jjLNBt3N5EA5OPOhriot3bCKItw==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.0.5.tgz#f908289927a63fd76fb8f60b00a37747d9edbe39"
-  integrity sha512-3GoXA8VtGyZWKiqaPCipPXYLLM7h2Y5Oecq5c5YlMQyW2akv7uHiQQF2GZW/nVsFu3HBbGTOWpKRRmVk3PEO9Q==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.0.5.tgz#79d7754713c64a6549da520dc6867ef3e3dd0350"
-  integrity sha512-VbeSHdAdDy8exrjplHMMhLVV4oG7Gq9zBb5M52f0sIkA4DkXFhksXHcHNoOCfhaKAXpenGA03Z9GJewZ3MTpMw==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.0.5.tgz#e3b92d23cf3633983980b6255bf63c43d422ceab"
-  integrity sha512-OUt4ANgj14GESfRG7+UqdONS8daOu+8x2OZDWv98hriuX0uCVBjwB2J0jRI/n653C68Mi0yHixGONDv9OLy/lg==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.0.5.tgz#b191a7c43f3dc77645fe27273f2f6619f7d4eb31"
-  integrity sha512-QhvAOU4C+Qxh/gFuCSGZtLU4KwVhdv/jtK8ovWyqbGvQMCCIimqa8BFKIz0H5XWIJhHwwWblkpjICWgjWh6uXw==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.0.5.tgz#fc83b678f5be3a22040d0421ad9db5b2eac9d4fc"
-  integrity sha512-qgi2DEu6FYpN/DYcOZrmXsAr1HqcIKMhBWeXgjfoYUIl/K5+OuUgbQ69D/jdc0jz8HU9a4Cw7Q8hhe4CkgssEw==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.0.5.tgz#66b3da953500e73ff1f23d1b41168cde8216ce49"
-  integrity sha512-X9V1xLIEazItaf93nFSA4p94WT6QK3yA4eIyvU7GyyEkkOQdaakNwPbRwy930sd+I+/oXnIqM1vDsJu9QDhgvg==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json
index 63cfac4070..3329e0c9b4 100644
--- a/modules/blogging/app/Volo.BloggingTestApp/package.json
+++ b/modules/blogging/app/Volo.BloggingTestApp/package.json
@@ -3,7 +3,7 @@
   "name": "volo.blogtestapp",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5",
-    "@abp/blogging": "^3.0.5"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2",
+    "@abp/blogging": "^3.1.0-rc.2"
   }
 }
\ No newline at end of file
diff --git a/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/core/abp.js b/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/core/abp.js
index 41837d2368..20bd92147a 100644
--- a/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/core/abp.js
+++ b/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/core/abp.js
@@ -706,18 +706,18 @@ var abp = abp || {};
 
     var toLocal = function (date) {
         return new Date(
-            date.getUTCFullYear(),
-            date.getUTCMonth(),
-            date.getUTCDate(),
-            date.getUTCHours(),
-            date.getUTCMinutes(),
-            date.getUTCSeconds(),
-            date.getUTCMilliseconds()
+            date.getFullYear(),
+            date.getMonth(),
+            date.getDate(),
+            date.getHours(),
+            date.getMinutes(),
+            date.getSeconds(),
+            date.getMilliseconds()
         );
     };
 
     var toUtc = function (date) {
-        Date.UTC(
+        return Date.UTC(
             date.getUTCFullYear(),
             date.getUTCMonth(),
             date.getUTCDate(),
diff --git a/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/jquery/abp.jquery.js b/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/jquery/abp.jquery.js
index e6aff047f7..3087635e7d 100644
--- a/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/jquery/abp.jquery.js
+++ b/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/jquery/abp.jquery.js
@@ -79,13 +79,15 @@ var abp = abp || {};
         }
     };
 
-    new MutationObserver(mutationObserverCallback).observe(
-        $('body')[0],
-        {
-            subtree: true,
-            childList: true
-        }
-    );
+    $(function(){
+        new MutationObserver(mutationObserverCallback).observe(
+            $('body')[0],
+            {
+                subtree: true,
+                childList: true
+            }
+        );
+    });    
 
     // AJAX ///////////////////////////////////////////////////////////////////
 
diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock
index fcd9dbcd00..259516d463 100644
--- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock
+++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.0.5.tgz#c146f20226522f0305cc0fa31cfcf9d39be78901"
-  integrity sha512-ptNhD4xV2wSLW7vQ5KUgaRiH5Ov1OscZW2ZEoivnt3kqgtIC3DGw+SiE9vjFCvyY83fjRkIlW2PIfQxSySbteQ==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.0.5.tgz#5b370902cf229963f9aa10dd64482d57299dde76"
-  integrity sha512-iobAH39xrCdnqdaABaiYZg4lqNSOwPkMCLnyc+ytxOMbu/YnNKahXPmRhgd8dR/l+iQY1+6T4SWfLdGswi3gAg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.0.5"
-    "@abp/bootstrap" "~3.0.5"
-    "@abp/bootstrap-datepicker" "~3.0.5"
-    "@abp/datatables.net-bs4" "~3.0.5"
-    "@abp/font-awesome" "~3.0.5"
-    "@abp/jquery-form" "~3.0.5"
-    "@abp/jquery-validation-unobtrusive" "~3.0.5"
-    "@abp/lodash" "~3.0.5"
-    "@abp/luxon" "~3.0.5"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.0.5"
-    "@abp/select2" "~3.0.5"
-    "@abp/sweetalert" "~3.0.5"
-    "@abp/timeago" "~3.0.5"
-    "@abp/toastr" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.0.5.tgz#a050eaee328c56a3730f5abbf25035adf612d6f0"
-  integrity sha512-/EOgjXTzR+I1OK9KA7L3yzQ2RGSDW97+n3cQrSdLAUF+tnRvMJS0nytDlSJSRK2hb8/clFMaofZHCC81aUkYUg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,213 +41,213 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/blogging@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-3.0.5.tgz#07d476d9d7bb20b52ccd122c8cf7c7c2bd3c1aa4"
-  integrity sha512-3qBS3EfBRrcGzgo8xaJXIVNu/qkuhBLYixPur69nUa8sDAsYI725mVIOfznyYyTAxPXB2EDOf4WA+NKiEINrqQ==
+"@abp/blogging@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-3.1.0-rc.2.tgz#89f056ce6218cbeffeefbc96138d98596db6dd91"
+  integrity sha512-SrAsp6S/1FM9IRnpsOKLSxT/Cx0mENS7LmLYm/rMc8YwYTUZDg9s9DJhs6WqFgghadByvul6bgJ8NDLrktKJcA==
   dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.0.5"
-    "@abp/owl.carousel" "~3.0.5"
-    "@abp/prismjs" "~3.0.5"
-    "@abp/tui-editor" "~3.0.5"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+    "@abp/owl.carousel" "~3.1.0-rc.2"
+    "@abp/prismjs" "~3.1.0-rc.2"
+    "@abp/tui-editor" "~3.1.0-rc.2"
 
-"@abp/bootstrap-datepicker@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.0.5.tgz#3a7fd86dbcadc31c11be5b2b31c8cf8ac3035540"
-  integrity sha512-vIY1wT4RHoJAPhVK11Q5MS71iZbwsmM/0VTBvvs04mjRSSi6xhdyRYkA+l+P49fnOwhZNaaK19XwQdVVScDuhA==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.0.5.tgz#91f2c8fe6a57fc5789ae8fe9c206b2c159e55880"
-  integrity sha512-LdydeJIbw5k1k7FkWaI1lTectZeTXmEIoccJtj9Qx4N9yGt40wGsjz9SOvUdJ0IKAgntIWNQP8ohWiBPgzT7Xg==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/clipboard@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.0.5.tgz#7ceadd21360db11c91582a532029bfe65d10a930"
-  integrity sha512-iq455C096L5D+b6IrWkMxA9mbpggBNZ1kWfCQ3rhIjo0qbOGrvdGB3uQ+BqRS9Ni9ku7vBb2COldouIC9KOp5A==
+"@abp/clipboard@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.1.0-rc.2.tgz#73a8dbc1f98cfb64d374b463dcd16b186bb694bb"
+  integrity sha512-Q1Z9pcs3gpptjE8Cjm/38bPKwKncjoVYSO0TknyEZLM3QG+PtZwa9UCkaK+Truz/U3QoZqbPuNbPKr5cz7o+lw==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     clipboard "^2.0.6"
 
-"@abp/codemirror@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-3.0.5.tgz#2d60ad50f7b50833b0032f3c2e8992a89f257aa9"
-  integrity sha512-RkbmRGmSCB2962rJdhp0NgJ+qEP4gG05wuSuCMsYJTU3U9IkhkqiJbzupUzAkHQTaCQwCOUeXoBLUkwCHUP2DA==
+"@abp/codemirror@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-3.1.0-rc.2.tgz#020d6207094293109a0752b046064c2592056c27"
+  integrity sha512-TmbfAP+CpzbWly03iibi7x9dW655Zxcu50tifAyi3LSTwrQIbhB6jo1aksdA2X97qTSLBhvOt3avcqj91sKRhQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     codemirror "^5.54.0"
 
-"@abp/core@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.0.5.tgz#9a7bd990d02edc8128a5be3233b6fbb5669b15b8"
-  integrity sha512-LdkSkZQfN4hugcGNxBkje0+eQomivwNFbnAkMFQbvCwYLwKB2yvk7GCemEetW1piqvyrUGz4jqhtunjoXps5JA==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.0.5"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.0.5.tgz#9b79935970d2d4074994240b5deb01dff5987c0a"
-  integrity sha512-jIWRBEG/NlhaE43i6Xzr18XJ5aTWA+WWslf7WgNOArG5slGBbH4lLLja4HswLP3NGdSmzIyHJR1p9XQ82nBkbQ==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.0.5"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.0.5.tgz#0a0a39e8fa54522bf8a09ce76ff3927207a79491"
-  integrity sha512-HClQ2tcZuWBAChf9oOJOtMP1zHv8jqloPEcw3iqbhS/tWZBw5VQ4TO+BVfZsqHDXZNnWSmR6/2xiKsK32nliew==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.0.5.tgz#62d58c34f0abf268e30bdf788dfbd3f45b19b412"
-  integrity sha512-/+31Vtw1S9vvuNy/rN/Q6awkgUaYNNYXESgfvqI0pqIkvlPgigvS8E68mHqGzsxyRqdZisI6JGd94AF+vJD7sQ==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/highlight.js@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-3.0.5.tgz#f222b54958bd842840db5ad8b32d82f1cd209302"
-  integrity sha512-VT9UfukzbhMsWhUZNc8b792fY04lqkuJL98QprU59No1Rb7+XUa1k9FMbt2kl12Je3jltY3+UrDl+vrdasFxKg==
+"@abp/highlight.js@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-3.1.0-rc.2.tgz#4c796617471ec571dd6be2fc5327ae02e720ea1f"
+  integrity sha512-EUBRx7kDRmWEZx4bx1tHRjs0goMV1TzvuBQj7Wrq41CUqhpz2cBk9ZUI5AFGQJTSf0tz1SFqZhr4xDMpo8szTw==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
 
-"@abp/jquery-form@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.0.5.tgz#9d2ea9b2509448ee163a163298a7a09480865f78"
-  integrity sha512-RKgvQciaMml33NvzA28aYyfNI+WQHRfKLFWvOvqc8qO4C3BvyrnwepuzZcnI/9UsELKLSLoFrfk3rJHhxnTJhg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.0.5.tgz#b8912e1c4cfdd4fdff6ad4aa7ee8693b55a3be1f"
-  integrity sha512-kPifDA+1ErbeQBwn+BzwtWuTHXzBke/EMCmITuj59plM/60gZ1ZfVm8EzzTmKS7iLaVVeOqTKf0vEQTobNYffw==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.0.5"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.0.5.tgz#55e36b3c832a35447fac69af312dedf1dee22279"
-  integrity sha512-fdqxc5CJ6TpUAF8+NEsKCmXvvZiOPR5bzczcfvfovxLOjvHvdEO74XPGjsjlBNTdaKMhmNGZRK4JRLUz7fvTng==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.0.5.tgz#2e43ac19a8df6e1e0220d6d4991d33a93d890754"
-  integrity sha512-2d2l+smWKAVP4/b6GSO+8rmJ7pFXiUewpBDwkHm5qgkK6n6UGqIcK9lIgiS2YQ6rmL6qdtuNhhqtC9GF2TF2kQ==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.0.5.tgz#d5d9f14095d76239bc0e6f9804c24d1f92ffcab4"
-  integrity sha512-+B2vxfPwxoIIb8Ac8eHi6OgAn0qbjmPZuun7/es0/ouYYTbEhvhTAD20X3PGZlHrIYeDyS2ansuXm8gJI+/BzA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.0.5.tgz#083042c939ea58bf719e35114a6c8efb07b68688"
-  integrity sha512-0UVHO2CO89t34O35OA3JzWGWLBpg+e1NQXSfVtK90nmg/QmzGkHVM9m7Su0jjLNBt3N5EA5OPOhriot3bCKItw==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.0.5.tgz#f908289927a63fd76fb8f60b00a37747d9edbe39"
-  integrity sha512-3GoXA8VtGyZWKiqaPCipPXYLLM7h2Y5Oecq5c5YlMQyW2akv7uHiQQF2GZW/nVsFu3HBbGTOWpKRRmVk3PEO9Q==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/markdown-it@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-3.0.5.tgz#43c0daf0dd30de3d0109980aa5493db6f72108c1"
-  integrity sha512-HMRv5B29fQ5nPz4wFlfTsJ3dACotNLHZUuQbOt8SifRkt9Va0t20j+IwIGhSYVc93ttYHjB0IuMk6G10mdBA1A==
+"@abp/markdown-it@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-3.1.0-rc.2.tgz#cd9e84d4188c1adaad4f37ce5f9a1fa028fb5405"
+  integrity sha512-CufWWxhceJqzKxnTbFXMB+SVi2Ikp2CH8tQ5wvrsDwqJV6ViOCyhBLMIwcV1/oAY9lHzCI+abPiEUZdN7AzhYQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     markdown-it "^11.0.0"
 
-"@abp/owl.carousel@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-3.0.5.tgz#d575d201a9c4853aa8578e6d8da396de60d6c961"
-  integrity sha512-fBzNaJPRnFc1VV5MBpRAGr3yZtkcbRHOOKlq74bkg9kvnqNa8dLISPRxHsBCtX+bxndWI3OfmN9Uliiq39TgSA==
+"@abp/owl.carousel@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-3.1.0-rc.2.tgz#c17e34dd4a38aef12f59ad0ef9ad20715880aa98"
+  integrity sha512-065bHPn7XJHs2ABKdUx3hunnRmKuedjyZZuIMZNvavH4hJyiV3MI0F6RjWLohgMFIvmp0iM259bQwoCkvGFrBA==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     owl.carousel "^2.3.4"
 
-"@abp/prismjs@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.0.5.tgz#81a6ef656f3d7a76f365eb0bcbf2d0d3013d6e72"
-  integrity sha512-vdSSa1+tXS5+HWIgQyjDy4yQG7Q1YyuHQnFU6zlDJCQlE+20PL6lYgPnqR7DQ+Cd4lhRb3oxvloImYjwiwSQvA==
+"@abp/prismjs@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.1.0-rc.2.tgz#767d58c07e94c6e5056fd187d4e398efa108f67e"
+  integrity sha512-HCX/nw6noslnlw7xh94IaybI7xNYrjVOIld1C+J7p9AHizLhxh4kRbwVTpLhFzUWsSrTe8+VssgryimLQvTmjg==
   dependencies:
-    "@abp/clipboard" "~3.0.5"
-    "@abp/core" "~3.0.5"
+    "@abp/clipboard" "~3.1.0-rc.2"
+    "@abp/core" "~3.1.0-rc.2"
     prismjs "^1.20.0"
 
-"@abp/select2@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.0.5.tgz#79d7754713c64a6549da520dc6867ef3e3dd0350"
-  integrity sha512-VbeSHdAdDy8exrjplHMMhLVV4oG7Gq9zBb5M52f0sIkA4DkXFhksXHcHNoOCfhaKAXpenGA03Z9GJewZ3MTpMw==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.0.5.tgz#e3b92d23cf3633983980b6255bf63c43d422ceab"
-  integrity sha512-OUt4ANgj14GESfRG7+UqdONS8daOu+8x2OZDWv98hriuX0uCVBjwB2J0jRI/n653C68Mi0yHixGONDv9OLy/lg==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.0.5.tgz#b191a7c43f3dc77645fe27273f2f6619f7d4eb31"
-  integrity sha512-QhvAOU4C+Qxh/gFuCSGZtLU4KwVhdv/jtK8ovWyqbGvQMCCIimqa8BFKIz0H5XWIJhHwwWblkpjICWgjWh6uXw==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.0.5.tgz#fc83b678f5be3a22040d0421ad9db5b2eac9d4fc"
-  integrity sha512-qgi2DEu6FYpN/DYcOZrmXsAr1HqcIKMhBWeXgjfoYUIl/K5+OuUgbQ69D/jdc0jz8HU9a4Cw7Q8hhe4CkgssEw==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/tui-editor@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-3.0.5.tgz#9eee7cb555793a9c01a6e0ce10e77bb46577857c"
-  integrity sha512-xwaBhwnyvoIbEKWMSrTs2JHIOf3JK6tsABfcxhTRHXQfr2VONOEjbaLaAruNOuLJy3m/7rOsGWTeT8lMWwf3Fw==
+"@abp/tui-editor@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-3.1.0-rc.2.tgz#48a1f78b4aca6a82daeb243b2d192c1dbe01710f"
+  integrity sha512-w9mNBY4c1DXAsIwLpLLKXHoIZMMaQhY2xONhD771v503ZGyNKHU+0donbyowLUzznf3PX7LcVVx/vpYxCnWybw==
   dependencies:
-    "@abp/codemirror" "~3.0.5"
-    "@abp/highlight.js" "~3.0.5"
-    "@abp/jquery" "~3.0.5"
-    "@abp/markdown-it" "~3.0.5"
+    "@abp/codemirror" "~3.1.0-rc.2"
+    "@abp/highlight.js" "~3.1.0-rc.2"
+    "@abp/jquery" "~3.1.0-rc.2"
+    "@abp/markdown-it" "~3.1.0-rc.2"
     tui-editor "^1.4.10"
 
-"@abp/utils@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.0.5.tgz#66b3da953500e73ff1f23d1b41168cde8216ce49"
-  integrity sha512-X9V1xLIEazItaf93nFSA4p94WT6QK3yA4eIyvU7GyyEkkOQdaakNwPbRwy930sd+I+/oXnIqM1vDsJu9QDhgvg==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
index c4410d5c13..1c05d0716c 100644
--- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
+++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
@@ -3,6 +3,6 @@
   "name": "client-simulation-web",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2"
   }
 }
\ No newline at end of file
diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/core/abp.js b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/core/abp.js
index 41837d2368..20bd92147a 100644
--- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/core/abp.js
+++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/core/abp.js
@@ -706,18 +706,18 @@ var abp = abp || {};
 
     var toLocal = function (date) {
         return new Date(
-            date.getUTCFullYear(),
-            date.getUTCMonth(),
-            date.getUTCDate(),
-            date.getUTCHours(),
-            date.getUTCMinutes(),
-            date.getUTCSeconds(),
-            date.getUTCMilliseconds()
+            date.getFullYear(),
+            date.getMonth(),
+            date.getDate(),
+            date.getHours(),
+            date.getMinutes(),
+            date.getSeconds(),
+            date.getMilliseconds()
         );
     };
 
     var toUtc = function (date) {
-        Date.UTC(
+        return Date.UTC(
             date.getUTCFullYear(),
             date.getUTCMonth(),
             date.getUTCDate(),
diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/jquery/abp.jquery.js b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/jquery/abp.jquery.js
index e6aff047f7..3087635e7d 100644
--- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/jquery/abp.jquery.js
+++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/jquery/abp.jquery.js
@@ -79,13 +79,15 @@ var abp = abp || {};
         }
     };
 
-    new MutationObserver(mutationObserverCallback).observe(
-        $('body')[0],
-        {
-            subtree: true,
-            childList: true
-        }
-    );
+    $(function(){
+        new MutationObserver(mutationObserverCallback).observe(
+            $('body')[0],
+            {
+                subtree: true,
+                childList: true
+            }
+        );
+    });    
 
     // AJAX ///////////////////////////////////////////////////////////////////
 
diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock
index 2233b4f0cb..8d9afafbf8 100644
--- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock
+++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.0.5.tgz#c146f20226522f0305cc0fa31cfcf9d39be78901"
-  integrity sha512-ptNhD4xV2wSLW7vQ5KUgaRiH5Ov1OscZW2ZEoivnt3kqgtIC3DGw+SiE9vjFCvyY83fjRkIlW2PIfQxSySbteQ==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.0.5.tgz#5b370902cf229963f9aa10dd64482d57299dde76"
-  integrity sha512-iobAH39xrCdnqdaABaiYZg4lqNSOwPkMCLnyc+ytxOMbu/YnNKahXPmRhgd8dR/l+iQY1+6T4SWfLdGswi3gAg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.0.5"
-    "@abp/bootstrap" "~3.0.5"
-    "@abp/bootstrap-datepicker" "~3.0.5"
-    "@abp/datatables.net-bs4" "~3.0.5"
-    "@abp/font-awesome" "~3.0.5"
-    "@abp/jquery-form" "~3.0.5"
-    "@abp/jquery-validation-unobtrusive" "~3.0.5"
-    "@abp/lodash" "~3.0.5"
-    "@abp/luxon" "~3.0.5"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.0.5"
-    "@abp/select2" "~3.0.5"
-    "@abp/sweetalert" "~3.0.5"
-    "@abp/timeago" "~3.0.5"
-    "@abp/toastr" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.0.5.tgz#a050eaee328c56a3730f5abbf25035adf612d6f0"
-  integrity sha512-/EOgjXTzR+I1OK9KA7L3yzQ2RGSDW97+n3cQrSdLAUF+tnRvMJS0nytDlSJSRK2hb8/clFMaofZHCC81aUkYUg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.0.5.tgz#3a7fd86dbcadc31c11be5b2b31c8cf8ac3035540"
-  integrity sha512-vIY1wT4RHoJAPhVK11Q5MS71iZbwsmM/0VTBvvs04mjRSSi6xhdyRYkA+l+P49fnOwhZNaaK19XwQdVVScDuhA==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.0.5.tgz#91f2c8fe6a57fc5789ae8fe9c206b2c159e55880"
-  integrity sha512-LdydeJIbw5k1k7FkWaI1lTectZeTXmEIoccJtj9Qx4N9yGt40wGsjz9SOvUdJ0IKAgntIWNQP8ohWiBPgzT7Xg==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.0.5.tgz#9a7bd990d02edc8128a5be3233b6fbb5669b15b8"
-  integrity sha512-LdkSkZQfN4hugcGNxBkje0+eQomivwNFbnAkMFQbvCwYLwKB2yvk7GCemEetW1piqvyrUGz4jqhtunjoXps5JA==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.0.5"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.0.5.tgz#9b79935970d2d4074994240b5deb01dff5987c0a"
-  integrity sha512-jIWRBEG/NlhaE43i6Xzr18XJ5aTWA+WWslf7WgNOArG5slGBbH4lLLja4HswLP3NGdSmzIyHJR1p9XQ82nBkbQ==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.0.5"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.0.5.tgz#0a0a39e8fa54522bf8a09ce76ff3927207a79491"
-  integrity sha512-HClQ2tcZuWBAChf9oOJOtMP1zHv8jqloPEcw3iqbhS/tWZBw5VQ4TO+BVfZsqHDXZNnWSmR6/2xiKsK32nliew==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.0.5.tgz#62d58c34f0abf268e30bdf788dfbd3f45b19b412"
-  integrity sha512-/+31Vtw1S9vvuNy/rN/Q6awkgUaYNNYXESgfvqI0pqIkvlPgigvS8E68mHqGzsxyRqdZisI6JGd94AF+vJD7sQ==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.0.5.tgz#9d2ea9b2509448ee163a163298a7a09480865f78"
-  integrity sha512-RKgvQciaMml33NvzA28aYyfNI+WQHRfKLFWvOvqc8qO4C3BvyrnwepuzZcnI/9UsELKLSLoFrfk3rJHhxnTJhg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.0.5.tgz#b8912e1c4cfdd4fdff6ad4aa7ee8693b55a3be1f"
-  integrity sha512-kPifDA+1ErbeQBwn+BzwtWuTHXzBke/EMCmITuj59plM/60gZ1ZfVm8EzzTmKS7iLaVVeOqTKf0vEQTobNYffw==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.0.5"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.0.5.tgz#55e36b3c832a35447fac69af312dedf1dee22279"
-  integrity sha512-fdqxc5CJ6TpUAF8+NEsKCmXvvZiOPR5bzczcfvfovxLOjvHvdEO74XPGjsjlBNTdaKMhmNGZRK4JRLUz7fvTng==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.0.5.tgz#2e43ac19a8df6e1e0220d6d4991d33a93d890754"
-  integrity sha512-2d2l+smWKAVP4/b6GSO+8rmJ7pFXiUewpBDwkHm5qgkK6n6UGqIcK9lIgiS2YQ6rmL6qdtuNhhqtC9GF2TF2kQ==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.0.5.tgz#d5d9f14095d76239bc0e6f9804c24d1f92ffcab4"
-  integrity sha512-+B2vxfPwxoIIb8Ac8eHi6OgAn0qbjmPZuun7/es0/ouYYTbEhvhTAD20X3PGZlHrIYeDyS2ansuXm8gJI+/BzA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.0.5.tgz#083042c939ea58bf719e35114a6c8efb07b68688"
-  integrity sha512-0UVHO2CO89t34O35OA3JzWGWLBpg+e1NQXSfVtK90nmg/QmzGkHVM9m7Su0jjLNBt3N5EA5OPOhriot3bCKItw==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.0.5.tgz#f908289927a63fd76fb8f60b00a37747d9edbe39"
-  integrity sha512-3GoXA8VtGyZWKiqaPCipPXYLLM7h2Y5Oecq5c5YlMQyW2akv7uHiQQF2GZW/nVsFu3HBbGTOWpKRRmVk3PEO9Q==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.0.5.tgz#79d7754713c64a6549da520dc6867ef3e3dd0350"
-  integrity sha512-VbeSHdAdDy8exrjplHMMhLVV4oG7Gq9zBb5M52f0sIkA4DkXFhksXHcHNoOCfhaKAXpenGA03Z9GJewZ3MTpMw==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.0.5.tgz#e3b92d23cf3633983980b6255bf63c43d422ceab"
-  integrity sha512-OUt4ANgj14GESfRG7+UqdONS8daOu+8x2OZDWv98hriuX0uCVBjwB2J0jRI/n653C68Mi0yHixGONDv9OLy/lg==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.0.5.tgz#b191a7c43f3dc77645fe27273f2f6619f7d4eb31"
-  integrity sha512-QhvAOU4C+Qxh/gFuCSGZtLU4KwVhdv/jtK8ovWyqbGvQMCCIimqa8BFKIz0H5XWIJhHwwWblkpjICWgjWh6uXw==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.0.5.tgz#fc83b678f5be3a22040d0421ad9db5b2eac9d4fc"
-  integrity sha512-qgi2DEu6FYpN/DYcOZrmXsAr1HqcIKMhBWeXgjfoYUIl/K5+OuUgbQ69D/jdc0jz8HU9a4Cw7Q8hhe4CkgssEw==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.0.5.tgz#66b3da953500e73ff1f23d1b41168cde8216ce49"
-  integrity sha512-X9V1xLIEazItaf93nFSA4p94WT6QK3yA4eIyvU7GyyEkkOQdaakNwPbRwy930sd+I+/oXnIqM1vDsJu9QDhgvg==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json
index 14efeda0d6..ecc40c2236 100644
--- a/modules/cms-kit/angular/package.json
+++ b/modules/cms-kit/angular/package.json
@@ -15,11 +15,11 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~3.0.5",
-    "@abp/ng.identity": "~3.0.5",
-    "@abp/ng.setting-management": "~3.0.5",
-    "@abp/ng.tenant-management": "~3.0.5",
-    "@abp/ng.theme.basic": "~3.0.5",
+    "@abp/ng.account": "~3.1.0-rc.2",
+    "@abp/ng.identity": "~3.1.0-rc.2",
+    "@abp/ng.setting-management": "~3.1.0-rc.2",
+    "@abp/ng.tenant-management": "~3.1.0-rc.2",
+    "@abp/ng.theme.basic": "~3.1.0-rc.2",
     "@angular/animations": "~10.0.0",
     "@angular/common": "~10.0.0",
     "@angular/compiler": "~10.0.0",
diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json
index e61eba0c89..0f6c8018c3 100644
--- a/modules/cms-kit/angular/projects/cms-kit/package.json
+++ b/modules/cms-kit/angular/projects/cms-kit/package.json
@@ -4,8 +4,8 @@
   "peerDependencies": {
     "@angular/common": "^9.1.11",
     "@angular/core": "^9.1.11",
-    "@abp/ng.core": ">=3.0.5",
-    "@abp/ng.theme.shared": ">=3.0.5"
+    "@abp/ng.core": ">=3.1.0-rc.2",
+    "@abp/ng.theme.shared": ">=3.1.0-rc.2"
   },
   "dependencies": {
     "tslib": "^2.0.0"
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
index 55812dc3ab..2aff27f377 100644
--- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
@@ -3,6 +3,6 @@
   "name": "my-app-identityserver",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2"
   }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/core/abp.js b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/core/abp.js
index 41837d2368..20bd92147a 100644
--- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/core/abp.js
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/core/abp.js
@@ -706,18 +706,18 @@ var abp = abp || {};
 
     var toLocal = function (date) {
         return new Date(
-            date.getUTCFullYear(),
-            date.getUTCMonth(),
-            date.getUTCDate(),
-            date.getUTCHours(),
-            date.getUTCMinutes(),
-            date.getUTCSeconds(),
-            date.getUTCMilliseconds()
+            date.getFullYear(),
+            date.getMonth(),
+            date.getDate(),
+            date.getHours(),
+            date.getMinutes(),
+            date.getSeconds(),
+            date.getMilliseconds()
         );
     };
 
     var toUtc = function (date) {
-        Date.UTC(
+        return Date.UTC(
             date.getUTCFullYear(),
             date.getUTCMonth(),
             date.getUTCDate(),
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js
index e6aff047f7..3087635e7d 100644
--- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js
@@ -79,13 +79,15 @@ var abp = abp || {};
         }
     };
 
-    new MutationObserver(mutationObserverCallback).observe(
-        $('body')[0],
-        {
-            subtree: true,
-            childList: true
-        }
-    );
+    $(function(){
+        new MutationObserver(mutationObserverCallback).observe(
+            $('body')[0],
+            {
+                subtree: true,
+                childList: true
+            }
+        );
+    });    
 
     // AJAX ///////////////////////////////////////////////////////////////////
 
diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock
index a583172e87..c836cc49cb 100644
--- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock
+++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.0.5.tgz#c146f20226522f0305cc0fa31cfcf9d39be78901"
-  integrity sha512-ptNhD4xV2wSLW7vQ5KUgaRiH5Ov1OscZW2ZEoivnt3kqgtIC3DGw+SiE9vjFCvyY83fjRkIlW2PIfQxSySbteQ==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.0.5.tgz#5b370902cf229963f9aa10dd64482d57299dde76"
-  integrity sha512-iobAH39xrCdnqdaABaiYZg4lqNSOwPkMCLnyc+ytxOMbu/YnNKahXPmRhgd8dR/l+iQY1+6T4SWfLdGswi3gAg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.0.5"
-    "@abp/bootstrap" "~3.0.5"
-    "@abp/bootstrap-datepicker" "~3.0.5"
-    "@abp/datatables.net-bs4" "~3.0.5"
-    "@abp/font-awesome" "~3.0.5"
-    "@abp/jquery-form" "~3.0.5"
-    "@abp/jquery-validation-unobtrusive" "~3.0.5"
-    "@abp/lodash" "~3.0.5"
-    "@abp/luxon" "~3.0.5"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.0.5"
-    "@abp/select2" "~3.0.5"
-    "@abp/sweetalert" "~3.0.5"
-    "@abp/timeago" "~3.0.5"
-    "@abp/toastr" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.0.5.tgz#a050eaee328c56a3730f5abbf25035adf612d6f0"
-  integrity sha512-/EOgjXTzR+I1OK9KA7L3yzQ2RGSDW97+n3cQrSdLAUF+tnRvMJS0nytDlSJSRK2hb8/clFMaofZHCC81aUkYUg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.0.5.tgz#3a7fd86dbcadc31c11be5b2b31c8cf8ac3035540"
-  integrity sha512-vIY1wT4RHoJAPhVK11Q5MS71iZbwsmM/0VTBvvs04mjRSSi6xhdyRYkA+l+P49fnOwhZNaaK19XwQdVVScDuhA==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.0.5.tgz#91f2c8fe6a57fc5789ae8fe9c206b2c159e55880"
-  integrity sha512-LdydeJIbw5k1k7FkWaI1lTectZeTXmEIoccJtj9Qx4N9yGt40wGsjz9SOvUdJ0IKAgntIWNQP8ohWiBPgzT7Xg==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.0.5.tgz#9a7bd990d02edc8128a5be3233b6fbb5669b15b8"
-  integrity sha512-LdkSkZQfN4hugcGNxBkje0+eQomivwNFbnAkMFQbvCwYLwKB2yvk7GCemEetW1piqvyrUGz4jqhtunjoXps5JA==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.0.5"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.0.5.tgz#9b79935970d2d4074994240b5deb01dff5987c0a"
-  integrity sha512-jIWRBEG/NlhaE43i6Xzr18XJ5aTWA+WWslf7WgNOArG5slGBbH4lLLja4HswLP3NGdSmzIyHJR1p9XQ82nBkbQ==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.0.5"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.0.5.tgz#0a0a39e8fa54522bf8a09ce76ff3927207a79491"
-  integrity sha512-HClQ2tcZuWBAChf9oOJOtMP1zHv8jqloPEcw3iqbhS/tWZBw5VQ4TO+BVfZsqHDXZNnWSmR6/2xiKsK32nliew==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.0.5.tgz#62d58c34f0abf268e30bdf788dfbd3f45b19b412"
-  integrity sha512-/+31Vtw1S9vvuNy/rN/Q6awkgUaYNNYXESgfvqI0pqIkvlPgigvS8E68mHqGzsxyRqdZisI6JGd94AF+vJD7sQ==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.0.5.tgz#9d2ea9b2509448ee163a163298a7a09480865f78"
-  integrity sha512-RKgvQciaMml33NvzA28aYyfNI+WQHRfKLFWvOvqc8qO4C3BvyrnwepuzZcnI/9UsELKLSLoFrfk3rJHhxnTJhg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.0.5.tgz#b8912e1c4cfdd4fdff6ad4aa7ee8693b55a3be1f"
-  integrity sha512-kPifDA+1ErbeQBwn+BzwtWuTHXzBke/EMCmITuj59plM/60gZ1ZfVm8EzzTmKS7iLaVVeOqTKf0vEQTobNYffw==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.0.5"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.0.5.tgz#55e36b3c832a35447fac69af312dedf1dee22279"
-  integrity sha512-fdqxc5CJ6TpUAF8+NEsKCmXvvZiOPR5bzczcfvfovxLOjvHvdEO74XPGjsjlBNTdaKMhmNGZRK4JRLUz7fvTng==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.0.5.tgz#2e43ac19a8df6e1e0220d6d4991d33a93d890754"
-  integrity sha512-2d2l+smWKAVP4/b6GSO+8rmJ7pFXiUewpBDwkHm5qgkK6n6UGqIcK9lIgiS2YQ6rmL6qdtuNhhqtC9GF2TF2kQ==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.0.5.tgz#d5d9f14095d76239bc0e6f9804c24d1f92ffcab4"
-  integrity sha512-+B2vxfPwxoIIb8Ac8eHi6OgAn0qbjmPZuun7/es0/ouYYTbEhvhTAD20X3PGZlHrIYeDyS2ansuXm8gJI+/BzA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.0.5.tgz#083042c939ea58bf719e35114a6c8efb07b68688"
-  integrity sha512-0UVHO2CO89t34O35OA3JzWGWLBpg+e1NQXSfVtK90nmg/QmzGkHVM9m7Su0jjLNBt3N5EA5OPOhriot3bCKItw==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.0.5.tgz#f908289927a63fd76fb8f60b00a37747d9edbe39"
-  integrity sha512-3GoXA8VtGyZWKiqaPCipPXYLLM7h2Y5Oecq5c5YlMQyW2akv7uHiQQF2GZW/nVsFu3HBbGTOWpKRRmVk3PEO9Q==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.0.5.tgz#79d7754713c64a6549da520dc6867ef3e3dd0350"
-  integrity sha512-VbeSHdAdDy8exrjplHMMhLVV4oG7Gq9zBb5M52f0sIkA4DkXFhksXHcHNoOCfhaKAXpenGA03Z9GJewZ3MTpMw==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.0.5.tgz#e3b92d23cf3633983980b6255bf63c43d422ceab"
-  integrity sha512-OUt4ANgj14GESfRG7+UqdONS8daOu+8x2OZDWv98hriuX0uCVBjwB2J0jRI/n653C68Mi0yHixGONDv9OLy/lg==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.0.5.tgz#b191a7c43f3dc77645fe27273f2f6619f7d4eb31"
-  integrity sha512-QhvAOU4C+Qxh/gFuCSGZtLU4KwVhdv/jtK8ovWyqbGvQMCCIimqa8BFKIz0H5XWIJhHwwWblkpjICWgjWh6uXw==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.0.5.tgz#fc83b678f5be3a22040d0421ad9db5b2eac9d4fc"
-  integrity sha512-qgi2DEu6FYpN/DYcOZrmXsAr1HqcIKMhBWeXgjfoYUIl/K5+OuUgbQ69D/jdc0jz8HU9a4Cw7Q8hhe4CkgssEw==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.0.5.tgz#66b3da953500e73ff1f23d1b41168cde8216ce49"
-  integrity sha512-X9V1xLIEazItaf93nFSA4p94WT6QK3yA4eIyvU7GyyEkkOQdaakNwPbRwy930sd+I+/oXnIqM1vDsJu9QDhgvg==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
index 5ffe5c0500..7103162cc8 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2"
   }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/core/abp.js b/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/core/abp.js
index 41837d2368..20bd92147a 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/core/abp.js
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/core/abp.js
@@ -706,18 +706,18 @@ var abp = abp || {};
 
     var toLocal = function (date) {
         return new Date(
-            date.getUTCFullYear(),
-            date.getUTCMonth(),
-            date.getUTCDate(),
-            date.getUTCHours(),
-            date.getUTCMinutes(),
-            date.getUTCSeconds(),
-            date.getUTCMilliseconds()
+            date.getFullYear(),
+            date.getMonth(),
+            date.getDate(),
+            date.getHours(),
+            date.getMinutes(),
+            date.getSeconds(),
+            date.getMilliseconds()
         );
     };
 
     var toUtc = function (date) {
-        Date.UTC(
+        return Date.UTC(
             date.getUTCFullYear(),
             date.getUTCMonth(),
             date.getUTCDate(),
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/jquery/abp.jquery.js b/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/jquery/abp.jquery.js
index e6aff047f7..3087635e7d 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/jquery/abp.jquery.js
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/jquery/abp.jquery.js
@@ -79,13 +79,15 @@ var abp = abp || {};
         }
     };
 
-    new MutationObserver(mutationObserverCallback).observe(
-        $('body')[0],
-        {
-            subtree: true,
-            childList: true
-        }
-    );
+    $(function(){
+        new MutationObserver(mutationObserverCallback).observe(
+            $('body')[0],
+            {
+                subtree: true,
+                childList: true
+            }
+        );
+    });    
 
     // AJAX ///////////////////////////////////////////////////////////////////
 
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock
index ade6c69acd..be0f989fd7 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.0.5.tgz#c146f20226522f0305cc0fa31cfcf9d39be78901"
-  integrity sha512-ptNhD4xV2wSLW7vQ5KUgaRiH5Ov1OscZW2ZEoivnt3kqgtIC3DGw+SiE9vjFCvyY83fjRkIlW2PIfQxSySbteQ==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.0.5.tgz#5b370902cf229963f9aa10dd64482d57299dde76"
-  integrity sha512-iobAH39xrCdnqdaABaiYZg4lqNSOwPkMCLnyc+ytxOMbu/YnNKahXPmRhgd8dR/l+iQY1+6T4SWfLdGswi3gAg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.0.5"
-    "@abp/bootstrap" "~3.0.5"
-    "@abp/bootstrap-datepicker" "~3.0.5"
-    "@abp/datatables.net-bs4" "~3.0.5"
-    "@abp/font-awesome" "~3.0.5"
-    "@abp/jquery-form" "~3.0.5"
-    "@abp/jquery-validation-unobtrusive" "~3.0.5"
-    "@abp/lodash" "~3.0.5"
-    "@abp/luxon" "~3.0.5"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.0.5"
-    "@abp/select2" "~3.0.5"
-    "@abp/sweetalert" "~3.0.5"
-    "@abp/timeago" "~3.0.5"
-    "@abp/toastr" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.0.5.tgz#a050eaee328c56a3730f5abbf25035adf612d6f0"
-  integrity sha512-/EOgjXTzR+I1OK9KA7L3yzQ2RGSDW97+n3cQrSdLAUF+tnRvMJS0nytDlSJSRK2hb8/clFMaofZHCC81aUkYUg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.0.5.tgz#3a7fd86dbcadc31c11be5b2b31c8cf8ac3035540"
-  integrity sha512-vIY1wT4RHoJAPhVK11Q5MS71iZbwsmM/0VTBvvs04mjRSSi6xhdyRYkA+l+P49fnOwhZNaaK19XwQdVVScDuhA==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.0.5.tgz#91f2c8fe6a57fc5789ae8fe9c206b2c159e55880"
-  integrity sha512-LdydeJIbw5k1k7FkWaI1lTectZeTXmEIoccJtj9Qx4N9yGt40wGsjz9SOvUdJ0IKAgntIWNQP8ohWiBPgzT7Xg==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.0.5.tgz#9a7bd990d02edc8128a5be3233b6fbb5669b15b8"
-  integrity sha512-LdkSkZQfN4hugcGNxBkje0+eQomivwNFbnAkMFQbvCwYLwKB2yvk7GCemEetW1piqvyrUGz4jqhtunjoXps5JA==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.0.5"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.0.5.tgz#9b79935970d2d4074994240b5deb01dff5987c0a"
-  integrity sha512-jIWRBEG/NlhaE43i6Xzr18XJ5aTWA+WWslf7WgNOArG5slGBbH4lLLja4HswLP3NGdSmzIyHJR1p9XQ82nBkbQ==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.0.5"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.0.5.tgz#0a0a39e8fa54522bf8a09ce76ff3927207a79491"
-  integrity sha512-HClQ2tcZuWBAChf9oOJOtMP1zHv8jqloPEcw3iqbhS/tWZBw5VQ4TO+BVfZsqHDXZNnWSmR6/2xiKsK32nliew==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.0.5.tgz#62d58c34f0abf268e30bdf788dfbd3f45b19b412"
-  integrity sha512-/+31Vtw1S9vvuNy/rN/Q6awkgUaYNNYXESgfvqI0pqIkvlPgigvS8E68mHqGzsxyRqdZisI6JGd94AF+vJD7sQ==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.0.5.tgz#9d2ea9b2509448ee163a163298a7a09480865f78"
-  integrity sha512-RKgvQciaMml33NvzA28aYyfNI+WQHRfKLFWvOvqc8qO4C3BvyrnwepuzZcnI/9UsELKLSLoFrfk3rJHhxnTJhg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.0.5.tgz#b8912e1c4cfdd4fdff6ad4aa7ee8693b55a3be1f"
-  integrity sha512-kPifDA+1ErbeQBwn+BzwtWuTHXzBke/EMCmITuj59plM/60gZ1ZfVm8EzzTmKS7iLaVVeOqTKf0vEQTobNYffw==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.0.5"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.0.5.tgz#55e36b3c832a35447fac69af312dedf1dee22279"
-  integrity sha512-fdqxc5CJ6TpUAF8+NEsKCmXvvZiOPR5bzczcfvfovxLOjvHvdEO74XPGjsjlBNTdaKMhmNGZRK4JRLUz7fvTng==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.0.5.tgz#2e43ac19a8df6e1e0220d6d4991d33a93d890754"
-  integrity sha512-2d2l+smWKAVP4/b6GSO+8rmJ7pFXiUewpBDwkHm5qgkK6n6UGqIcK9lIgiS2YQ6rmL6qdtuNhhqtC9GF2TF2kQ==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.0.5.tgz#d5d9f14095d76239bc0e6f9804c24d1f92ffcab4"
-  integrity sha512-+B2vxfPwxoIIb8Ac8eHi6OgAn0qbjmPZuun7/es0/ouYYTbEhvhTAD20X3PGZlHrIYeDyS2ansuXm8gJI+/BzA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.0.5.tgz#083042c939ea58bf719e35114a6c8efb07b68688"
-  integrity sha512-0UVHO2CO89t34O35OA3JzWGWLBpg+e1NQXSfVtK90nmg/QmzGkHVM9m7Su0jjLNBt3N5EA5OPOhriot3bCKItw==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.0.5.tgz#f908289927a63fd76fb8f60b00a37747d9edbe39"
-  integrity sha512-3GoXA8VtGyZWKiqaPCipPXYLLM7h2Y5Oecq5c5YlMQyW2akv7uHiQQF2GZW/nVsFu3HBbGTOWpKRRmVk3PEO9Q==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.0.5.tgz#79d7754713c64a6549da520dc6867ef3e3dd0350"
-  integrity sha512-VbeSHdAdDy8exrjplHMMhLVV4oG7Gq9zBb5M52f0sIkA4DkXFhksXHcHNoOCfhaKAXpenGA03Z9GJewZ3MTpMw==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.0.5.tgz#e3b92d23cf3633983980b6255bf63c43d422ceab"
-  integrity sha512-OUt4ANgj14GESfRG7+UqdONS8daOu+8x2OZDWv98hriuX0uCVBjwB2J0jRI/n653C68Mi0yHixGONDv9OLy/lg==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.0.5.tgz#b191a7c43f3dc77645fe27273f2f6619f7d4eb31"
-  integrity sha512-QhvAOU4C+Qxh/gFuCSGZtLU4KwVhdv/jtK8ovWyqbGvQMCCIimqa8BFKIz0H5XWIJhHwwWblkpjICWgjWh6uXw==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.0.5.tgz#fc83b678f5be3a22040d0421ad9db5b2eac9d4fc"
-  integrity sha512-qgi2DEu6FYpN/DYcOZrmXsAr1HqcIKMhBWeXgjfoYUIl/K5+OuUgbQ69D/jdc0jz8HU9a4Cw7Q8hhe4CkgssEw==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.0.5.tgz#66b3da953500e73ff1f23d1b41168cde8216ce49"
-  integrity sha512-X9V1xLIEazItaf93nFSA4p94WT6QK3yA4eIyvU7GyyEkkOQdaakNwPbRwy930sd+I+/oXnIqM1vDsJu9QDhgvg==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
index 5ffe5c0500..7103162cc8 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2"
   }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/core/abp.js b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/core/abp.js
index 41837d2368..20bd92147a 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/core/abp.js
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/core/abp.js
@@ -706,18 +706,18 @@ var abp = abp || {};
 
     var toLocal = function (date) {
         return new Date(
-            date.getUTCFullYear(),
-            date.getUTCMonth(),
-            date.getUTCDate(),
-            date.getUTCHours(),
-            date.getUTCMinutes(),
-            date.getUTCSeconds(),
-            date.getUTCMilliseconds()
+            date.getFullYear(),
+            date.getMonth(),
+            date.getDate(),
+            date.getHours(),
+            date.getMinutes(),
+            date.getSeconds(),
+            date.getMilliseconds()
         );
     };
 
     var toUtc = function (date) {
-        Date.UTC(
+        return Date.UTC(
             date.getUTCFullYear(),
             date.getUTCMonth(),
             date.getUTCDate(),
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/jquery/abp.jquery.js b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/jquery/abp.jquery.js
index e6aff047f7..3087635e7d 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/jquery/abp.jquery.js
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/jquery/abp.jquery.js
@@ -79,13 +79,15 @@ var abp = abp || {};
         }
     };
 
-    new MutationObserver(mutationObserverCallback).observe(
-        $('body')[0],
-        {
-            subtree: true,
-            childList: true
-        }
-    );
+    $(function(){
+        new MutationObserver(mutationObserverCallback).observe(
+            $('body')[0],
+            {
+                subtree: true,
+                childList: true
+            }
+        );
+    });    
 
     // AJAX ///////////////////////////////////////////////////////////////////
 
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock
index 3261b074f0..f1a5b49588 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.0.5.tgz#c146f20226522f0305cc0fa31cfcf9d39be78901"
-  integrity sha512-ptNhD4xV2wSLW7vQ5KUgaRiH5Ov1OscZW2ZEoivnt3kqgtIC3DGw+SiE9vjFCvyY83fjRkIlW2PIfQxSySbteQ==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.0.5.tgz#5b370902cf229963f9aa10dd64482d57299dde76"
-  integrity sha512-iobAH39xrCdnqdaABaiYZg4lqNSOwPkMCLnyc+ytxOMbu/YnNKahXPmRhgd8dR/l+iQY1+6T4SWfLdGswi3gAg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.0.5"
-    "@abp/bootstrap" "~3.0.5"
-    "@abp/bootstrap-datepicker" "~3.0.5"
-    "@abp/datatables.net-bs4" "~3.0.5"
-    "@abp/font-awesome" "~3.0.5"
-    "@abp/jquery-form" "~3.0.5"
-    "@abp/jquery-validation-unobtrusive" "~3.0.5"
-    "@abp/lodash" "~3.0.5"
-    "@abp/luxon" "~3.0.5"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.0.5"
-    "@abp/select2" "~3.0.5"
-    "@abp/sweetalert" "~3.0.5"
-    "@abp/timeago" "~3.0.5"
-    "@abp/toastr" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.0.5.tgz#a050eaee328c56a3730f5abbf25035adf612d6f0"
-  integrity sha512-/EOgjXTzR+I1OK9KA7L3yzQ2RGSDW97+n3cQrSdLAUF+tnRvMJS0nytDlSJSRK2hb8/clFMaofZHCC81aUkYUg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.0.5.tgz#3a7fd86dbcadc31c11be5b2b31c8cf8ac3035540"
-  integrity sha512-vIY1wT4RHoJAPhVK11Q5MS71iZbwsmM/0VTBvvs04mjRSSi6xhdyRYkA+l+P49fnOwhZNaaK19XwQdVVScDuhA==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.0.5.tgz#91f2c8fe6a57fc5789ae8fe9c206b2c159e55880"
-  integrity sha512-LdydeJIbw5k1k7FkWaI1lTectZeTXmEIoccJtj9Qx4N9yGt40wGsjz9SOvUdJ0IKAgntIWNQP8ohWiBPgzT7Xg==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.0.5.tgz#9a7bd990d02edc8128a5be3233b6fbb5669b15b8"
-  integrity sha512-LdkSkZQfN4hugcGNxBkje0+eQomivwNFbnAkMFQbvCwYLwKB2yvk7GCemEetW1piqvyrUGz4jqhtunjoXps5JA==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.0.5"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.0.5.tgz#9b79935970d2d4074994240b5deb01dff5987c0a"
-  integrity sha512-jIWRBEG/NlhaE43i6Xzr18XJ5aTWA+WWslf7WgNOArG5slGBbH4lLLja4HswLP3NGdSmzIyHJR1p9XQ82nBkbQ==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.0.5"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.0.5.tgz#0a0a39e8fa54522bf8a09ce76ff3927207a79491"
-  integrity sha512-HClQ2tcZuWBAChf9oOJOtMP1zHv8jqloPEcw3iqbhS/tWZBw5VQ4TO+BVfZsqHDXZNnWSmR6/2xiKsK32nliew==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.0.5.tgz#62d58c34f0abf268e30bdf788dfbd3f45b19b412"
-  integrity sha512-/+31Vtw1S9vvuNy/rN/Q6awkgUaYNNYXESgfvqI0pqIkvlPgigvS8E68mHqGzsxyRqdZisI6JGd94AF+vJD7sQ==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.0.5.tgz#9d2ea9b2509448ee163a163298a7a09480865f78"
-  integrity sha512-RKgvQciaMml33NvzA28aYyfNI+WQHRfKLFWvOvqc8qO4C3BvyrnwepuzZcnI/9UsELKLSLoFrfk3rJHhxnTJhg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.0.5.tgz#b8912e1c4cfdd4fdff6ad4aa7ee8693b55a3be1f"
-  integrity sha512-kPifDA+1ErbeQBwn+BzwtWuTHXzBke/EMCmITuj59plM/60gZ1ZfVm8EzzTmKS7iLaVVeOqTKf0vEQTobNYffw==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.0.5"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.0.5.tgz#55e36b3c832a35447fac69af312dedf1dee22279"
-  integrity sha512-fdqxc5CJ6TpUAF8+NEsKCmXvvZiOPR5bzczcfvfovxLOjvHvdEO74XPGjsjlBNTdaKMhmNGZRK4JRLUz7fvTng==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.0.5.tgz#2e43ac19a8df6e1e0220d6d4991d33a93d890754"
-  integrity sha512-2d2l+smWKAVP4/b6GSO+8rmJ7pFXiUewpBDwkHm5qgkK6n6UGqIcK9lIgiS2YQ6rmL6qdtuNhhqtC9GF2TF2kQ==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.0.5.tgz#d5d9f14095d76239bc0e6f9804c24d1f92ffcab4"
-  integrity sha512-+B2vxfPwxoIIb8Ac8eHi6OgAn0qbjmPZuun7/es0/ouYYTbEhvhTAD20X3PGZlHrIYeDyS2ansuXm8gJI+/BzA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.0.5.tgz#083042c939ea58bf719e35114a6c8efb07b68688"
-  integrity sha512-0UVHO2CO89t34O35OA3JzWGWLBpg+e1NQXSfVtK90nmg/QmzGkHVM9m7Su0jjLNBt3N5EA5OPOhriot3bCKItw==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.0.5.tgz#f908289927a63fd76fb8f60b00a37747d9edbe39"
-  integrity sha512-3GoXA8VtGyZWKiqaPCipPXYLLM7h2Y5Oecq5c5YlMQyW2akv7uHiQQF2GZW/nVsFu3HBbGTOWpKRRmVk3PEO9Q==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.0.5.tgz#79d7754713c64a6549da520dc6867ef3e3dd0350"
-  integrity sha512-VbeSHdAdDy8exrjplHMMhLVV4oG7Gq9zBb5M52f0sIkA4DkXFhksXHcHNoOCfhaKAXpenGA03Z9GJewZ3MTpMw==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.0.5.tgz#e3b92d23cf3633983980b6255bf63c43d422ceab"
-  integrity sha512-OUt4ANgj14GESfRG7+UqdONS8daOu+8x2OZDWv98hriuX0uCVBjwB2J0jRI/n653C68Mi0yHixGONDv9OLy/lg==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.0.5.tgz#b191a7c43f3dc77645fe27273f2f6619f7d4eb31"
-  integrity sha512-QhvAOU4C+Qxh/gFuCSGZtLU4KwVhdv/jtK8ovWyqbGvQMCCIimqa8BFKIz0H5XWIJhHwwWblkpjICWgjWh6uXw==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.0.5.tgz#fc83b678f5be3a22040d0421ad9db5b2eac9d4fc"
-  integrity sha512-qgi2DEu6FYpN/DYcOZrmXsAr1HqcIKMhBWeXgjfoYUIl/K5+OuUgbQ69D/jdc0jz8HU9a4Cw7Q8hhe4CkgssEw==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.0.5.tgz#66b3da953500e73ff1f23d1b41168cde8216ce49"
-  integrity sha512-X9V1xLIEazItaf93nFSA4p94WT6QK3yA4eIyvU7GyyEkkOQdaakNwPbRwy930sd+I+/oXnIqM1vDsJu9QDhgvg==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json
index c6b5ba0dba..0db7e0be4e 100644
--- a/modules/docs/app/VoloDocs.Web/package.json
+++ b/modules/docs/app/VoloDocs.Web/package.json
@@ -3,7 +3,7 @@
   "name": "volo.docstestapp",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5",
-    "@abp/docs": "^3.0.5"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2",
+    "@abp/docs": "^3.1.0-rc.2"
   }
 }
diff --git a/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/core/abp.js b/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/core/abp.js
index 41837d2368..20bd92147a 100644
--- a/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/core/abp.js
+++ b/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/core/abp.js
@@ -706,18 +706,18 @@ var abp = abp || {};
 
     var toLocal = function (date) {
         return new Date(
-            date.getUTCFullYear(),
-            date.getUTCMonth(),
-            date.getUTCDate(),
-            date.getUTCHours(),
-            date.getUTCMinutes(),
-            date.getUTCSeconds(),
-            date.getUTCMilliseconds()
+            date.getFullYear(),
+            date.getMonth(),
+            date.getDate(),
+            date.getHours(),
+            date.getMinutes(),
+            date.getSeconds(),
+            date.getMilliseconds()
         );
     };
 
     var toUtc = function (date) {
-        Date.UTC(
+        return Date.UTC(
             date.getUTCFullYear(),
             date.getUTCMonth(),
             date.getUTCDate(),
diff --git a/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/jquery/abp.jquery.js b/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/jquery/abp.jquery.js
index e6aff047f7..3087635e7d 100644
--- a/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/jquery/abp.jquery.js
+++ b/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/jquery/abp.jquery.js
@@ -79,13 +79,15 @@ var abp = abp || {};
         }
     };
 
-    new MutationObserver(mutationObserverCallback).observe(
-        $('body')[0],
-        {
-            subtree: true,
-            childList: true
-        }
-    );
+    $(function(){
+        new MutationObserver(mutationObserverCallback).observe(
+            $('body')[0],
+            {
+                subtree: true,
+                childList: true
+            }
+        );
+    });    
 
     // AJAX ///////////////////////////////////////////////////////////////////
 
diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock
index 4c93967952..22df5982ca 100644
--- a/modules/docs/app/VoloDocs.Web/yarn.lock
+++ b/modules/docs/app/VoloDocs.Web/yarn.lock
@@ -2,45 +2,45 @@
 # yarn lockfile v1
 
 
-"@abp/anchor-js@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-3.0.5.tgz#e1affea2e21370562b244f81ce8911d3d36f8d55"
-  integrity sha512-068PVUu/Zu1zQNgWsJXhUmSIm/HRA4Mx6VXxlNL+qiCLffg8AzRuj4rZc+UaYJieDmJDJc0dlWgiyUFpuvzZ8A==
+"@abp/anchor-js@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-3.1.0-rc.2.tgz#3f445de4884bbe4a7be2bada7db56a376e9fba5e"
+  integrity sha512-qBFBy8tcinL7YWFy7iPprXTaFowgc7cvyO8mEKG2HG6/LdObm6KBASgAXGLRv2Jhxbdfyrisbcr+TdM8gzrWog==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     anchor-js "^4.2.2"
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.0.5.tgz#c146f20226522f0305cc0fa31cfcf9d39be78901"
-  integrity sha512-ptNhD4xV2wSLW7vQ5KUgaRiH5Ov1OscZW2ZEoivnt3kqgtIC3DGw+SiE9vjFCvyY83fjRkIlW2PIfQxSySbteQ==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.0.5.tgz#5b370902cf229963f9aa10dd64482d57299dde76"
-  integrity sha512-iobAH39xrCdnqdaABaiYZg4lqNSOwPkMCLnyc+ytxOMbu/YnNKahXPmRhgd8dR/l+iQY1+6T4SWfLdGswi3gAg==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.0.5"
-    "@abp/bootstrap" "~3.0.5"
-    "@abp/bootstrap-datepicker" "~3.0.5"
-    "@abp/datatables.net-bs4" "~3.0.5"
-    "@abp/font-awesome" "~3.0.5"
-    "@abp/jquery-form" "~3.0.5"
-    "@abp/jquery-validation-unobtrusive" "~3.0.5"
-    "@abp/lodash" "~3.0.5"
-    "@abp/luxon" "~3.0.5"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.0.5"
-    "@abp/select2" "~3.0.5"
-    "@abp/sweetalert" "~3.0.5"
-    "@abp/timeago" "~3.0.5"
-    "@abp/toastr" "~3.0.5"
-
-"@abp/aspnetcore.mvc.ui@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.0.5.tgz#a050eaee328c56a3730f5abbf25035adf612d6f0"
-  integrity sha512-/EOgjXTzR+I1OK9KA7L3yzQ2RGSDW97+n3cQrSdLAUF+tnRvMJS0nytDlSJSRK2hb8/clFMaofZHCC81aUkYUg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -49,180 +49,180 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.0.5.tgz#3a7fd86dbcadc31c11be5b2b31c8cf8ac3035540"
-  integrity sha512-vIY1wT4RHoJAPhVK11Q5MS71iZbwsmM/0VTBvvs04mjRSSi6xhdyRYkA+l+P49fnOwhZNaaK19XwQdVVScDuhA==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.0.5.tgz#91f2c8fe6a57fc5789ae8fe9c206b2c159e55880"
-  integrity sha512-LdydeJIbw5k1k7FkWaI1lTectZeTXmEIoccJtj9Qx4N9yGt40wGsjz9SOvUdJ0IKAgntIWNQP8ohWiBPgzT7Xg==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/clipboard@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.0.5.tgz#7ceadd21360db11c91582a532029bfe65d10a930"
-  integrity sha512-iq455C096L5D+b6IrWkMxA9mbpggBNZ1kWfCQ3rhIjo0qbOGrvdGB3uQ+BqRS9Ni9ku7vBb2COldouIC9KOp5A==
+"@abp/clipboard@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.1.0-rc.2.tgz#73a8dbc1f98cfb64d374b463dcd16b186bb694bb"
+  integrity sha512-Q1Z9pcs3gpptjE8Cjm/38bPKwKncjoVYSO0TknyEZLM3QG+PtZwa9UCkaK+Truz/U3QoZqbPuNbPKr5cz7o+lw==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     clipboard "^2.0.6"
 
-"@abp/core@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.0.5.tgz#9a7bd990d02edc8128a5be3233b6fbb5669b15b8"
-  integrity sha512-LdkSkZQfN4hugcGNxBkje0+eQomivwNFbnAkMFQbvCwYLwKB2yvk7GCemEetW1piqvyrUGz4jqhtunjoXps5JA==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.0.5"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.0.5.tgz#9b79935970d2d4074994240b5deb01dff5987c0a"
-  integrity sha512-jIWRBEG/NlhaE43i6Xzr18XJ5aTWA+WWslf7WgNOArG5slGBbH4lLLja4HswLP3NGdSmzIyHJR1p9XQ82nBkbQ==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.0.5"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.0.5.tgz#0a0a39e8fa54522bf8a09ce76ff3927207a79491"
-  integrity sha512-HClQ2tcZuWBAChf9oOJOtMP1zHv8jqloPEcw3iqbhS/tWZBw5VQ4TO+BVfZsqHDXZNnWSmR6/2xiKsK32nliew==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/docs@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-3.0.5.tgz#733211ea72f3064ea5c23ed36a16c7f8b0ef5d8b"
-  integrity sha512-LQDHz6mE3ptP1AmpK+IEoY6edQB/t7Hu5ueLdtNHqTJWkwW7ngXOaECbkC2KVPywLqbXw0vzHBw2OnCVSKxtyw==
+"@abp/docs@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-3.1.0-rc.2.tgz#d46ec3c7b71fb7ad35e076ea6fd0b0bb9e09d27f"
+  integrity sha512-jGqxJTOQQb+xxNhasvy4S5qHGOesZwL4BruVdUXVbhUqc1M2lof6iJF4GxYaTndPigg4rOUpc+4WcSD8LUqWQw==
   dependencies:
-    "@abp/anchor-js" "~3.0.5"
-    "@abp/clipboard" "~3.0.5"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.0.5"
-    "@abp/popper.js" "~3.0.5"
-    "@abp/prismjs" "~3.0.5"
+    "@abp/anchor-js" "~3.1.0-rc.2"
+    "@abp/clipboard" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/popper.js" "~3.1.0-rc.2"
+    "@abp/prismjs" "~3.1.0-rc.2"
 
-"@abp/font-awesome@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.0.5.tgz#62d58c34f0abf268e30bdf788dfbd3f45b19b412"
-  integrity sha512-/+31Vtw1S9vvuNy/rN/Q6awkgUaYNNYXESgfvqI0pqIkvlPgigvS8E68mHqGzsxyRqdZisI6JGd94AF+vJD7sQ==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.0.5.tgz#9d2ea9b2509448ee163a163298a7a09480865f78"
-  integrity sha512-RKgvQciaMml33NvzA28aYyfNI+WQHRfKLFWvOvqc8qO4C3BvyrnwepuzZcnI/9UsELKLSLoFrfk3rJHhxnTJhg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.0.5.tgz#b8912e1c4cfdd4fdff6ad4aa7ee8693b55a3be1f"
-  integrity sha512-kPifDA+1ErbeQBwn+BzwtWuTHXzBke/EMCmITuj59plM/60gZ1ZfVm8EzzTmKS7iLaVVeOqTKf0vEQTobNYffw==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.0.5"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.0.5.tgz#55e36b3c832a35447fac69af312dedf1dee22279"
-  integrity sha512-fdqxc5CJ6TpUAF8+NEsKCmXvvZiOPR5bzczcfvfovxLOjvHvdEO74XPGjsjlBNTdaKMhmNGZRK4JRLUz7fvTng==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.0.5.tgz#2e43ac19a8df6e1e0220d6d4991d33a93d890754"
-  integrity sha512-2d2l+smWKAVP4/b6GSO+8rmJ7pFXiUewpBDwkHm5qgkK6n6UGqIcK9lIgiS2YQ6rmL6qdtuNhhqtC9GF2TF2kQ==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.0.5.tgz#d5d9f14095d76239bc0e6f9804c24d1f92ffcab4"
-  integrity sha512-+B2vxfPwxoIIb8Ac8eHi6OgAn0qbjmPZuun7/es0/ouYYTbEhvhTAD20X3PGZlHrIYeDyS2ansuXm8gJI+/BzA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.0.5.tgz#083042c939ea58bf719e35114a6c8efb07b68688"
-  integrity sha512-0UVHO2CO89t34O35OA3JzWGWLBpg+e1NQXSfVtK90nmg/QmzGkHVM9m7Su0jjLNBt3N5EA5OPOhriot3bCKItw==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.0.5.tgz#f908289927a63fd76fb8f60b00a37747d9edbe39"
-  integrity sha512-3GoXA8VtGyZWKiqaPCipPXYLLM7h2Y5Oecq5c5YlMQyW2akv7uHiQQF2GZW/nVsFu3HBbGTOWpKRRmVk3PEO9Q==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/popper.js@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-3.0.5.tgz#ef46770e3a63cf10c91d4bda983198cd84b8e063"
-  integrity sha512-5MzLBMRWh2hHLVJJIrvJa6c4fwEdUk9HmnqpaqXnSX52B4uy9jcBexMdi/H7+cmao9NHm+Ld9n9G0YA8vMNeKA==
+"@abp/popper.js@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-3.1.0-rc.2.tgz#26bd792c33b9a8cf347d14be4e08a4d42eb189c8"
+  integrity sha512-xWsOIzndRkvwdD5LOan8zf4vtceW0RIjCWSWdRtso4+V/fTLzWw9ofG3utvMaeJvu1Rfdr2mb2tLzYDNezNDAg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     popper.js "^1.16.0"
 
-"@abp/prismjs@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.0.5.tgz#81a6ef656f3d7a76f365eb0bcbf2d0d3013d6e72"
-  integrity sha512-vdSSa1+tXS5+HWIgQyjDy4yQG7Q1YyuHQnFU6zlDJCQlE+20PL6lYgPnqR7DQ+Cd4lhRb3oxvloImYjwiwSQvA==
+"@abp/prismjs@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.1.0-rc.2.tgz#767d58c07e94c6e5056fd187d4e398efa108f67e"
+  integrity sha512-HCX/nw6noslnlw7xh94IaybI7xNYrjVOIld1C+J7p9AHizLhxh4kRbwVTpLhFzUWsSrTe8+VssgryimLQvTmjg==
   dependencies:
-    "@abp/clipboard" "~3.0.5"
-    "@abp/core" "~3.0.5"
+    "@abp/clipboard" "~3.1.0-rc.2"
+    "@abp/core" "~3.1.0-rc.2"
     prismjs "^1.20.0"
 
-"@abp/select2@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.0.5.tgz#79d7754713c64a6549da520dc6867ef3e3dd0350"
-  integrity sha512-VbeSHdAdDy8exrjplHMMhLVV4oG7Gq9zBb5M52f0sIkA4DkXFhksXHcHNoOCfhaKAXpenGA03Z9GJewZ3MTpMw==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.0.5.tgz#e3b92d23cf3633983980b6255bf63c43d422ceab"
-  integrity sha512-OUt4ANgj14GESfRG7+UqdONS8daOu+8x2OZDWv98hriuX0uCVBjwB2J0jRI/n653C68Mi0yHixGONDv9OLy/lg==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.0.5"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.0.5.tgz#b191a7c43f3dc77645fe27273f2f6619f7d4eb31"
-  integrity sha512-QhvAOU4C+Qxh/gFuCSGZtLU4KwVhdv/jtK8ovWyqbGvQMCCIimqa8BFKIz0H5XWIJhHwwWblkpjICWgjWh6uXw==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.0.5.tgz#fc83b678f5be3a22040d0421ad9db5b2eac9d4fc"
-  integrity sha512-qgi2DEu6FYpN/DYcOZrmXsAr1HqcIKMhBWeXgjfoYUIl/K5+OuUgbQ69D/jdc0jz8HU9a4Cw7Q8hhe4CkgssEw==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.0.5"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.0.5.tgz#66b3da953500e73ff1f23d1b41168cde8216ce49"
-  integrity sha512-X9V1xLIEazItaf93nFSA4p94WT6QK3yA4eIyvU7GyyEkkOQdaakNwPbRwy930sd+I+/oXnIqM1vDsJu9QDhgvg==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/npm/lerna.json b/npm/lerna.json
index b5f8b39800..fd6fc21eb1 100644
--- a/npm/lerna.json
+++ b/npm/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "packages": [
     "packs/*"
   ],
diff --git a/npm/ng-packs/lerna.version.json b/npm/ng-packs/lerna.version.json
index 28c088df6e..83d38bb0df 100644
--- a/npm/ng-packs/lerna.version.json
+++ b/npm/ng-packs/lerna.version.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "packages": [
     "packages/*"
   ],
diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json
index 552af1182a..843beb71bb 100644
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@@ -25,16 +25,16 @@
     "postinstall": "npm run compile:ivy"
   },
   "devDependencies": {
-    "@abp/ng.account": "~3.0.5",
-    "@abp/ng.core": "~3.0.5",
-    "@abp/ng.feature-management": "~3.0.5",
-    "@abp/ng.identity": "~3.0.5",
-    "@abp/ng.permission-management": "~3.0.5",
-    "@abp/ng.setting-management": "~3.0.5",
-    "@abp/ng.tenant-management": "~3.0.5",
-    "@abp/ng.theme.basic": "~3.0.5",
-    "@abp/ng.theme.shared": "~3.0.5",
-    "@abp/utils": "^3.0.5",
+    "@abp/ng.account": "~3.1.0-rc.2",
+    "@abp/ng.core": "~3.1.0-rc.2",
+    "@abp/ng.feature-management": "~3.1.0-rc.2",
+    "@abp/ng.identity": "~3.1.0-rc.2",
+    "@abp/ng.permission-management": "~3.1.0-rc.2",
+    "@abp/ng.setting-management": "~3.1.0-rc.2",
+    "@abp/ng.tenant-management": "~3.1.0-rc.2",
+    "@abp/ng.theme.basic": "~3.1.0-rc.2",
+    "@abp/ng.theme.shared": "~3.1.0-rc.2",
+    "@abp/utils": "^3.1.0-rc.2",
     "@angular-builders/jest": "^10.0.0",
     "@angular-devkit/build-angular": "~0.1000.6",
     "@angular-devkit/build-ng-packagr": "~0.1000.6",
diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json
index 7caa4680c4..1f3b34dcab 100644
--- a/npm/ng-packs/packages/account/package.json
+++ b/npm/ng-packs/packages/account/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.account",
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.1.0-rc.1",
+    "@abp/ng.theme.shared": "~3.1.0-rc.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json
index d96da776f1..f3bb738a91 100644
--- a/npm/ng-packs/packages/components/package.json
+++ b/npm/ng-packs/packages/components/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.components",
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "peerDependencies": {
-    "@abp/ng.core": ">=3.0.5",
+    "@abp/ng.core": ">=3.1.0-rc.2",
     "@ng-bootstrap/ng-bootstrap": ">=6.0.0"
   },
   "dependencies": {
diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json
index 11433378e1..3f5bd24e97 100644
--- a/npm/ng-packs/packages/core/package.json
+++ b/npm/ng-packs/packages/core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.core",
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/utils": "^3.0.5",
+    "@abp/utils": "^3.1.0-rc.2",
     "@angular/localize": "~10.0.10",
     "@ngxs/router-plugin": "^3.6.2",
     "@ngxs/storage-plugin": "^3.6.2",
diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json
index c35412775f..8b304d13c7 100644
--- 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": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.1.0-rc.1",
+    "@abp/ng.theme.shared": "~3.1.0-rc.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json
index a25c076057..e259cdea9f 100644
--- a/npm/ng-packs/packages/identity/package.json
+++ b/npm/ng-packs/packages/identity/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@abp/ng.identity",
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.permission-management": "~3.1.0-rc.1",
-    "@abp/ng.theme.shared": "~3.1.0-rc.1",
+    "@abp/ng.permission-management": "~3.1.0-rc.2",
+    "@abp/ng.theme.shared": "~3.1.0-rc.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json
index c2485538be..5d258540ea 100644
--- 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": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.1.0-rc.1",
+    "@abp/ng.theme.shared": "~3.1.0-rc.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json
index 8f258c2fc9..9c7df23b83 100644
--- a/npm/ng-packs/packages/schematics/package.json
+++ b/npm/ng-packs/packages/schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.schematics",
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "description": "Schematics that works with ABP Backend",
   "keywords": [
     "schematics"
diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json
index b6309084b7..97b644d782 100644
--- a/npm/ng-packs/packages/setting-management/package.json
+++ b/npm/ng-packs/packages/setting-management/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.setting-management",
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.1.0-rc.1",
+    "@abp/ng.theme.shared": "~3.1.0-rc.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json
index 3513a620ba..735d905a5d 100644
--- a/npm/ng-packs/packages/tenant-management/package.json
+++ b/npm/ng-packs/packages/tenant-management/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@abp/ng.tenant-management",
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.feature-management": "~3.1.0-rc.1",
-    "@abp/ng.theme.shared": "~3.1.0-rc.1",
+    "@abp/ng.feature-management": "~3.1.0-rc.2",
+    "@abp/ng.theme.shared": "~3.1.0-rc.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json
index 056e0d74e6..666cd7fd5c 100644
--- 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": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.1.0-rc.1",
+    "@abp/ng.theme.shared": "~3.1.0-rc.2",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json
index b30e808c98..91a875c0dd 100644
--- 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": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.core": "~3.1.0-rc.1",
+    "@abp/ng.core": "~3.1.0-rc.2",
     "@fortawesome/fontawesome-free": "^5.14.0",
     "@ng-bootstrap/ng-bootstrap": "^7.0.0",
     "@ngx-validate/core": "^0.0.11",
diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json
index e544ff1c2c..0d38ce5e2d 100644
--- a/npm/packs/anchor-js/package.json
+++ b/npm/packs/anchor-js/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/anchor-js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "anchor-js": "^4.2.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json
index 9e6402e1b0..06274bbeed 100644
--- 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": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/aspnetcore.mvc.ui.theme.basic",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "~3.1.0-rc.1"
+    "@abp/aspnetcore.mvc.ui.theme.shared": "~3.1.0-rc.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json
index e06f2b3e91..bb1a173dcc 100644
--- 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": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/aspnetcore.mvc.ui.theme.shared",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui": "~3.1.0-rc.1",
-    "@abp/bootstrap": "~3.1.0-rc.1",
-    "@abp/bootstrap-datepicker": "~3.1.0-rc.1",
-    "@abp/datatables.net-bs4": "~3.1.0-rc.1",
-    "@abp/font-awesome": "~3.1.0-rc.1",
-    "@abp/jquery-form": "~3.1.0-rc.1",
-    "@abp/jquery-validation-unobtrusive": "~3.1.0-rc.1",
-    "@abp/lodash": "~3.1.0-rc.1",
-    "@abp/luxon": "~3.1.0-rc.1",
-    "@abp/malihu-custom-scrollbar-plugin": "~3.1.0-rc.1",
-    "@abp/select2": "~3.1.0-rc.1",
-    "@abp/sweetalert": "~3.1.0-rc.1",
-    "@abp/timeago": "~3.1.0-rc.1",
-    "@abp/toastr": "~3.1.0-rc.1"
+    "@abp/aspnetcore.mvc.ui": "~3.1.0-rc.2",
+    "@abp/bootstrap": "~3.1.0-rc.2",
+    "@abp/bootstrap-datepicker": "~3.1.0-rc.2",
+    "@abp/datatables.net-bs4": "~3.1.0-rc.2",
+    "@abp/font-awesome": "~3.1.0-rc.2",
+    "@abp/jquery-form": "~3.1.0-rc.2",
+    "@abp/jquery-validation-unobtrusive": "~3.1.0-rc.2",
+    "@abp/lodash": "~3.1.0-rc.2",
+    "@abp/luxon": "~3.1.0-rc.2",
+    "@abp/malihu-custom-scrollbar-plugin": "~3.1.0-rc.2",
+    "@abp/select2": "~3.1.0-rc.2",
+    "@abp/sweetalert": "~3.1.0-rc.2",
+    "@abp/timeago": "~3.1.0-rc.2",
+    "@abp/toastr": "~3.1.0-rc.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json
index 48e1f22468..ba1ea2b672 100644
--- a/npm/packs/aspnetcore.mvc.ui/package.json
+++ b/npm/packs/aspnetcore.mvc.ui/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/aspnetcore.mvc.ui",
   "publishConfig": {
     "access": "public"
diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json
index 239e957ebc..03f11931ee 100644
--- a/npm/packs/blogging/package.json
+++ b/npm/packs/blogging/package.json
@@ -1,14 +1,14 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/blogging",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "~3.1.0-rc.1",
-    "@abp/owl.carousel": "~3.1.0-rc.1",
-    "@abp/prismjs": "~3.1.0-rc.1",
-    "@abp/tui-editor": "~3.1.0-rc.1"
+    "@abp/aspnetcore.mvc.ui.theme.shared": "~3.1.0-rc.2",
+    "@abp/owl.carousel": "~3.1.0-rc.2",
+    "@abp/prismjs": "~3.1.0-rc.2",
+    "@abp/tui-editor": "~3.1.0-rc.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json
index 197a9e6739..8e8fe67d5a 100644
--- a/npm/packs/bootstrap-datepicker/package.json
+++ b/npm/packs/bootstrap-datepicker/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/bootstrap-datepicker",
   "publishConfig": {
     "access": "public"
diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json
index 6c4af44e63..ce970434c3 100644
--- a/npm/packs/bootstrap/package.json
+++ b/npm/packs/bootstrap/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/bootstrap",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "bootstrap": "^4.5.0",
     "bootstrap-v4-rtl": "4.4.1-2"
   },
diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json
index 7857983493..b483d36ac9 100644
--- a/npm/packs/chart.js/package.json
+++ b/npm/packs/chart.js/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/chart.js",
   "publishConfig": {
     "access": "public"
diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json
index 3ae7a15786..62df2bf8db 100644
--- a/npm/packs/clipboard/package.json
+++ b/npm/packs/clipboard/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/clipboard",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "clipboard": "^2.0.6"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json
index d4c5ee3e52..03afdc0370 100644
--- a/npm/packs/codemirror/package.json
+++ b/npm/packs/codemirror/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/codemirror",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "codemirror": "^5.54.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json
index cc320760db..de6ed27ccd 100644
--- a/npm/packs/core/package.json
+++ b/npm/packs/core/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/core",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/utils": "^3.1.0-rc.1"
+    "@abp/utils": "^3.1.0-rc.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json
index 6170f63583..ff1d91a8ef 100644
--- a/npm/packs/datatables.net-bs4/package.json
+++ b/npm/packs/datatables.net-bs4/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/datatables.net-bs4",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/datatables.net": "~3.1.0-rc.1",
+    "@abp/datatables.net": "~3.1.0-rc.2",
     "datatables.net-bs4": "^1.10.21"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json
index d5fd2d10f1..836ed61126 100644
--- a/npm/packs/datatables.net/package.json
+++ b/npm/packs/datatables.net/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/datatables.net",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.1.0-rc.1",
+    "@abp/jquery": "~3.1.0-rc.2",
     "datatables.net": "^1.10.21"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json
index 379c9596e7..3be2ff3c24 100644
--- a/npm/packs/docs/package.json
+++ b/npm/packs/docs/package.json
@@ -1,15 +1,15 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/docs",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/anchor-js": "~3.1.0-rc.1",
-    "@abp/clipboard": "~3.1.0-rc.1",
-    "@abp/malihu-custom-scrollbar-plugin": "~3.1.0-rc.1",
-    "@abp/popper.js": "~3.1.0-rc.1",
-    "@abp/prismjs": "~3.1.0-rc.1"
+    "@abp/anchor-js": "~3.1.0-rc.2",
+    "@abp/clipboard": "~3.1.0-rc.2",
+    "@abp/malihu-custom-scrollbar-plugin": "~3.1.0-rc.2",
+    "@abp/popper.js": "~3.1.0-rc.2",
+    "@abp/prismjs": "~3.1.0-rc.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json
index 99aa4f9dc9..bc07d361ed 100644
--- a/npm/packs/flag-icon-css/package.json
+++ b/npm/packs/flag-icon-css/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/flag-icon-css",
   "publishConfig": {
     "access": "public"
diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json
index 285f6ee151..0635634a31 100644
--- a/npm/packs/font-awesome/package.json
+++ b/npm/packs/font-awesome/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/font-awesome",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "@fortawesome/fontawesome-free": "^5.13.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json
index f1d398e30f..d07ba815a2 100644
--- a/npm/packs/highlight.js/package.json
+++ b/npm/packs/highlight.js/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/highlight.js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1"
+    "@abp/core": "~3.1.0-rc.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json
index 5f0d1b01d6..0b285ba858 100644
--- a/npm/packs/jquery-form/package.json
+++ b/npm/packs/jquery-form/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/jquery-form",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.1.0-rc.1",
+    "@abp/jquery": "~3.1.0-rc.2",
     "jquery-form": "^4.3.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json
index 08810c9087..3d398b767f 100644
--- a/npm/packs/jquery-validation-unobtrusive/package.json
+++ b/npm/packs/jquery-validation-unobtrusive/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/jquery-validation-unobtrusive",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery-validation": "~3.1.0-rc.1",
+    "@abp/jquery-validation": "~3.1.0-rc.2",
     "jquery-validation-unobtrusive": "^3.2.11"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json
index 9a700fed97..22bf237ec6 100644
--- a/npm/packs/jquery-validation/package.json
+++ b/npm/packs/jquery-validation/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/jquery-validation",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.1.0-rc.1",
+    "@abp/jquery": "~3.1.0-rc.2",
     "jquery-validation": "^1.19.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json
index b7f850d90a..76337adfa3 100644
--- a/npm/packs/jquery/package.json
+++ b/npm/packs/jquery/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/jquery",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "jquery": "~3.5.1"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json
index 9e78404419..246209ed16 100644
--- a/npm/packs/jstree/package.json
+++ b/npm/packs/jstree/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/jstree",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.1.0-rc.1",
+    "@abp/jquery": "~3.1.0-rc.2",
     "jstree": "^3.3.9"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json
index 2cf2be258b..18c555a3f2 100644
--- a/npm/packs/lodash/package.json
+++ b/npm/packs/lodash/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/lodash",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "lodash": "^4.17.15"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json
index 5040112ee9..39ef414fff 100644
--- a/npm/packs/luxon/package.json
+++ b/npm/packs/luxon/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/luxon",
   "publishConfig": {
     "access": "public"
diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json
index 96dccbc66e..1dd9459497 100644
--- a/npm/packs/malihu-custom-scrollbar-plugin/package.json
+++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/malihu-custom-scrollbar-plugin",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "malihu-custom-scrollbar-plugin": "^3.1.5"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json
index 3b0cc08d89..306a58f6b8 100644
--- a/npm/packs/markdown-it/package.json
+++ b/npm/packs/markdown-it/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/markdown-it",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "markdown-it": "^11.0.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json
index f2e287bd88..e1f3151561 100644
--- a/npm/packs/owl.carousel/package.json
+++ b/npm/packs/owl.carousel/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/owl.carousel",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "owl.carousel": "^2.3.4"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json
index a5f9f45c23..43f07f85eb 100644
--- a/npm/packs/popper.js/package.json
+++ b/npm/packs/popper.js/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/popper.js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "popper.js": "^1.16.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json
index 96b78ce0fb..459d0d75a5 100644
--- a/npm/packs/prismjs/package.json
+++ b/npm/packs/prismjs/package.json
@@ -1,12 +1,12 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/prismjs",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/clipboard": "~3.1.0-rc.1",
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/clipboard": "~3.1.0-rc.2",
+    "@abp/core": "~3.1.0-rc.2",
     "prismjs": "^1.20.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json
index 2a070ee367..85ac78874b 100644
--- a/npm/packs/select2/package.json
+++ b/npm/packs/select2/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/select2",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "select2": "^4.0.13"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json
index 887ea68121..d240950fa2 100644
--- a/npm/packs/signalr/package.json
+++ b/npm/packs/signalr/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/signalr",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "@microsoft/signalr": "~3.1.5"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/sweetalert/package.json b/npm/packs/sweetalert/package.json
index 0c3d13ca86..e4e8f96e63 100644
--- a/npm/packs/sweetalert/package.json
+++ b/npm/packs/sweetalert/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/sweetalert",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "sweetalert": "^2.1.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json
index bc8f98ae73..20a773e5c6 100644
--- a/npm/packs/timeago/package.json
+++ b/npm/packs/timeago/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/timeago",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.1.0-rc.1",
+    "@abp/jquery": "~3.1.0-rc.2",
     "timeago": "^1.6.7"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json
index 37a2592a39..ae79e0eaaf 100644
--- a/npm/packs/toastr/package.json
+++ b/npm/packs/toastr/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/toastr",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.1.0-rc.1",
+    "@abp/jquery": "~3.1.0-rc.2",
     "toastr": "^2.1.4"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json
index 813e6a2b53..f727468814 100644
--- a/npm/packs/tui-editor/package.json
+++ b/npm/packs/tui-editor/package.json
@@ -1,14 +1,14 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/tui-editor",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/codemirror": "~3.1.0-rc.1",
-    "@abp/highlight.js": "~3.1.0-rc.1",
-    "@abp/jquery": "~3.1.0-rc.1",
-    "@abp/markdown-it": "~3.1.0-rc.1",
+    "@abp/codemirror": "~3.1.0-rc.2",
+    "@abp/highlight.js": "~3.1.0-rc.2",
+    "@abp/jquery": "~3.1.0-rc.2",
+    "@abp/markdown-it": "~3.1.0-rc.2",
     "tui-editor": "^1.4.10"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json
index 36bd77ca99..cbb79c574c 100644
--- a/npm/packs/uppy/package.json
+++ b/npm/packs/uppy/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/uppy",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.1.0-rc.1",
+    "@abp/core": "~3.1.0-rc.2",
     "uppy": "^1.16.1"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json
index 6b7594825e..981b8a1680 100644
--- a/npm/packs/utils/package.json
+++ b/npm/packs/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abp/utils",
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "scripts": {
     "prepublish": "yarn install --ignore-scripts && node prepublish.js",
     "ng": "ng",
diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json
index 5c75512406..96a3d5d12e 100644
--- a/npm/packs/virtual-file-explorer/package.json
+++ b/npm/packs/virtual-file-explorer/package.json
@@ -1,12 +1,12 @@
 {
-  "version": "3.1.0-rc.1",
+  "version": "3.1.0-rc.2",
   "name": "@abp/virtual-file-explorer",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/clipboard": "~3.1.0-rc.1",
-    "@abp/prismjs": "~3.1.0-rc.1"
+    "@abp/clipboard": "~3.1.0-rc.2",
+    "@abp/prismjs": "~3.1.0-rc.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }
diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json
index 0faf2470d2..960aea4afb 100644
--- a/templates/app/angular/package.json
+++ b/templates/app/angular/package.json
@@ -12,11 +12,11 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~3.0.5",
-    "@abp/ng.identity": "~3.0.5",
-    "@abp/ng.setting-management": "~3.0.5",
-    "@abp/ng.tenant-management": "~3.0.5",
-    "@abp/ng.theme.basic": "~3.0.5",
+    "@abp/ng.account": "~3.1.0-rc.2",
+    "@abp/ng.identity": "~3.1.0-rc.2",
+    "@abp/ng.setting-management": "~3.1.0-rc.2",
+    "@abp/ng.tenant-management": "~3.1.0-rc.2",
+    "@abp/ng.theme.basic": "~3.1.0-rc.2",
     "@angular/animations": "~10.0.10",
     "@angular/common": "~10.0.10",
     "@angular/compiler": "~10.0.10",
@@ -30,7 +30,7 @@
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@abp/ng.schematics": "~3.1.0-beta.2",
+    "@abp/ng.schematics": "~3.1.0-rc.2",
     "@angular-devkit/build-angular": "~0.1000.6",
     "@angular-devkit/build-ng-packagr": "~0.1000.6",
     "@angular/cli": "~10.0.6",
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json
index e0fde322e1..7103162cc8 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2"
   }
 }
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock
index a0fc6e0f98..57c957a100 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.1.tgz#fd545133049b015e02820d5500bf92a09fa5dcb6"
-  integrity sha512-Xtohi+W2OUJcWf5GykCsrXJo7VV+bPNw5r3rMTO+nFioOs9nOunYBA+8usEa4AfU/WL6oRG7S4P3Tw8h8m4ULw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.1.tgz#0c4bb2653e8c93043f68ced23a8ef3f3c34ebb23"
-  integrity sha512-eCrpjEigpmFIjXnv9/6pz6cdoTBTZZw+aChSOIi8RdsDCbjUZrgfuarUoLjGFHUvyXd7DWXvc2PzjcGE7szBaw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.1"
-    "@abp/bootstrap" "~3.1.0-rc.1"
-    "@abp/bootstrap-datepicker" "~3.1.0-rc.1"
-    "@abp/datatables.net-bs4" "~3.1.0-rc.1"
-    "@abp/font-awesome" "~3.1.0-rc.1"
-    "@abp/jquery-form" "~3.1.0-rc.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.1"
-    "@abp/lodash" "~3.1.0-rc.1"
-    "@abp/luxon" "~3.1.0-rc.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.1"
-    "@abp/select2" "~3.1.0-rc.1"
-    "@abp/sweetalert" "~3.1.0-rc.1"
-    "@abp/timeago" "~3.1.0-rc.1"
-    "@abp/toastr" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.1.tgz#e4300c82fedd2d45147e98e81fc3e72ffe21a616"
-  integrity sha512-xsJGb8HCP5ovUy9+2gHtFOFxO6mWQah/jjN1RsBnJTt5EnwKEiqOXrO+18PaRlczj7fLXOw1V0bNtHeeoy8bCg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.1.tgz#12bab980bb5d0c882f823a392d765286d6d74c9e"
-  integrity sha512-ZN2xv0wTzB18jAM/cKQNuq3VdYjrqtPqnoreLAebUcy1R/sAUxHZ06xIpGaSkSTwB+0GHGWjR3/SlUnnn/HFcw==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.1.tgz#ae71f1af5cbde21af08a5ca891fa7e118bde7f1e"
-  integrity sha512-2LnJOqxHjTwC/Z9cnSrChaJCL1k++QQDA90Nv9a3VVwbJ5pgwXtdWUZrLdK9lOEkZ17CE8WaD0tkSvSNt3FUNw==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.1.tgz#9192061da6b4cd6d5d80998366d0c31b1ee400d6"
-  integrity sha512-BJhVruTQBPeJRqFig2ZiJJrWOlX3dKYno4MxAMeIJGpLBRM79Bl3v5/081WRnwltfU7s0DvhLhqYGBQfKAst6w==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.1.0-rc.1"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.1.tgz#af3b3cfa4396d2877ad8c8a71cb92b2e166eb4a0"
-  integrity sha512-vFWQr0J5BUFnUO0eL/hfyzO0N6hXKI5IP8G3iaeFMgIvIRiwyWw34mwOYaP1vJN22tliOr14uyrX9Hex2oR2Ug==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.1.0-rc.1"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.1.tgz#60e391a39fad262a58497bd03087c7734dcee5d1"
-  integrity sha512-oKxHaVApFPm0Y5VMLXfQQsqaaxpXF/tCAz8dKOkBYDHhaGK0BNd/fi7hAu/uJBuQC/09ggGwqgdm96c9jfGBiw==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.1.tgz#0376d3db580155c02fe3152c80bb23edd35c7020"
-  integrity sha512-VCh3cvkGis1efno15iqY6fNB54LBGXZFC/m1eMGYm95Vni8S9ke0svzqAoQl8qFuI5XHNFNMur1XkAXXI+YPUA==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.1.tgz#eef048968b74803e870749e2c051f9910df54b87"
-  integrity sha512-+ePC75rVivoVyfaf68IZrZ+FEcHm/5m/YFUlhuD8pi6rFTW/YHkUVYlVBS3m+whXOcV4pJlAGNXcAKKmAEJGpg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.1.tgz#2b8cf680fde18b8ef33daa7b07e5c2d22c49f0f1"
-  integrity sha512-9EWGCJjFG/Hi/a+LMhif7u+jZ1P0an1PveRV/bOT+4l7+3+GkFaQiwv6WQkgCH7Xu3/YFn/ijOd5WWzlieekFg==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.1.0-rc.1"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.1.tgz#968055ed850e1a30c7f7dede135fadf5cb9d2ba5"
-  integrity sha512-jiwHj4NeVEa2Fscw0h7Y1kiqL3/Xg54PJV/jl8BGXjGvV++3Q8KjZNeW+dNTPU2jAJpDy3VQ2InoMTT3zrGw8g==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.1.tgz#b08c608eb1157fe35e9c9c8b888c3606b3f61ef4"
-  integrity sha512-L7pRgW9OveYgMqHSKIFXUJaz4+nfCHWlwBtdFB/BQf9bKcv3gw/UEYGFOzTfZqPTxWyyFfSpB1DU+8QpDtOj6w==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.1.tgz#001247b438fbce87b87fc1189b0e95647087508a"
-  integrity sha512-2MvMowujQ3VfcjjJ164IKyJnbWjSnWSeHFaGbsUi6duZrCr9z94VKv+gQ64aUcPR2U70PoZLvggWF6lH+JMxtA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.1.tgz#2c58b1c41a206a8963b0bd0936819ab6701f63fe"
-  integrity sha512-0hCVvUJRtCh01qpZkGciE1+Sl393oI3I472C1pSwxo0EQxxWFd57SzsozBSnBmOp/f+LhlbKEUNQqvv/Wb1TUQ==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.1.tgz#c8a78a3f099c10251d8b58864536e8a0d6008cab"
-  integrity sha512-XQiQ9sLN/QJDOBFCQOK3uMn2FWWJyCGMoWEagPFCfbxkp6zfgOF4YbLfL0esL7AchlJlkW3cGBMFY/fH2TMQ5w==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.1.tgz#5f396b8dbbc5d0b2f144cc249f73038d7804a518"
-  integrity sha512-Vk0uqMhJcmUaehUt+0uZQaZBP+ppcVI5UYEUD3Hna0AZIgjwUVioQEhVAokelSkSAJXWn5J2tPEhk8mzZQXv3Q==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.1.tgz#cef625218795f1cb18d0ff09d1085d0e11d2bb19"
-  integrity sha512-kk0K33dPft3jP6PwEcoi6GP4xFxqxeFP7G29TKVg0JZ4b/a0rB4+nm14McG5bqWk1YjYNGKMx5hMlDLWxs0BIA==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.1.tgz#033e459d152535f235a311f066d8f6de1660786b"
-  integrity sha512-jYfmMgEm7sox+UKplALHzdawjZeNiCtvSHdDkvntUQkHzUvyAPqT9IpOZNxv5QqQqSlarqIcLqVIRKms46sJeg==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.1.tgz#07cf64c4fe5c4cc6e8f273c502ca403da82bef51"
-  integrity sha512-29T8dj+pWxZOZ42zmvm/Kgcxmd0g9/L2bjNqNQVhJEFDF5c+CrKYcqEfVKePf1mc80fWXe209I45VOzHCzzTnQ==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.1.tgz#15cffd28c9f5209bf3cdc805d55b54e4a749f4d1"
-  integrity sha512-FnbJprUHl3y0ShVqJJdKmZDuDrNEY70vuzhSt6DTHfRbtHo+i4+B9Tpt9vynGJkkug5sZEdjlRZSazoZfWlZ7A==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json
index 6b42637f58..2aff27f377 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/package.json
@@ -3,6 +3,6 @@
   "name": "my-app-identityserver",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2"
   }
 }
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
index b714e08268..c836cc49cb 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.1.tgz#fd545133049b015e02820d5500bf92a09fa5dcb6"
-  integrity sha512-Xtohi+W2OUJcWf5GykCsrXJo7VV+bPNw5r3rMTO+nFioOs9nOunYBA+8usEa4AfU/WL6oRG7S4P3Tw8h8m4ULw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.1.tgz#0c4bb2653e8c93043f68ced23a8ef3f3c34ebb23"
-  integrity sha512-eCrpjEigpmFIjXnv9/6pz6cdoTBTZZw+aChSOIi8RdsDCbjUZrgfuarUoLjGFHUvyXd7DWXvc2PzjcGE7szBaw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.1"
-    "@abp/bootstrap" "~3.1.0-rc.1"
-    "@abp/bootstrap-datepicker" "~3.1.0-rc.1"
-    "@abp/datatables.net-bs4" "~3.1.0-rc.1"
-    "@abp/font-awesome" "~3.1.0-rc.1"
-    "@abp/jquery-form" "~3.1.0-rc.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.1"
-    "@abp/lodash" "~3.1.0-rc.1"
-    "@abp/luxon" "~3.1.0-rc.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.1"
-    "@abp/select2" "~3.1.0-rc.1"
-    "@abp/sweetalert" "~3.1.0-rc.1"
-    "@abp/timeago" "~3.1.0-rc.1"
-    "@abp/toastr" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.1.tgz#e4300c82fedd2d45147e98e81fc3e72ffe21a616"
-  integrity sha512-xsJGb8HCP5ovUy9+2gHtFOFxO6mWQah/jjN1RsBnJTt5EnwKEiqOXrO+18PaRlczj7fLXOw1V0bNtHeeoy8bCg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.1.tgz#12bab980bb5d0c882f823a392d765286d6d74c9e"
-  integrity sha512-ZN2xv0wTzB18jAM/cKQNuq3VdYjrqtPqnoreLAebUcy1R/sAUxHZ06xIpGaSkSTwB+0GHGWjR3/SlUnnn/HFcw==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.1.tgz#ae71f1af5cbde21af08a5ca891fa7e118bde7f1e"
-  integrity sha512-2LnJOqxHjTwC/Z9cnSrChaJCL1k++QQDA90Nv9a3VVwbJ5pgwXtdWUZrLdK9lOEkZ17CE8WaD0tkSvSNt3FUNw==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.1.tgz#9192061da6b4cd6d5d80998366d0c31b1ee400d6"
-  integrity sha512-BJhVruTQBPeJRqFig2ZiJJrWOlX3dKYno4MxAMeIJGpLBRM79Bl3v5/081WRnwltfU7s0DvhLhqYGBQfKAst6w==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.1.0-rc.1"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.1.tgz#af3b3cfa4396d2877ad8c8a71cb92b2e166eb4a0"
-  integrity sha512-vFWQr0J5BUFnUO0eL/hfyzO0N6hXKI5IP8G3iaeFMgIvIRiwyWw34mwOYaP1vJN22tliOr14uyrX9Hex2oR2Ug==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.1.0-rc.1"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.1.tgz#60e391a39fad262a58497bd03087c7734dcee5d1"
-  integrity sha512-oKxHaVApFPm0Y5VMLXfQQsqaaxpXF/tCAz8dKOkBYDHhaGK0BNd/fi7hAu/uJBuQC/09ggGwqgdm96c9jfGBiw==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.1.tgz#0376d3db580155c02fe3152c80bb23edd35c7020"
-  integrity sha512-VCh3cvkGis1efno15iqY6fNB54LBGXZFC/m1eMGYm95Vni8S9ke0svzqAoQl8qFuI5XHNFNMur1XkAXXI+YPUA==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.1.tgz#eef048968b74803e870749e2c051f9910df54b87"
-  integrity sha512-+ePC75rVivoVyfaf68IZrZ+FEcHm/5m/YFUlhuD8pi6rFTW/YHkUVYlVBS3m+whXOcV4pJlAGNXcAKKmAEJGpg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.1.tgz#2b8cf680fde18b8ef33daa7b07e5c2d22c49f0f1"
-  integrity sha512-9EWGCJjFG/Hi/a+LMhif7u+jZ1P0an1PveRV/bOT+4l7+3+GkFaQiwv6WQkgCH7Xu3/YFn/ijOd5WWzlieekFg==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.1.0-rc.1"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.1.tgz#968055ed850e1a30c7f7dede135fadf5cb9d2ba5"
-  integrity sha512-jiwHj4NeVEa2Fscw0h7Y1kiqL3/Xg54PJV/jl8BGXjGvV++3Q8KjZNeW+dNTPU2jAJpDy3VQ2InoMTT3zrGw8g==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.1.tgz#b08c608eb1157fe35e9c9c8b888c3606b3f61ef4"
-  integrity sha512-L7pRgW9OveYgMqHSKIFXUJaz4+nfCHWlwBtdFB/BQf9bKcv3gw/UEYGFOzTfZqPTxWyyFfSpB1DU+8QpDtOj6w==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.1.tgz#001247b438fbce87b87fc1189b0e95647087508a"
-  integrity sha512-2MvMowujQ3VfcjjJ164IKyJnbWjSnWSeHFaGbsUi6duZrCr9z94VKv+gQ64aUcPR2U70PoZLvggWF6lH+JMxtA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.1.tgz#2c58b1c41a206a8963b0bd0936819ab6701f63fe"
-  integrity sha512-0hCVvUJRtCh01qpZkGciE1+Sl393oI3I472C1pSwxo0EQxxWFd57SzsozBSnBmOp/f+LhlbKEUNQqvv/Wb1TUQ==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.1.tgz#c8a78a3f099c10251d8b58864536e8a0d6008cab"
-  integrity sha512-XQiQ9sLN/QJDOBFCQOK3uMn2FWWJyCGMoWEagPFCfbxkp6zfgOF4YbLfL0esL7AchlJlkW3cGBMFY/fH2TMQ5w==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.1.tgz#5f396b8dbbc5d0b2f144cc249f73038d7804a518"
-  integrity sha512-Vk0uqMhJcmUaehUt+0uZQaZBP+ppcVI5UYEUD3Hna0AZIgjwUVioQEhVAokelSkSAJXWn5J2tPEhk8mzZQXv3Q==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.1.tgz#cef625218795f1cb18d0ff09d1085d0e11d2bb19"
-  integrity sha512-kk0K33dPft3jP6PwEcoi6GP4xFxqxeFP7G29TKVg0JZ4b/a0rB4+nm14McG5bqWk1YjYNGKMx5hMlDLWxs0BIA==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.1.tgz#033e459d152535f235a311f066d8f6de1660786b"
-  integrity sha512-jYfmMgEm7sox+UKplALHzdawjZeNiCtvSHdDkvntUQkHzUvyAPqT9IpOZNxv5QqQqSlarqIcLqVIRKms46sJeg==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.1.tgz#07cf64c4fe5c4cc6e8f273c502ca403da82bef51"
-  integrity sha512-29T8dj+pWxZOZ42zmvm/Kgcxmd0g9/L2bjNqNQVhJEFDF5c+CrKYcqEfVKePf1mc80fWXe209I45VOzHCzzTnQ==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.1.tgz#15cffd28c9f5209bf3cdc805d55b54e4a749f4d1"
-  integrity sha512-FnbJprUHl3y0ShVqJJdKmZDuDrNEY70vuzhSt6DTHfRbtHo+i4+B9Tpt9vynGJkkug5sZEdjlRZSazoZfWlZ7A==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json
index e0fde322e1..7103162cc8 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2"
   }
 }
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock
index b714e08268..c836cc49cb 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.1.tgz#fd545133049b015e02820d5500bf92a09fa5dcb6"
-  integrity sha512-Xtohi+W2OUJcWf5GykCsrXJo7VV+bPNw5r3rMTO+nFioOs9nOunYBA+8usEa4AfU/WL6oRG7S4P3Tw8h8m4ULw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.1.tgz#0c4bb2653e8c93043f68ced23a8ef3f3c34ebb23"
-  integrity sha512-eCrpjEigpmFIjXnv9/6pz6cdoTBTZZw+aChSOIi8RdsDCbjUZrgfuarUoLjGFHUvyXd7DWXvc2PzjcGE7szBaw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.1"
-    "@abp/bootstrap" "~3.1.0-rc.1"
-    "@abp/bootstrap-datepicker" "~3.1.0-rc.1"
-    "@abp/datatables.net-bs4" "~3.1.0-rc.1"
-    "@abp/font-awesome" "~3.1.0-rc.1"
-    "@abp/jquery-form" "~3.1.0-rc.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.1"
-    "@abp/lodash" "~3.1.0-rc.1"
-    "@abp/luxon" "~3.1.0-rc.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.1"
-    "@abp/select2" "~3.1.0-rc.1"
-    "@abp/sweetalert" "~3.1.0-rc.1"
-    "@abp/timeago" "~3.1.0-rc.1"
-    "@abp/toastr" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.1.tgz#e4300c82fedd2d45147e98e81fc3e72ffe21a616"
-  integrity sha512-xsJGb8HCP5ovUy9+2gHtFOFxO6mWQah/jjN1RsBnJTt5EnwKEiqOXrO+18PaRlczj7fLXOw1V0bNtHeeoy8bCg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.1.tgz#12bab980bb5d0c882f823a392d765286d6d74c9e"
-  integrity sha512-ZN2xv0wTzB18jAM/cKQNuq3VdYjrqtPqnoreLAebUcy1R/sAUxHZ06xIpGaSkSTwB+0GHGWjR3/SlUnnn/HFcw==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.1.tgz#ae71f1af5cbde21af08a5ca891fa7e118bde7f1e"
-  integrity sha512-2LnJOqxHjTwC/Z9cnSrChaJCL1k++QQDA90Nv9a3VVwbJ5pgwXtdWUZrLdK9lOEkZ17CE8WaD0tkSvSNt3FUNw==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.1.tgz#9192061da6b4cd6d5d80998366d0c31b1ee400d6"
-  integrity sha512-BJhVruTQBPeJRqFig2ZiJJrWOlX3dKYno4MxAMeIJGpLBRM79Bl3v5/081WRnwltfU7s0DvhLhqYGBQfKAst6w==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.1.0-rc.1"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.1.tgz#af3b3cfa4396d2877ad8c8a71cb92b2e166eb4a0"
-  integrity sha512-vFWQr0J5BUFnUO0eL/hfyzO0N6hXKI5IP8G3iaeFMgIvIRiwyWw34mwOYaP1vJN22tliOr14uyrX9Hex2oR2Ug==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.1.0-rc.1"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.1.tgz#60e391a39fad262a58497bd03087c7734dcee5d1"
-  integrity sha512-oKxHaVApFPm0Y5VMLXfQQsqaaxpXF/tCAz8dKOkBYDHhaGK0BNd/fi7hAu/uJBuQC/09ggGwqgdm96c9jfGBiw==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.1.tgz#0376d3db580155c02fe3152c80bb23edd35c7020"
-  integrity sha512-VCh3cvkGis1efno15iqY6fNB54LBGXZFC/m1eMGYm95Vni8S9ke0svzqAoQl8qFuI5XHNFNMur1XkAXXI+YPUA==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.1.tgz#eef048968b74803e870749e2c051f9910df54b87"
-  integrity sha512-+ePC75rVivoVyfaf68IZrZ+FEcHm/5m/YFUlhuD8pi6rFTW/YHkUVYlVBS3m+whXOcV4pJlAGNXcAKKmAEJGpg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.1.tgz#2b8cf680fde18b8ef33daa7b07e5c2d22c49f0f1"
-  integrity sha512-9EWGCJjFG/Hi/a+LMhif7u+jZ1P0an1PveRV/bOT+4l7+3+GkFaQiwv6WQkgCH7Xu3/YFn/ijOd5WWzlieekFg==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.1.0-rc.1"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.1.tgz#968055ed850e1a30c7f7dede135fadf5cb9d2ba5"
-  integrity sha512-jiwHj4NeVEa2Fscw0h7Y1kiqL3/Xg54PJV/jl8BGXjGvV++3Q8KjZNeW+dNTPU2jAJpDy3VQ2InoMTT3zrGw8g==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.1.tgz#b08c608eb1157fe35e9c9c8b888c3606b3f61ef4"
-  integrity sha512-L7pRgW9OveYgMqHSKIFXUJaz4+nfCHWlwBtdFB/BQf9bKcv3gw/UEYGFOzTfZqPTxWyyFfSpB1DU+8QpDtOj6w==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.1.tgz#001247b438fbce87b87fc1189b0e95647087508a"
-  integrity sha512-2MvMowujQ3VfcjjJ164IKyJnbWjSnWSeHFaGbsUi6duZrCr9z94VKv+gQ64aUcPR2U70PoZLvggWF6lH+JMxtA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.1.tgz#2c58b1c41a206a8963b0bd0936819ab6701f63fe"
-  integrity sha512-0hCVvUJRtCh01qpZkGciE1+Sl393oI3I472C1pSwxo0EQxxWFd57SzsozBSnBmOp/f+LhlbKEUNQqvv/Wb1TUQ==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.1.tgz#c8a78a3f099c10251d8b58864536e8a0d6008cab"
-  integrity sha512-XQiQ9sLN/QJDOBFCQOK3uMn2FWWJyCGMoWEagPFCfbxkp6zfgOF4YbLfL0esL7AchlJlkW3cGBMFY/fH2TMQ5w==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.1.tgz#5f396b8dbbc5d0b2f144cc249f73038d7804a518"
-  integrity sha512-Vk0uqMhJcmUaehUt+0uZQaZBP+ppcVI5UYEUD3Hna0AZIgjwUVioQEhVAokelSkSAJXWn5J2tPEhk8mzZQXv3Q==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.1.tgz#cef625218795f1cb18d0ff09d1085d0e11d2bb19"
-  integrity sha512-kk0K33dPft3jP6PwEcoi6GP4xFxqxeFP7G29TKVg0JZ4b/a0rB4+nm14McG5bqWk1YjYNGKMx5hMlDLWxs0BIA==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.1.tgz#033e459d152535f235a311f066d8f6de1660786b"
-  integrity sha512-jYfmMgEm7sox+UKplALHzdawjZeNiCtvSHdDkvntUQkHzUvyAPqT9IpOZNxv5QqQqSlarqIcLqVIRKms46sJeg==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.1.tgz#07cf64c4fe5c4cc6e8f273c502ca403da82bef51"
-  integrity sha512-29T8dj+pWxZOZ42zmvm/Kgcxmd0g9/L2bjNqNQVhJEFDF5c+CrKYcqEfVKePf1mc80fWXe209I45VOzHCzzTnQ==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.1.tgz#15cffd28c9f5209bf3cdc805d55b54e4a749f4d1"
-  integrity sha512-FnbJprUHl3y0ShVqJJdKmZDuDrNEY70vuzhSt6DTHfRbtHo+i4+B9Tpt9vynGJkkug5sZEdjlRZSazoZfWlZ7A==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json
index e0fde322e1..7103162cc8 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2"
   }
 }
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock
index a0fc6e0f98..57c957a100 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.1.tgz#fd545133049b015e02820d5500bf92a09fa5dcb6"
-  integrity sha512-Xtohi+W2OUJcWf5GykCsrXJo7VV+bPNw5r3rMTO+nFioOs9nOunYBA+8usEa4AfU/WL6oRG7S4P3Tw8h8m4ULw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.1.tgz#0c4bb2653e8c93043f68ced23a8ef3f3c34ebb23"
-  integrity sha512-eCrpjEigpmFIjXnv9/6pz6cdoTBTZZw+aChSOIi8RdsDCbjUZrgfuarUoLjGFHUvyXd7DWXvc2PzjcGE7szBaw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.1"
-    "@abp/bootstrap" "~3.1.0-rc.1"
-    "@abp/bootstrap-datepicker" "~3.1.0-rc.1"
-    "@abp/datatables.net-bs4" "~3.1.0-rc.1"
-    "@abp/font-awesome" "~3.1.0-rc.1"
-    "@abp/jquery-form" "~3.1.0-rc.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.1"
-    "@abp/lodash" "~3.1.0-rc.1"
-    "@abp/luxon" "~3.1.0-rc.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.1"
-    "@abp/select2" "~3.1.0-rc.1"
-    "@abp/sweetalert" "~3.1.0-rc.1"
-    "@abp/timeago" "~3.1.0-rc.1"
-    "@abp/toastr" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.1.tgz#e4300c82fedd2d45147e98e81fc3e72ffe21a616"
-  integrity sha512-xsJGb8HCP5ovUy9+2gHtFOFxO6mWQah/jjN1RsBnJTt5EnwKEiqOXrO+18PaRlczj7fLXOw1V0bNtHeeoy8bCg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.1.tgz#12bab980bb5d0c882f823a392d765286d6d74c9e"
-  integrity sha512-ZN2xv0wTzB18jAM/cKQNuq3VdYjrqtPqnoreLAebUcy1R/sAUxHZ06xIpGaSkSTwB+0GHGWjR3/SlUnnn/HFcw==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.1.tgz#ae71f1af5cbde21af08a5ca891fa7e118bde7f1e"
-  integrity sha512-2LnJOqxHjTwC/Z9cnSrChaJCL1k++QQDA90Nv9a3VVwbJ5pgwXtdWUZrLdK9lOEkZ17CE8WaD0tkSvSNt3FUNw==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.1.tgz#9192061da6b4cd6d5d80998366d0c31b1ee400d6"
-  integrity sha512-BJhVruTQBPeJRqFig2ZiJJrWOlX3dKYno4MxAMeIJGpLBRM79Bl3v5/081WRnwltfU7s0DvhLhqYGBQfKAst6w==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.1.0-rc.1"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.1.tgz#af3b3cfa4396d2877ad8c8a71cb92b2e166eb4a0"
-  integrity sha512-vFWQr0J5BUFnUO0eL/hfyzO0N6hXKI5IP8G3iaeFMgIvIRiwyWw34mwOYaP1vJN22tliOr14uyrX9Hex2oR2Ug==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.1.0-rc.1"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.1.tgz#60e391a39fad262a58497bd03087c7734dcee5d1"
-  integrity sha512-oKxHaVApFPm0Y5VMLXfQQsqaaxpXF/tCAz8dKOkBYDHhaGK0BNd/fi7hAu/uJBuQC/09ggGwqgdm96c9jfGBiw==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.1.tgz#0376d3db580155c02fe3152c80bb23edd35c7020"
-  integrity sha512-VCh3cvkGis1efno15iqY6fNB54LBGXZFC/m1eMGYm95Vni8S9ke0svzqAoQl8qFuI5XHNFNMur1XkAXXI+YPUA==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.1.tgz#eef048968b74803e870749e2c051f9910df54b87"
-  integrity sha512-+ePC75rVivoVyfaf68IZrZ+FEcHm/5m/YFUlhuD8pi6rFTW/YHkUVYlVBS3m+whXOcV4pJlAGNXcAKKmAEJGpg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.1.tgz#2b8cf680fde18b8ef33daa7b07e5c2d22c49f0f1"
-  integrity sha512-9EWGCJjFG/Hi/a+LMhif7u+jZ1P0an1PveRV/bOT+4l7+3+GkFaQiwv6WQkgCH7Xu3/YFn/ijOd5WWzlieekFg==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.1.0-rc.1"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.1.tgz#968055ed850e1a30c7f7dede135fadf5cb9d2ba5"
-  integrity sha512-jiwHj4NeVEa2Fscw0h7Y1kiqL3/Xg54PJV/jl8BGXjGvV++3Q8KjZNeW+dNTPU2jAJpDy3VQ2InoMTT3zrGw8g==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.1.tgz#b08c608eb1157fe35e9c9c8b888c3606b3f61ef4"
-  integrity sha512-L7pRgW9OveYgMqHSKIFXUJaz4+nfCHWlwBtdFB/BQf9bKcv3gw/UEYGFOzTfZqPTxWyyFfSpB1DU+8QpDtOj6w==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.1.tgz#001247b438fbce87b87fc1189b0e95647087508a"
-  integrity sha512-2MvMowujQ3VfcjjJ164IKyJnbWjSnWSeHFaGbsUi6duZrCr9z94VKv+gQ64aUcPR2U70PoZLvggWF6lH+JMxtA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.1.tgz#2c58b1c41a206a8963b0bd0936819ab6701f63fe"
-  integrity sha512-0hCVvUJRtCh01qpZkGciE1+Sl393oI3I472C1pSwxo0EQxxWFd57SzsozBSnBmOp/f+LhlbKEUNQqvv/Wb1TUQ==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.1.tgz#c8a78a3f099c10251d8b58864536e8a0d6008cab"
-  integrity sha512-XQiQ9sLN/QJDOBFCQOK3uMn2FWWJyCGMoWEagPFCfbxkp6zfgOF4YbLfL0esL7AchlJlkW3cGBMFY/fH2TMQ5w==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.1.tgz#5f396b8dbbc5d0b2f144cc249f73038d7804a518"
-  integrity sha512-Vk0uqMhJcmUaehUt+0uZQaZBP+ppcVI5UYEUD3Hna0AZIgjwUVioQEhVAokelSkSAJXWn5J2tPEhk8mzZQXv3Q==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.1.tgz#cef625218795f1cb18d0ff09d1085d0e11d2bb19"
-  integrity sha512-kk0K33dPft3jP6PwEcoi6GP4xFxqxeFP7G29TKVg0JZ4b/a0rB4+nm14McG5bqWk1YjYNGKMx5hMlDLWxs0BIA==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.1.tgz#033e459d152535f235a311f066d8f6de1660786b"
-  integrity sha512-jYfmMgEm7sox+UKplALHzdawjZeNiCtvSHdDkvntUQkHzUvyAPqT9IpOZNxv5QqQqSlarqIcLqVIRKms46sJeg==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.1.tgz#07cf64c4fe5c4cc6e8f273c502ca403da82bef51"
-  integrity sha512-29T8dj+pWxZOZ42zmvm/Kgcxmd0g9/L2bjNqNQVhJEFDF5c+CrKYcqEfVKePf1mc80fWXe209I45VOzHCzzTnQ==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.1.tgz#15cffd28c9f5209bf3cdc805d55b54e4a749f4d1"
-  integrity sha512-FnbJprUHl3y0ShVqJJdKmZDuDrNEY70vuzhSt6DTHfRbtHo+i4+B9Tpt9vynGJkkug5sZEdjlRZSazoZfWlZ7A==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json
index c206ba8c69..fd316e5807 100644
--- a/templates/module/angular/package.json
+++ b/templates/module/angular/package.json
@@ -15,11 +15,11 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~3.0.5",
-    "@abp/ng.identity": "~3.0.5",
-    "@abp/ng.setting-management": "~3.0.5",
-    "@abp/ng.tenant-management": "~3.0.5",
-    "@abp/ng.theme.basic": "~3.0.5",
+    "@abp/ng.account": "~3.1.0-rc.2",
+    "@abp/ng.identity": "~3.1.0-rc.2",
+    "@abp/ng.setting-management": "~3.1.0-rc.2",
+    "@abp/ng.tenant-management": "~3.1.0-rc.2",
+    "@abp/ng.theme.basic": "~3.1.0-rc.2",
     "@angular/animations": "~10.0.0",
     "@angular/common": "~10.0.0",
     "@angular/compiler": "~10.0.0",
@@ -33,7 +33,7 @@
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@abp/ng.schematics": "~3.1.0-beta.2",
+    "@abp/ng.schematics": "~3.1.0-rc.2",
     "@angular-devkit/build-angular": "~0.1000.0",
     "@angular-devkit/build-ng-packagr": "~0.1000.0",
     "@angular/cli": "~10.0.0",
diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json
index b2b574a659..3de5eb4cbd 100644
--- a/templates/module/angular/projects/my-project-name/package.json
+++ b/templates/module/angular/projects/my-project-name/package.json
@@ -4,8 +4,8 @@
   "peerDependencies": {
     "@angular/common": "^9.1.11",
     "@angular/core": "^9.1.11",
-    "@abp/ng.core": ">=3.0.5",
-    "@abp/ng.theme.shared": ">=3.0.5"
+    "@abp/ng.core": ">=3.1.0-rc.2",
+    "@abp/ng.theme.shared": ">=3.1.0-rc.2"
   },
   "dependencies": {
     "tslib": "^2.0.0"
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json
index 6b42637f58..2aff27f377 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/package.json
@@ -3,6 +3,6 @@
   "name": "my-app-identityserver",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2"
   }
 }
\ No newline at end of file
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
index b714e08268..c836cc49cb 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.1.tgz#fd545133049b015e02820d5500bf92a09fa5dcb6"
-  integrity sha512-Xtohi+W2OUJcWf5GykCsrXJo7VV+bPNw5r3rMTO+nFioOs9nOunYBA+8usEa4AfU/WL6oRG7S4P3Tw8h8m4ULw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.1.tgz#0c4bb2653e8c93043f68ced23a8ef3f3c34ebb23"
-  integrity sha512-eCrpjEigpmFIjXnv9/6pz6cdoTBTZZw+aChSOIi8RdsDCbjUZrgfuarUoLjGFHUvyXd7DWXvc2PzjcGE7szBaw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.1"
-    "@abp/bootstrap" "~3.1.0-rc.1"
-    "@abp/bootstrap-datepicker" "~3.1.0-rc.1"
-    "@abp/datatables.net-bs4" "~3.1.0-rc.1"
-    "@abp/font-awesome" "~3.1.0-rc.1"
-    "@abp/jquery-form" "~3.1.0-rc.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.1"
-    "@abp/lodash" "~3.1.0-rc.1"
-    "@abp/luxon" "~3.1.0-rc.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.1"
-    "@abp/select2" "~3.1.0-rc.1"
-    "@abp/sweetalert" "~3.1.0-rc.1"
-    "@abp/timeago" "~3.1.0-rc.1"
-    "@abp/toastr" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.1.tgz#e4300c82fedd2d45147e98e81fc3e72ffe21a616"
-  integrity sha512-xsJGb8HCP5ovUy9+2gHtFOFxO6mWQah/jjN1RsBnJTt5EnwKEiqOXrO+18PaRlczj7fLXOw1V0bNtHeeoy8bCg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.1.tgz#12bab980bb5d0c882f823a392d765286d6d74c9e"
-  integrity sha512-ZN2xv0wTzB18jAM/cKQNuq3VdYjrqtPqnoreLAebUcy1R/sAUxHZ06xIpGaSkSTwB+0GHGWjR3/SlUnnn/HFcw==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.1.tgz#ae71f1af5cbde21af08a5ca891fa7e118bde7f1e"
-  integrity sha512-2LnJOqxHjTwC/Z9cnSrChaJCL1k++QQDA90Nv9a3VVwbJ5pgwXtdWUZrLdK9lOEkZ17CE8WaD0tkSvSNt3FUNw==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.1.tgz#9192061da6b4cd6d5d80998366d0c31b1ee400d6"
-  integrity sha512-BJhVruTQBPeJRqFig2ZiJJrWOlX3dKYno4MxAMeIJGpLBRM79Bl3v5/081WRnwltfU7s0DvhLhqYGBQfKAst6w==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.1.0-rc.1"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.1.tgz#af3b3cfa4396d2877ad8c8a71cb92b2e166eb4a0"
-  integrity sha512-vFWQr0J5BUFnUO0eL/hfyzO0N6hXKI5IP8G3iaeFMgIvIRiwyWw34mwOYaP1vJN22tliOr14uyrX9Hex2oR2Ug==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.1.0-rc.1"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.1.tgz#60e391a39fad262a58497bd03087c7734dcee5d1"
-  integrity sha512-oKxHaVApFPm0Y5VMLXfQQsqaaxpXF/tCAz8dKOkBYDHhaGK0BNd/fi7hAu/uJBuQC/09ggGwqgdm96c9jfGBiw==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.1.tgz#0376d3db580155c02fe3152c80bb23edd35c7020"
-  integrity sha512-VCh3cvkGis1efno15iqY6fNB54LBGXZFC/m1eMGYm95Vni8S9ke0svzqAoQl8qFuI5XHNFNMur1XkAXXI+YPUA==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.1.tgz#eef048968b74803e870749e2c051f9910df54b87"
-  integrity sha512-+ePC75rVivoVyfaf68IZrZ+FEcHm/5m/YFUlhuD8pi6rFTW/YHkUVYlVBS3m+whXOcV4pJlAGNXcAKKmAEJGpg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.1.tgz#2b8cf680fde18b8ef33daa7b07e5c2d22c49f0f1"
-  integrity sha512-9EWGCJjFG/Hi/a+LMhif7u+jZ1P0an1PveRV/bOT+4l7+3+GkFaQiwv6WQkgCH7Xu3/YFn/ijOd5WWzlieekFg==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.1.0-rc.1"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.1.tgz#968055ed850e1a30c7f7dede135fadf5cb9d2ba5"
-  integrity sha512-jiwHj4NeVEa2Fscw0h7Y1kiqL3/Xg54PJV/jl8BGXjGvV++3Q8KjZNeW+dNTPU2jAJpDy3VQ2InoMTT3zrGw8g==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.1.tgz#b08c608eb1157fe35e9c9c8b888c3606b3f61ef4"
-  integrity sha512-L7pRgW9OveYgMqHSKIFXUJaz4+nfCHWlwBtdFB/BQf9bKcv3gw/UEYGFOzTfZqPTxWyyFfSpB1DU+8QpDtOj6w==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.1.tgz#001247b438fbce87b87fc1189b0e95647087508a"
-  integrity sha512-2MvMowujQ3VfcjjJ164IKyJnbWjSnWSeHFaGbsUi6duZrCr9z94VKv+gQ64aUcPR2U70PoZLvggWF6lH+JMxtA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.1.tgz#2c58b1c41a206a8963b0bd0936819ab6701f63fe"
-  integrity sha512-0hCVvUJRtCh01qpZkGciE1+Sl393oI3I472C1pSwxo0EQxxWFd57SzsozBSnBmOp/f+LhlbKEUNQqvv/Wb1TUQ==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.1.tgz#c8a78a3f099c10251d8b58864536e8a0d6008cab"
-  integrity sha512-XQiQ9sLN/QJDOBFCQOK3uMn2FWWJyCGMoWEagPFCfbxkp6zfgOF4YbLfL0esL7AchlJlkW3cGBMFY/fH2TMQ5w==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.1.tgz#5f396b8dbbc5d0b2f144cc249f73038d7804a518"
-  integrity sha512-Vk0uqMhJcmUaehUt+0uZQaZBP+ppcVI5UYEUD3Hna0AZIgjwUVioQEhVAokelSkSAJXWn5J2tPEhk8mzZQXv3Q==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.1.tgz#cef625218795f1cb18d0ff09d1085d0e11d2bb19"
-  integrity sha512-kk0K33dPft3jP6PwEcoi6GP4xFxqxeFP7G29TKVg0JZ4b/a0rB4+nm14McG5bqWk1YjYNGKMx5hMlDLWxs0BIA==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.1.tgz#033e459d152535f235a311f066d8f6de1660786b"
-  integrity sha512-jYfmMgEm7sox+UKplALHzdawjZeNiCtvSHdDkvntUQkHzUvyAPqT9IpOZNxv5QqQqSlarqIcLqVIRKms46sJeg==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.1.tgz#07cf64c4fe5c4cc6e8f273c502ca403da82bef51"
-  integrity sha512-29T8dj+pWxZOZ42zmvm/Kgcxmd0g9/L2bjNqNQVhJEFDF5c+CrKYcqEfVKePf1mc80fWXe209I45VOzHCzzTnQ==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.1.tgz#15cffd28c9f5209bf3cdc805d55b54e4a749f4d1"
-  integrity sha512-FnbJprUHl3y0ShVqJJdKmZDuDrNEY70vuzhSt6DTHfRbtHo+i4+B9Tpt9vynGJkkug5sZEdjlRZSazoZfWlZ7A==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json
index e0fde322e1..7103162cc8 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2"
   }
 }
\ No newline at end of file
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock
index b714e08268..c836cc49cb 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.1.tgz#fd545133049b015e02820d5500bf92a09fa5dcb6"
-  integrity sha512-Xtohi+W2OUJcWf5GykCsrXJo7VV+bPNw5r3rMTO+nFioOs9nOunYBA+8usEa4AfU/WL6oRG7S4P3Tw8h8m4ULw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.1.tgz#0c4bb2653e8c93043f68ced23a8ef3f3c34ebb23"
-  integrity sha512-eCrpjEigpmFIjXnv9/6pz6cdoTBTZZw+aChSOIi8RdsDCbjUZrgfuarUoLjGFHUvyXd7DWXvc2PzjcGE7szBaw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.1"
-    "@abp/bootstrap" "~3.1.0-rc.1"
-    "@abp/bootstrap-datepicker" "~3.1.0-rc.1"
-    "@abp/datatables.net-bs4" "~3.1.0-rc.1"
-    "@abp/font-awesome" "~3.1.0-rc.1"
-    "@abp/jquery-form" "~3.1.0-rc.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.1"
-    "@abp/lodash" "~3.1.0-rc.1"
-    "@abp/luxon" "~3.1.0-rc.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.1"
-    "@abp/select2" "~3.1.0-rc.1"
-    "@abp/sweetalert" "~3.1.0-rc.1"
-    "@abp/timeago" "~3.1.0-rc.1"
-    "@abp/toastr" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.1.tgz#e4300c82fedd2d45147e98e81fc3e72ffe21a616"
-  integrity sha512-xsJGb8HCP5ovUy9+2gHtFOFxO6mWQah/jjN1RsBnJTt5EnwKEiqOXrO+18PaRlczj7fLXOw1V0bNtHeeoy8bCg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.1.tgz#12bab980bb5d0c882f823a392d765286d6d74c9e"
-  integrity sha512-ZN2xv0wTzB18jAM/cKQNuq3VdYjrqtPqnoreLAebUcy1R/sAUxHZ06xIpGaSkSTwB+0GHGWjR3/SlUnnn/HFcw==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.1.tgz#ae71f1af5cbde21af08a5ca891fa7e118bde7f1e"
-  integrity sha512-2LnJOqxHjTwC/Z9cnSrChaJCL1k++QQDA90Nv9a3VVwbJ5pgwXtdWUZrLdK9lOEkZ17CE8WaD0tkSvSNt3FUNw==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.1.tgz#9192061da6b4cd6d5d80998366d0c31b1ee400d6"
-  integrity sha512-BJhVruTQBPeJRqFig2ZiJJrWOlX3dKYno4MxAMeIJGpLBRM79Bl3v5/081WRnwltfU7s0DvhLhqYGBQfKAst6w==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.1.0-rc.1"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.1.tgz#af3b3cfa4396d2877ad8c8a71cb92b2e166eb4a0"
-  integrity sha512-vFWQr0J5BUFnUO0eL/hfyzO0N6hXKI5IP8G3iaeFMgIvIRiwyWw34mwOYaP1vJN22tliOr14uyrX9Hex2oR2Ug==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.1.0-rc.1"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.1.tgz#60e391a39fad262a58497bd03087c7734dcee5d1"
-  integrity sha512-oKxHaVApFPm0Y5VMLXfQQsqaaxpXF/tCAz8dKOkBYDHhaGK0BNd/fi7hAu/uJBuQC/09ggGwqgdm96c9jfGBiw==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.1.tgz#0376d3db580155c02fe3152c80bb23edd35c7020"
-  integrity sha512-VCh3cvkGis1efno15iqY6fNB54LBGXZFC/m1eMGYm95Vni8S9ke0svzqAoQl8qFuI5XHNFNMur1XkAXXI+YPUA==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.1.tgz#eef048968b74803e870749e2c051f9910df54b87"
-  integrity sha512-+ePC75rVivoVyfaf68IZrZ+FEcHm/5m/YFUlhuD8pi6rFTW/YHkUVYlVBS3m+whXOcV4pJlAGNXcAKKmAEJGpg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.1.tgz#2b8cf680fde18b8ef33daa7b07e5c2d22c49f0f1"
-  integrity sha512-9EWGCJjFG/Hi/a+LMhif7u+jZ1P0an1PveRV/bOT+4l7+3+GkFaQiwv6WQkgCH7Xu3/YFn/ijOd5WWzlieekFg==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.1.0-rc.1"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.1.tgz#968055ed850e1a30c7f7dede135fadf5cb9d2ba5"
-  integrity sha512-jiwHj4NeVEa2Fscw0h7Y1kiqL3/Xg54PJV/jl8BGXjGvV++3Q8KjZNeW+dNTPU2jAJpDy3VQ2InoMTT3zrGw8g==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.1.tgz#b08c608eb1157fe35e9c9c8b888c3606b3f61ef4"
-  integrity sha512-L7pRgW9OveYgMqHSKIFXUJaz4+nfCHWlwBtdFB/BQf9bKcv3gw/UEYGFOzTfZqPTxWyyFfSpB1DU+8QpDtOj6w==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.1.tgz#001247b438fbce87b87fc1189b0e95647087508a"
-  integrity sha512-2MvMowujQ3VfcjjJ164IKyJnbWjSnWSeHFaGbsUi6duZrCr9z94VKv+gQ64aUcPR2U70PoZLvggWF6lH+JMxtA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.1.tgz#2c58b1c41a206a8963b0bd0936819ab6701f63fe"
-  integrity sha512-0hCVvUJRtCh01qpZkGciE1+Sl393oI3I472C1pSwxo0EQxxWFd57SzsozBSnBmOp/f+LhlbKEUNQqvv/Wb1TUQ==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.1.tgz#c8a78a3f099c10251d8b58864536e8a0d6008cab"
-  integrity sha512-XQiQ9sLN/QJDOBFCQOK3uMn2FWWJyCGMoWEagPFCfbxkp6zfgOF4YbLfL0esL7AchlJlkW3cGBMFY/fH2TMQ5w==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.1.tgz#5f396b8dbbc5d0b2f144cc249f73038d7804a518"
-  integrity sha512-Vk0uqMhJcmUaehUt+0uZQaZBP+ppcVI5UYEUD3Hna0AZIgjwUVioQEhVAokelSkSAJXWn5J2tPEhk8mzZQXv3Q==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.1.tgz#cef625218795f1cb18d0ff09d1085d0e11d2bb19"
-  integrity sha512-kk0K33dPft3jP6PwEcoi6GP4xFxqxeFP7G29TKVg0JZ4b/a0rB4+nm14McG5bqWk1YjYNGKMx5hMlDLWxs0BIA==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.1.tgz#033e459d152535f235a311f066d8f6de1660786b"
-  integrity sha512-jYfmMgEm7sox+UKplALHzdawjZeNiCtvSHdDkvntUQkHzUvyAPqT9IpOZNxv5QqQqSlarqIcLqVIRKms46sJeg==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.1.tgz#07cf64c4fe5c4cc6e8f273c502ca403da82bef51"
-  integrity sha512-29T8dj+pWxZOZ42zmvm/Kgcxmd0g9/L2bjNqNQVhJEFDF5c+CrKYcqEfVKePf1mc80fWXe209I45VOzHCzzTnQ==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.1.tgz#15cffd28c9f5209bf3cdc805d55b54e4a749f4d1"
-  integrity sha512-FnbJprUHl3y0ShVqJJdKmZDuDrNEY70vuzhSt6DTHfRbtHo+i4+B9Tpt9vynGJkkug5sZEdjlRZSazoZfWlZ7A==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"
 
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json
index e0fde322e1..7103162cc8 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.1"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.1.0-rc.2"
   }
 }
\ No newline at end of file
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock
index 183cefac3e..f1a5b49588 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/yarn.lock
@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.1.tgz#fd545133049b015e02820d5500bf92a09fa5dcb6"
-  integrity sha512-Xtohi+W2OUJcWf5GykCsrXJo7VV+bPNw5r3rMTO+nFioOs9nOunYBA+8usEa4AfU/WL6oRG7S4P3Tw8h8m4ULw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.1.tgz#0c4bb2653e8c93043f68ced23a8ef3f3c34ebb23"
-  integrity sha512-eCrpjEigpmFIjXnv9/6pz6cdoTBTZZw+aChSOIi8RdsDCbjUZrgfuarUoLjGFHUvyXd7DWXvc2PzjcGE7szBaw==
-  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.1"
-    "@abp/bootstrap" "~3.1.0-rc.1"
-    "@abp/bootstrap-datepicker" "~3.1.0-rc.1"
-    "@abp/datatables.net-bs4" "~3.1.0-rc.1"
-    "@abp/font-awesome" "~3.1.0-rc.1"
-    "@abp/jquery-form" "~3.1.0-rc.1"
-    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.1"
-    "@abp/lodash" "~3.1.0-rc.1"
-    "@abp/luxon" "~3.1.0-rc.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.1"
-    "@abp/select2" "~3.1.0-rc.1"
-    "@abp/sweetalert" "~3.1.0-rc.1"
-    "@abp/timeago" "~3.1.0-rc.1"
-    "@abp/toastr" "~3.1.0-rc.1"
-
-"@abp/aspnetcore.mvc.ui@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.1.tgz#e4300c82fedd2d45147e98e81fc3e72ffe21a616"
-  integrity sha512-xsJGb8HCP5ovUy9+2gHtFOFxO6mWQah/jjN1RsBnJTt5EnwKEiqOXrO+18PaRlczj7fLXOw1V0bNtHeeoy8bCg==
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.1.0-rc.2.tgz#b72eee4a441619caa8222941c797c8afd3cae09b"
+  integrity sha512-8zczo69E6ACjFaL+3UNP7VoUXeoSVViKAyhoub0Uw6CrLUxAYxT/Yuw/apIY7AW3cVoB5ULBfjMN7xWSJML9eg==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.1.0-rc.2.tgz#db34b0414ded4bd52420d1faa3a5fab03b68783f"
+  integrity sha512-tnTDCkExlUT+OyPls/VfZsBlbgu02P9zqpT58F7bDo2WtaxzrSvo6xwC+9a6+c3CpKy/xezI2S/r8H9lb2vd5w==
+  dependencies:
+    "@abp/aspnetcore.mvc.ui" "~3.1.0-rc.2"
+    "@abp/bootstrap" "~3.1.0-rc.2"
+    "@abp/bootstrap-datepicker" "~3.1.0-rc.2"
+    "@abp/datatables.net-bs4" "~3.1.0-rc.2"
+    "@abp/font-awesome" "~3.1.0-rc.2"
+    "@abp/jquery-form" "~3.1.0-rc.2"
+    "@abp/jquery-validation-unobtrusive" "~3.1.0-rc.2"
+    "@abp/lodash" "~3.1.0-rc.2"
+    "@abp/luxon" "~3.1.0-rc.2"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.1.0-rc.2"
+    "@abp/select2" "~3.1.0-rc.2"
+    "@abp/sweetalert" "~3.1.0-rc.2"
+    "@abp/timeago" "~3.1.0-rc.2"
+    "@abp/toastr" "~3.1.0-rc.2"
+
+"@abp/aspnetcore.mvc.ui@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.1.0-rc.2.tgz#395e101891d8fa7d1532defd125712c7846ee22a"
+  integrity sha512-dUvOXwUX7I08ZO5q30I9/1qv7s3c9FvKLVrjMexZL1auP83C5hnCh6EBOSWhKKe5Wfe5Rq2sxiinFi/xXibTsw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,144 +41,144 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.1.tgz#12bab980bb5d0c882f823a392d765286d6d74c9e"
-  integrity sha512-ZN2xv0wTzB18jAM/cKQNuq3VdYjrqtPqnoreLAebUcy1R/sAUxHZ06xIpGaSkSTwB+0GHGWjR3/SlUnnn/HFcw==
+"@abp/bootstrap-datepicker@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.1.0-rc.2.tgz#5ecca3e7150d4a75577d9abf0f226813fe40cff5"
+  integrity sha512-SebgagX0TszhsmIfQhM+A+M+cThbELSRmbDb+48DgLflVHH1bw6wCGXVMVQA65vYWkiHaALbxDgYOHLSFsWpag==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.1.tgz#ae71f1af5cbde21af08a5ca891fa7e118bde7f1e"
-  integrity sha512-2LnJOqxHjTwC/Z9cnSrChaJCL1k++QQDA90Nv9a3VVwbJ5pgwXtdWUZrLdK9lOEkZ17CE8WaD0tkSvSNt3FUNw==
+"@abp/bootstrap@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.1.0-rc.2.tgz#691e4f609895e8914cf6903a26ad5d51f629c596"
+  integrity sha512-SaT7JN5C2RqzTgA8YdoON/eaeL4gl54vp7DTGPXXVvTYS20ZSxExKgVXEuOMEJVITKu4OeXqLYZyThz888I9iQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.1.tgz#9192061da6b4cd6d5d80998366d0c31b1ee400d6"
-  integrity sha512-BJhVruTQBPeJRqFig2ZiJJrWOlX3dKYno4MxAMeIJGpLBRM79Bl3v5/081WRnwltfU7s0DvhLhqYGBQfKAst6w==
+"@abp/core@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.1.0-rc.2.tgz#707cec3323020b9ee4cc7c5a7fee21b418457eff"
+  integrity sha512-2VSCPIWEEM4iwcgRfgFempjPV0zLaWf81cp1ZrwuilqsljUXjMQL8Pf07TEaSa8+uN3VKkCsQtyq3A+DhUlVhA==
   dependencies:
-    "@abp/utils" "^3.1.0-rc.1"
+    "@abp/utils" "^3.1.0-rc.2"
 
-"@abp/datatables.net-bs4@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.1.tgz#af3b3cfa4396d2877ad8c8a71cb92b2e166eb4a0"
-  integrity sha512-vFWQr0J5BUFnUO0eL/hfyzO0N6hXKI5IP8G3iaeFMgIvIRiwyWw34mwOYaP1vJN22tliOr14uyrX9Hex2oR2Ug==
+"@abp/datatables.net-bs4@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.1.0-rc.2.tgz#d98f47e4e286a7299ba42da1c394594f4b4581c7"
+  integrity sha512-VrcgFq3qq6azpCJEpk00R4fWA6GBzoDgHJT0K9bQtg4AqG8oamJa2QWX60g2OXzWpbI74bxleBAOLXzC4OJIrw==
   dependencies:
-    "@abp/datatables.net" "~3.1.0-rc.1"
+    "@abp/datatables.net" "~3.1.0-rc.2"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.1.tgz#60e391a39fad262a58497bd03087c7734dcee5d1"
-  integrity sha512-oKxHaVApFPm0Y5VMLXfQQsqaaxpXF/tCAz8dKOkBYDHhaGK0BNd/fi7hAu/uJBuQC/09ggGwqgdm96c9jfGBiw==
+"@abp/datatables.net@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.1.0-rc.2.tgz#e73fee8f323e33094bfe49cbed520a4b9f382c18"
+  integrity sha512-+Bo8C7tslTasH7kMUnXQ5JESzg+ciy7jmvWPbJo32f0VFuiSPDBBr6nacBmE6IHPqG54ZAjqOkvE8eWL39dN2A==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.1.tgz#0376d3db580155c02fe3152c80bb23edd35c7020"
-  integrity sha512-VCh3cvkGis1efno15iqY6fNB54LBGXZFC/m1eMGYm95Vni8S9ke0svzqAoQl8qFuI5XHNFNMur1XkAXXI+YPUA==
+"@abp/font-awesome@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.1.0-rc.2.tgz#4d0ef35abe67b86a6cbb8c7008a50f26eadbaa6e"
+  integrity sha512-r1iLq+1avQ8lsDqNAsu0TAQn5+JlYhUnjTVpnb/xcDMtbJv+eBZpqVLTbXelHV0q2Czq/gDzloqkHFNv5Cxceg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.1.tgz#eef048968b74803e870749e2c051f9910df54b87"
-  integrity sha512-+ePC75rVivoVyfaf68IZrZ+FEcHm/5m/YFUlhuD8pi6rFTW/YHkUVYlVBS3m+whXOcV4pJlAGNXcAKKmAEJGpg==
+"@abp/jquery-form@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.1.0-rc.2.tgz#f08ceb6be4a23d79f855d59b46c5fea5a6bf37ee"
+  integrity sha512-3UlUGXmvoT5xz4Hjz2gRX2rL+YbL4JprGaZvBrIbASJ6VSV3yHYbjma8YBqj2Wu2IQv6wpNhAYV+tALjPnFEgw==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.1.tgz#2b8cf680fde18b8ef33daa7b07e5c2d22c49f0f1"
-  integrity sha512-9EWGCJjFG/Hi/a+LMhif7u+jZ1P0an1PveRV/bOT+4l7+3+GkFaQiwv6WQkgCH7Xu3/YFn/ijOd5WWzlieekFg==
+"@abp/jquery-validation-unobtrusive@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.1.0-rc.2.tgz#1802ffd0dc8aa710bfb81f6f5e6654a44227334f"
+  integrity sha512-2iWFp8a4Iths5dbf3v/gcTFrOXUX6CkwS5JiO3YsA0ujbZgF2HGbnPD7vzrfuRJAIKPKCIiovLDBY3yKN6boQw==
   dependencies:
-    "@abp/jquery-validation" "~3.1.0-rc.1"
+    "@abp/jquery-validation" "~3.1.0-rc.2"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.1.tgz#968055ed850e1a30c7f7dede135fadf5cb9d2ba5"
-  integrity sha512-jiwHj4NeVEa2Fscw0h7Y1kiqL3/Xg54PJV/jl8BGXjGvV++3Q8KjZNeW+dNTPU2jAJpDy3VQ2InoMTT3zrGw8g==
+"@abp/jquery-validation@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.1.0-rc.2.tgz#adc314584261ef5bcdfa240c5e2df9f1bb4dcb2f"
+  integrity sha512-L2GoAUxMCAd8pXt54UqI2CEV4nWS0ww2dTNctEUcnJ2UZc7Ce+QFqBgvyRNmuSULMebfdtUYkodCGFdzzjRXfg==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.1.tgz#b08c608eb1157fe35e9c9c8b888c3606b3f61ef4"
-  integrity sha512-L7pRgW9OveYgMqHSKIFXUJaz4+nfCHWlwBtdFB/BQf9bKcv3gw/UEYGFOzTfZqPTxWyyFfSpB1DU+8QpDtOj6w==
+"@abp/jquery@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.1.0-rc.2.tgz#05857739e5ec9e519194fe9b80b426be0b40addb"
+  integrity sha512-+qPHJpV/s9GGWwdH6gj8BdDhg4t4w8pI9hx41UlIpPdrtO4kzaPU85/f7vX0QYzOrsYYxmWXHu3H0pL8QyDwQA==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.1.tgz#001247b438fbce87b87fc1189b0e95647087508a"
-  integrity sha512-2MvMowujQ3VfcjjJ164IKyJnbWjSnWSeHFaGbsUi6duZrCr9z94VKv+gQ64aUcPR2U70PoZLvggWF6lH+JMxtA==
+"@abp/lodash@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.1.0-rc.2.tgz#80fc560277e903b94cf90146e05cb6e6e62b0ee3"
+  integrity sha512-TQ8HqvW9skMFDfJv7wNX4Ahi/HjCBfD/ZDePvfyTLwdsnNPwDg6zERwYTGk48ep/6CUsK3MMQzvShl4yaYIFYQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.1.tgz#2c58b1c41a206a8963b0bd0936819ab6701f63fe"
-  integrity sha512-0hCVvUJRtCh01qpZkGciE1+Sl393oI3I472C1pSwxo0EQxxWFd57SzsozBSnBmOp/f+LhlbKEUNQqvv/Wb1TUQ==
+"@abp/luxon@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.1.0-rc.2.tgz#6a7db2fd1cc1674e73df6c982657c791a94fc65b"
+  integrity sha512-vrtiuMnQDP0rC+yrQawqVu3F4pcZrv3wsx0ZqaIWWakQJ4X17aSTM0Xhxa95jnHh4WFFUDN00mYxkPxNr8JqvA==
   dependencies:
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.1.tgz#c8a78a3f099c10251d8b58864536e8a0d6008cab"
-  integrity sha512-XQiQ9sLN/QJDOBFCQOK3uMn2FWWJyCGMoWEagPFCfbxkp6zfgOF4YbLfL0esL7AchlJlkW3cGBMFY/fH2TMQ5w==
+"@abp/malihu-custom-scrollbar-plugin@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.0-rc.2.tgz#3805b260bd3442353a946de5c7508e98cc7cefdd"
+  integrity sha512-bp+S43ZIWQpkhx7ni2DThwDZ2A+q6ZaAUaESWz+yCHXWwYacnfHeq4p+mkS07OdVteP33NWAxJpjtDl6fPBo8A==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.1.tgz#5f396b8dbbc5d0b2f144cc249f73038d7804a518"
-  integrity sha512-Vk0uqMhJcmUaehUt+0uZQaZBP+ppcVI5UYEUD3Hna0AZIgjwUVioQEhVAokelSkSAJXWn5J2tPEhk8mzZQXv3Q==
+"@abp/select2@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.1.0-rc.2.tgz#6b16301cb7c4ad4e2b39400a5f9cf336c700a343"
+  integrity sha512-qbj6csa9/0+xF5fzcm1WJSzUiBvSgwiYPRpH5wyG/FZYf7YxK2dAv/Lmi5RE4eAb8Ib9ueB7nPkzJYUJhJ1wgQ==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.1.tgz#cef625218795f1cb18d0ff09d1085d0e11d2bb19"
-  integrity sha512-kk0K33dPft3jP6PwEcoi6GP4xFxqxeFP7G29TKVg0JZ4b/a0rB4+nm14McG5bqWk1YjYNGKMx5hMlDLWxs0BIA==
+"@abp/sweetalert@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.1.0-rc.2.tgz#a152eb5632cd0eee50d5fed2c156bc4b6daf6829"
+  integrity sha512-6pjzFwr/HKgNYcsx76GZdcm0qZ8NfcdYqFOwj91w3bGmtPZYRRJLV01k9kDIOQHYnmCReO+ThF46wZCyt/8xvg==
   dependencies:
-    "@abp/core" "~3.1.0-rc.1"
+    "@abp/core" "~3.1.0-rc.2"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.1.tgz#033e459d152535f235a311f066d8f6de1660786b"
-  integrity sha512-jYfmMgEm7sox+UKplALHzdawjZeNiCtvSHdDkvntUQkHzUvyAPqT9IpOZNxv5QqQqSlarqIcLqVIRKms46sJeg==
+"@abp/timeago@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.1.0-rc.2.tgz#0c3fe13f15319c943186eff861f0e9a790b6651b"
+  integrity sha512-BJzvJGJk6uPkpR5MMIX7DF/WsYZbvss2B82RTcr2Dkto7VtfRUYqcpWBcUIHCJ7hLh4SMS000fC8tfRXo7e0EA==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.1.tgz#07cf64c4fe5c4cc6e8f273c502ca403da82bef51"
-  integrity sha512-29T8dj+pWxZOZ42zmvm/Kgcxmd0g9/L2bjNqNQVhJEFDF5c+CrKYcqEfVKePf1mc80fWXe209I45VOzHCzzTnQ==
+"@abp/toastr@~3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.1.0-rc.2.tgz#1b149684a4f7751df48cd9cbac5ce0ce7526042c"
+  integrity sha512-4U2spuDnl2F3AzGDvHyhGJtZT0Kv4LmdUYwdq/aKneHSTzJ9v5bUpjjU1Gth6fyi0iqH61DAyaoTsbgy0kFQqQ==
   dependencies:
-    "@abp/jquery" "~3.1.0-rc.1"
+    "@abp/jquery" "~3.1.0-rc.2"
     toastr "^2.1.4"
 
-"@abp/utils@^3.1.0-rc.1":
-  version "3.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.1.tgz#15cffd28c9f5209bf3cdc805d55b54e4a749f4d1"
-  integrity sha512-FnbJprUHl3y0ShVqJJdKmZDuDrNEY70vuzhSt6DTHfRbtHo+i4+B9Tpt9vynGJkkug5sZEdjlRZSazoZfWlZ7A==
+"@abp/utils@^3.1.0-rc.2":
+  version "3.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.0-rc.2.tgz#c3774246f01f4b032b2d229457c3bd93f7d14048"
+  integrity sha512-lgHy/OAEBau2Qyr0mZUjOWU8uBFBFIBvGnUKgSqKRxTqf5GyNvkKO8GPpqGSmyIsYUfW2UUsRhaLW7K85T9CZw==
   dependencies:
     just-compare "^1.3.0"