From 78893c2223061bbc2712c3881d4bfb79f3790680 Mon Sep 17 00:00:00 2001 From: albert <9526587+ebicoglu@users.noreply.github.com> Date: Wed, 20 Oct 2021 13:16:04 +0300 Subject: [PATCH 1/8] update to beta.2 --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index 753259efb2..409b435273 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 5.0.0-beta.1 + 5.0.0-beta.2 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ From 71cc4eb3f194b58fcee5424eb22c4f4e76547c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 20 Oct 2021 15:52:47 +0300 Subject: [PATCH 2/8] Remove unnecessary line for test --- .../Volo/Abp/PermissionManagement/PermissionStore_Tests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/PermissionStore_Tests.cs b/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/PermissionStore_Tests.cs index ee0ef168c1..e259114b7c 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/PermissionStore_Tests.cs +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/PermissionStore_Tests.cs @@ -22,7 +22,6 @@ namespace Volo.Abp.PermissionManagement UserPermissionValueProvider.ProviderName, PermissionTestDataBuilder.User1Id.ToString())).ShouldBeTrue(); - (await _permissionStore.IsGrantedAsync("MyPermission1NotExist", UserPermissionValueProvider.ProviderName, PermissionTestDataBuilder.User1Id.ToString())).ShouldBeFalse(); From 013faacdc06ba8f62b7d274e8976933c9fbe6d27 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 20 Oct 2021 21:35:18 +0800 Subject: [PATCH 3/8] Update codecov.yml --- codecov.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/codecov.yml b/codecov.yml index 2655dd78e3..7ad4672daf 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,6 +1,4 @@ codecov: branch: dev require_ci_to_pass: yes -comment: - require_head: no - require_base: no + allow_coverage_offsets: true From 70e672928c12030c3b63a32b0c4d2302339fef1e Mon Sep 17 00:00:00 2001 From: iyilm4z Date: Thu, 21 Oct 2021 01:40:12 +0300 Subject: [PATCH 4/8] Account view components made extensible --- .../AccountProfilePasswordManagementGroupViewComponent.cs | 8 ++++---- ...ountProfilePersonalInfoManagementGroupViewComponent.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/AccountProfilePasswordManagementGroupViewComponent.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/AccountProfilePasswordManagementGroupViewComponent.cs index 8bacadfb4a..b2f85a15c9 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/AccountProfilePasswordManagementGroupViewComponent.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/AccountProfilePasswordManagementGroupViewComponent.cs @@ -11,17 +11,17 @@ namespace Volo.Abp.Account.Web.Pages.Account.Components.ProfileManagementGroup.P { public class AccountProfilePasswordManagementGroupViewComponent : AbpViewComponent { - private readonly IProfileAppService _profileAppService; + protected IProfileAppService ProfileAppService { get; } public AccountProfilePasswordManagementGroupViewComponent( IProfileAppService profileAppService) { - _profileAppService = profileAppService; + ProfileAppService = profileAppService; } - public async Task InvokeAsync() + public virtual async Task InvokeAsync() { - var user = await _profileAppService.GetAsync(); + var user = await ProfileAppService.GetAsync(); var model = new ChangePasswordInfoModel { diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/PersonalInfo/AccountProfilePersonalInfoManagementGroupViewComponent.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/PersonalInfo/AccountProfilePersonalInfoManagementGroupViewComponent.cs index c9fb2b660e..54b59f17c9 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/PersonalInfo/AccountProfilePersonalInfoManagementGroupViewComponent.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/PersonalInfo/AccountProfilePersonalInfoManagementGroupViewComponent.cs @@ -11,19 +11,19 @@ namespace Volo.Abp.Account.Web.Pages.Account.Components.ProfileManagementGroup.P { public class AccountProfilePersonalInfoManagementGroupViewComponent : AbpViewComponent { - private readonly IProfileAppService _profileAppService; + protected IProfileAppService ProfileAppService { get; } public AccountProfilePersonalInfoManagementGroupViewComponent( IProfileAppService profileAppService) { - _profileAppService = profileAppService; + ProfileAppService = profileAppService; ObjectMapperContext = typeof(AbpAccountWebModule); } - public async Task InvokeAsync() + public virtual async Task InvokeAsync() { - var user = await _profileAppService.GetAsync(); + var user = await ProfileAppService.GetAsync(); var model = ObjectMapper.Map(user); From 5e1f6fa7f04f5bf6c59d77467636b3edb1a1b75c Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 21 Oct 2021 10:19:15 +0800 Subject: [PATCH 5/8] Add `format` to `datepicker`. --- .../src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js | 1 + .../src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js index 7cbff6cb4f..6d6e6a6dba 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js @@ -10,6 +10,7 @@ $(function (){ todayBtn: "linked", autoclose: true, language: abp.localization.currentCulture.cultureName, + format: abp.localization.currentCulture.dateTimeFormat.shortDatePattern }) .on("hide", function (e) { e.stopPropagation(); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js index 45fe329593..7239c8d755 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js @@ -10,6 +10,7 @@ $(function (){ todayBtn: "linked", autoclose: true, language: abp.localization.currentCulture.cultureName, + format: abp.localization.currentCulture.dateTimeFormat.shortDatePattern }) .on("hide", function (e) { e.stopPropagation(); From a9f74e2c73e127afd47fa0409749b73474334908 Mon Sep 17 00:00:00 2001 From: v-rr Date: Thu, 21 Oct 2021 11:17:38 +0800 Subject: [PATCH 6/8] Update package.json to include the repository Hi there! This change adds the repository property to your package.json file(s). Having this available provides a number of benefits to security tooling. For example, it allows for greater trust by checking for signed commits, contributors to a release and validating history with the project. It also allows for comparison between the source code and the published artifact in order to detect attacks on authors during the publication process. We validate that we're making a PR against the correct repository by comparing the metadata for the published artifact on [npmjs.com](www.npmjs.com) against the metadata in the package.json file in the repository. This change is provided by a team at Microsoft -- we're happy to answer any questions you may have. (Members of this team include [@s-tuli](https://github.com/s-tuli), [@iarna](https://github.com/iarna), [@rancyr](https://github.com/v-rr), [@Jaydon Peng](https://github.com/v-jiepeng), [@Zhongpeng Zhou](https://github.com/v-zhzhou) and [@Jingying Gu](https://github.com/v-gjy)). If you would prefer that we not make these sorts of PRs to projects you maintain, please just say. If you'd like to learn more about what we're doing here, we've prepared a document talking about both this project and some of our other activities around supply chain security here: [microsoft/Secure-Supply-Chain](https://github.com/microsoft/Secure-Supply-Chain) This PR provides repository metadata for the following packages: * @abp/utils * @abp/toastr * @abp/timeago * @abp/sweetalert * @abp/select2 * @abp/malihu-custom-scrollbar-plugin * @abp/luxon * @abp/lodash * @abp/jquery-validation-unobtrusive * @abp/jquery-validation * @abp/jquery-form * @abp/jquery * @abp/font-awesome * @abp/datatables.net-bs4 * @abp/datatables.net * @abp/core * @abp/bootstrap-datepicker * @abp/bootstrap * @abp/aspnetcore.mvc.ui.theme.shared * @abp/aspnetcore.mvc.ui.theme.basic * @abp/aspnetcore.mvc.ui --- npm/packs/aspnetcore.mvc.ui.theme.basic/package.json | 5 +++++ npm/packs/aspnetcore.mvc.ui.theme.shared/package.json | 5 +++++ npm/packs/aspnetcore.mvc.ui/package.json | 5 +++++ npm/packs/bootstrap-datepicker/package.json | 5 +++++ npm/packs/bootstrap/package.json | 5 +++++ npm/packs/core/package.json | 5 +++++ npm/packs/datatables.net-bs4/package.json | 5 +++++ npm/packs/datatables.net/package.json | 5 +++++ npm/packs/font-awesome/package.json | 5 +++++ npm/packs/jquery-form/package.json | 5 +++++ npm/packs/jquery-validation-unobtrusive/package.json | 5 +++++ npm/packs/jquery-validation/package.json | 5 +++++ npm/packs/jquery/package.json | 5 +++++ npm/packs/lodash/package.json | 5 +++++ npm/packs/luxon/package.json | 5 +++++ npm/packs/malihu-custom-scrollbar-plugin/package.json | 5 +++++ npm/packs/select2/package.json | 5 +++++ npm/packs/sweetalert2/package.json | 5 +++++ npm/packs/timeago/package.json | 5 +++++ npm/packs/toastr/package.json | 5 +++++ npm/packs/utils/package.json | 5 +++++ 21 files changed, 105 insertions(+) diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index 347176684c..d6f2c84429 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/aspnetcore.mvc.ui.theme.basic", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/aspnetcore.mvc.ui.theme.basic" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index 5870dfb137..04024b317a 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/aspnetcore.mvc.ui.theme.shared", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/aspnetcore.mvc.ui.theme.shared" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index 9bbd5aefaf..13f53f5b4b 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/aspnetcore.mvc.ui", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/aspnetcore.mvc.ui" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index f6b9c52680..fbf972aa56 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/bootstrap-datepicker", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/bootstrap-datepicker" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index cc55564936..b3ed699dda 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/bootstrap", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/bootstrap" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index 98619ae53f..dd8fef719a 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/core", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/core" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index b470739daf..a6af7d11d7 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/datatables.net-bs4", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/datatables.net-bs4" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index 41fc99c148..d3d7138b8a 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/datatables.net", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/datatables.net" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index efbb174c50..23df10d289 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/font-awesome", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/font-awesome" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 91c40ba030..16de8f58d4 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/jquery-form", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/jquery-form" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index 8f6e689aeb..f59b52215a 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/jquery-validation-unobtrusive", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/jquery-validation-unobtrusive" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index 4d1fa17f11..582176da69 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/jquery-validation", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/jquery-validation" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index 48427999bd..629abacde8 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/jquery", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/jquery" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index e59cdbb2c3..b145ff9bb9 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/lodash", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/lodash" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index 24a9f22ef5..8f44be95b9 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/luxon", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/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 21c2eb2873..7ea382732f 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/malihu-custom-scrollbar-plugin", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/malihu-custom-scrollbar-plugin" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index d6f927c2cd..f9d551454b 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/select2", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/select2" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json index f7f2b0f40b..306c47e277 100644 --- a/npm/packs/sweetalert2/package.json +++ b/npm/packs/sweetalert2/package.json @@ -4,6 +4,11 @@ "publishConfig": { "access": "public" }, + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory":"npm/packs/sweetalert2" + }, "dependencies": { "@abp/core": "~5.0.0-beta.1", "sweetalert2": "^11.0.18" diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index a7c44b3aac..c2cd0c1a78 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/timeago", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/timeago" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index af10fda1bd..93cade66f9 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,6 +1,11 @@ { "version": "5.0.0-beta.1", "name": "@abp/toastr", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/toastr" + }, "publishConfig": { "access": "public" }, diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json index 841988f87a..9bcb5ead37 100644 --- a/npm/packs/utils/package.json +++ b/npm/packs/utils/package.json @@ -13,6 +13,11 @@ "access": "public" }, "main": "dist/bundles/abp-utils.umd.js", + "repository": { + "type": "git", + "url": "https://github.com/abpframework/abp.git", + "directory": "npm/packs/utils" + }, "module": "dist/fesm2015/abp-utils.js", "es2015_ivy_ngcc": "__ivy_ngcc__/dist/fesm2015/abp-utils.js", "es2015": "dist/fesm2015/abp-utils.js", From 9042b567a3a560724313f68adfd2458e772ba7bf Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 21 Oct 2021 17:23:38 +0800 Subject: [PATCH 7/8] Check `$.fn.modal`. https://github.com/abpframework/abp/pull/10389 --- npm/packs/select2/src/select2-bootstrap-modal-patch.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/npm/packs/select2/src/select2-bootstrap-modal-patch.js b/npm/packs/select2/src/select2-bootstrap-modal-patch.js index 1fee6e798d..d7b5d2d9c4 100644 --- a/npm/packs/select2/src/select2-bootstrap-modal-patch.js +++ b/npm/packs/select2/src/select2-bootstrap-modal-patch.js @@ -1,4 +1,6 @@ /* https://select2.org/troubleshooting/common-problems */ -$.fn.modal.Constructor.prototype._enforceFocus = function () { }; \ No newline at end of file +if ($.fn.modal) { + $.fn.modal.Constructor.prototype._enforceFocus = function () { }; +} From 1862363fc9df57651cecbcc43628434ec63869c4 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 21 Oct 2021 17:34:34 +0800 Subject: [PATCH 8/8] Make all view components extensible --- .../Shared/Demos/AlertsDemo/AlertsDemoViewComponent.cs | 2 +- .../Shared/Demos/BadgesDemo/BadgesDemoViewComponent.cs | 2 +- .../Shared/Demos/BordersDemo/BordersDemoViewComponent.cs | 2 +- .../Demos/BreadcrumbsDemo/BreadcrumbsDemoViewComponent.cs | 2 +- .../ButtonGroupsDemo/ButtonGroupsDemoViewComponent.cs | 2 +- .../Shared/Demos/ButtonsDemo/ButtonsDemoViewComponent.cs | 2 +- .../Shared/Demos/CardsDemo/CardsDemoViewComponent.cs | 2 +- .../Demos/CarouselDemo/CarouselDemoViewComponent.cs | 2 +- .../Demos/CollapseDemo/CollapseDemoViewComponent.cs | 2 +- .../Demos/DropdownsDemo/DropdownsDemoViewComponent.cs | 2 +- .../DynamicFormsDemo/DynamicFormsDemoViewComponent.cs | 2 +- .../FormElementsDemo/FormElementsDemoViewComponent.cs | 2 +- .../Shared/Demos/GridsDemo/GridsDemoViewComponent.cs | 2 +- .../Demos/ListGroupsDemo/ListGroupsDemoViewComponent.cs | 2 +- .../Shared/Demos/ModalsDemo/ModalsDemoViewComponent.cs | 2 +- .../Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs | 2 +- .../Themes/Shared/Demos/NavsDemo/NavsDemoViewComponent.cs | 2 +- .../Demos/PopoversDemo/PopoversDemoViewComponent.cs | 2 +- .../ProgressBarsDemo/ProgressBarsDemoViewComponent.cs | 2 +- .../Shared/Demos/TablesDemo/TablesDemoViewComponent.cs | 2 +- .../Themes/Shared/Demos/TabsDemo/TabsDemoViewComponent.cs | 2 +- .../Demos/TooltipsDemo/TooltipsDemoViewComponent.cs | 2 +- .../AbpApplicationPath/AbpApplicationPathViewComponent.cs | 2 +- .../AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs | 2 +- .../AbpPageToolbar/AbpPageToolbarViewComponent.cs | 6 +++--- .../Components/Brand/MainNavbarBrandViewComponent.cs | 2 +- .../Components/MainNavbar/MainNavbarViewComponent.cs | 2 +- .../Basic/Components/Menu/MainNavbarMenuViewComponent.cs | 8 ++++---- .../Components/PageAlerts/PageAlertsViewComponent.cs | 6 +++--- .../Toolbar/LanguageSwitch/LanguageSwitchViewComponent.cs | 8 ++++---- .../Components/Toolbar/MainNavbarToolbarViewComponent.cs | 8 ++++---- .../Components/Toolbar/UserMenu/UserMenuViewComponent.cs | 8 ++++---- .../EmailSettingGroup/EmailSettingGroupViewComponent.cs | 8 ++++---- 33 files changed, 52 insertions(+), 52 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/AlertsDemo/AlertsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/AlertsDemo/AlertsDemoViewComponent.cs index 4e1bdd133f..caab46111b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/AlertsDemo/AlertsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/AlertsDemo/AlertsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/AlertsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BadgesDemo/BadgesDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BadgesDemo/BadgesDemoViewComponent.cs index 727b613926..d1fdc0bd45 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BadgesDemo/BadgesDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BadgesDemo/BadgesDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/BadgesDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BordersDemo/BordersDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BordersDemo/BordersDemoViewComponent.cs index b288653010..cc87bfaa93 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BordersDemo/BordersDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BordersDemo/BordersDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/BordersDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/BreadcrumbsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/BreadcrumbsDemoViewComponent.cs index 0853f2b195..e7c5335558 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/BreadcrumbsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/BreadcrumbsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/ButtonGroupsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/ButtonGroupsDemoViewComponent.cs index cb134673ac..dc37bd67a3 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/ButtonGroupsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/ButtonGroupsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/ButtonsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/ButtonsDemoViewComponent.cs index 5cb6cf0779..8536a0a296 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/ButtonsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/ButtonsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ButtonsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/CardsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/CardsDemoViewComponent.cs index 0dafa65c70..ab47fe30b9 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/CardsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/CardsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/CardsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CarouselDemo/CarouselDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CarouselDemo/CarouselDemoViewComponent.cs index e57b840269..590e717838 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CarouselDemo/CarouselDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CarouselDemo/CarouselDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/CarouselDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CollapseDemo/CollapseDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CollapseDemo/CollapseDemoViewComponent.cs index 44df03d3c4..678c1ad607 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CollapseDemo/CollapseDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CollapseDemo/CollapseDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/CollapseDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/DropdownsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/DropdownsDemoViewComponent.cs index 1eb9be8cf5..4ff21a4a33 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/DropdownsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/DropdownsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/DropdownsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { var Model = new DropDownDemoDemoModel(); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs index e768536a9f..5975e2ac36 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { var model = new DynamicFormsDemoModel(); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs index 22bcde1e52..9b7cc1c1fa 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/FormElementsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { var model = new FormElementsDemoModel(); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/GridsDemo/GridsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/GridsDemo/GridsDemoViewComponent.cs index e5e031afc0..2962a1c00d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/GridsDemo/GridsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/GridsDemo/GridsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/GridsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/ListGroupsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/ListGroupsDemoViewComponent.cs index 3c48462650..d52cb73bb0 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/ListGroupsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/ListGroupsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ListGroupsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ModalsDemo/ModalsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ModalsDemo/ModalsDemoViewComponent.cs index e4c2ce2c5e..4cd7e1f362 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ModalsDemo/ModalsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ModalsDemo/ModalsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ModalsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs index 470857a845..bd7525ca0e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/NavbarsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/NavsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/NavsDemoViewComponent.cs index 7149894f46..42224598b0 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/NavsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/NavsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/NavsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/PopoversDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/PopoversDemoViewComponent.cs index 408676f63d..c9a3ee5fc5 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/PopoversDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/PopoversDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/PopoversDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/ProgressBarsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/ProgressBarsDemoViewComponent.cs index 33f1e09e15..e278aec9e4 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/ProgressBarsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/ProgressBarsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/TablesDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/TablesDemoViewComponent.cs index 181a58f07f..2d0e092ac6 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/TablesDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/TablesDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/TablesDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TabsDemo/TabsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TabsDemo/TabsDemoViewComponent.cs index e001b5157d..adbed4dfe5 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TabsDemo/TabsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TabsDemo/TabsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/TabsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TooltipsDemo/TooltipsDemoViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TooltipsDemo/TooltipsDemoViewComponent.cs index 7d30f09a79..75d989f9de 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TooltipsDemo/TooltipsDemoViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TooltipsDemo/TooltipsDemoViewComponent.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S { public const string ViewPath = "/Views/Components/Themes/Shared/Demos/TooltipsDemo/Default.cshtml"; - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View(ViewPath); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpApplicationPath/AbpApplicationPathViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpApplicationPath/AbpApplicationPathViewComponent.cs index 32a89cdcb8..464c99efdd 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpApplicationPath/AbpApplicationPathViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpApplicationPath/AbpApplicationPathViewComponent.cs @@ -5,7 +5,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpApp { public class AbpApplicationPathViewComponent : AbpViewComponent { - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { var applicationPath = ViewContext.HttpContext.Request.PathBase.Value; var model = new AbpApplicationPathViewComponentModel diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs index a21a3c51cd..72b92cd6cc 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs @@ -4,7 +4,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPag { public class AbpPageSearchBoxViewComponent : AbpViewComponent { - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml"); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/AbpPageToolbarViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/AbpPageToolbarViewComponent.cs index b07bc69abb..3e35145434 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/AbpPageToolbarViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/AbpPageToolbarViewComponent.cs @@ -6,16 +6,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPag { public class AbpPageToolbarViewComponent : AbpViewComponent { - private readonly IPageToolbarManager _toolbarManager; + protected IPageToolbarManager ToolbarManager { get; } public AbpPageToolbarViewComponent(IPageToolbarManager toolbarManager) { - _toolbarManager = toolbarManager; + ToolbarManager = toolbarManager; } public async Task InvokeAsync(string pageName) { - var items = await _toolbarManager.GetItemsAsync(pageName); + var items = await ToolbarManager.GetItemsAsync(pageName); return View("~/Pages/Shared/Components/AbpPageToolbar/Default.cshtml", items); } } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/MainNavbarBrandViewComponent.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/MainNavbarBrandViewComponent.cs index 9698048412..564b4b70c2 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/MainNavbarBrandViewComponent.cs +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/MainNavbarBrandViewComponent.cs @@ -4,7 +4,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Brand { public class MainNavbarBrandViewComponent : AbpViewComponent { - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View("~/Themes/Basic/Components/Brand/Default.cshtml"); } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/MainNavbar/MainNavbarViewComponent.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/MainNavbar/MainNavbarViewComponent.cs index 96573c9c3b..64f097d24d 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/MainNavbar/MainNavbarViewComponent.cs +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/MainNavbar/MainNavbarViewComponent.cs @@ -4,7 +4,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.MainNav { public class MainNavbarViewComponent : AbpViewComponent { - public IViewComponentResult Invoke() + public virtual IViewComponentResult Invoke() { return View("~/Themes/Basic/Components/MainNavbar/Default.cshtml"); } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/MainNavbarMenuViewComponent.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/MainNavbarMenuViewComponent.cs index 72534ecd42..358d812c5c 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/MainNavbarMenuViewComponent.cs +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/MainNavbarMenuViewComponent.cs @@ -6,16 +6,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu { public class MainNavbarMenuViewComponent : AbpViewComponent { - private readonly IMenuManager _menuManager; + protected IMenuManager MenuManager { get; } public MainNavbarMenuViewComponent(IMenuManager menuManager) { - _menuManager = menuManager; + MenuManager = menuManager; } - public async Task InvokeAsync() + public async virtual Task InvokeAsync() { - var menu = await _menuManager.GetMainMenuAsync(); + var menu = await MenuManager.GetMainMenuAsync(); return View("~/Themes/Basic/Components/Menu/Default.cshtml", menu); } } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/PageAlerts/PageAlertsViewComponent.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/PageAlerts/PageAlertsViewComponent.cs index c805f20e69..9c99930caf 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/PageAlerts/PageAlertsViewComponent.cs +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/PageAlerts/PageAlertsViewComponent.cs @@ -5,16 +5,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAle { public class PageAlertsViewComponent : AbpViewComponent { - private readonly IAlertManager _alertManager; + protected IAlertManager AlertManager { get; } public PageAlertsViewComponent(IAlertManager alertManager) { - _alertManager = alertManager; + AlertManager = alertManager; } public IViewComponentResult Invoke(string name) { - return View("~/Themes/Basic/Components/PageAlerts/Default.cshtml", _alertManager.Alerts); + return View("~/Themes/Basic/Components/PageAlerts/Default.cshtml", AlertManager.Alerts); } } } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/LanguageSwitchViewComponent.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/LanguageSwitchViewComponent.cs index 3dd1ba2b9d..fde02e5ec3 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/LanguageSwitchViewComponent.cs +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/LanguageSwitchViewComponent.cs @@ -10,16 +10,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar { public class LanguageSwitchViewComponent : AbpViewComponent { - private readonly ILanguageProvider _languageProvider; + protected ILanguageProvider LanguageProvider { get; } public LanguageSwitchViewComponent(ILanguageProvider languageProvider) { - _languageProvider = languageProvider; + LanguageProvider = languageProvider; } - public async Task InvokeAsync() + public async virtual Task InvokeAsync() { - var languages = await _languageProvider.GetLanguagesAsync(); + var languages = await LanguageProvider.GetLanguagesAsync(); var currentLanguage = languages.FindByCulture( CultureInfo.CurrentCulture.Name, CultureInfo.CurrentUICulture.Name diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/MainNavbarToolbarViewComponent.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/MainNavbarToolbarViewComponent.cs index bfd02bbf4a..e2ab6ed55a 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/MainNavbarToolbarViewComponent.cs +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/MainNavbarToolbarViewComponent.cs @@ -6,16 +6,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar { public class MainNavbarToolbarViewComponent : AbpViewComponent { - private readonly IToolbarManager _toolbarManager; + protected IToolbarManager ToolbarManager { get; } public MainNavbarToolbarViewComponent(IToolbarManager toolbarManager) { - _toolbarManager = toolbarManager; + ToolbarManager = toolbarManager; } - public async Task InvokeAsync() + public async virtual Task InvokeAsync() { - var toolbar = await _toolbarManager.GetAsync(StandardToolbars.Main); + var toolbar = await ToolbarManager.GetAsync(StandardToolbars.Main); return View("~/Themes/Basic/Components/Toolbar/Default.cshtml", toolbar); } } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/UserMenuViewComponent.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/UserMenuViewComponent.cs index cde4208578..cab0ebb37c 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/UserMenuViewComponent.cs +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/UserMenuViewComponent.cs @@ -6,16 +6,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar { public class UserMenuViewComponent : AbpViewComponent { - private readonly IMenuManager _menuManager; + protected IMenuManager MenuManager { get; } public UserMenuViewComponent(IMenuManager menuManager) { - _menuManager = menuManager; + MenuManager = menuManager; } - public async Task InvokeAsync() + public async virtual Task InvokeAsync() { - var menu = await _menuManager.GetAsync(StandardMenus.User); + var menu = await MenuManager.GetAsync(StandardMenus.User); return View("~/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml", menu); } } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/EmailSettingGroupViewComponent.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/EmailSettingGroupViewComponent.cs index 1936b2a7e3..098e093901 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/EmailSettingGroupViewComponent.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/EmailSettingGroupViewComponent.cs @@ -6,17 +6,17 @@ namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement.Components.Emai { public class EmailSettingGroupViewComponent : AbpViewComponent { - private readonly IEmailSettingsAppService _emailSettingsAppService; + protected IEmailSettingsAppService EmailSettingsAppService { get; } public EmailSettingGroupViewComponent(IEmailSettingsAppService emailSettingsAppService) { ObjectMapperContext = typeof(AbpSettingManagementWebModule); - _emailSettingsAppService = emailSettingsAppService; + EmailSettingsAppService = emailSettingsAppService; } - public async Task InvokeAsync() + public async virtual Task InvokeAsync() { - var model = await _emailSettingsAppService.GetAsync(); + var model = await EmailSettingsAppService.GetAsync(); return View("~/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml", model); }