Browse Source
Merge pull request #10398 from abpframework/liangshiwei/patch
Change virtual keyword order
pull/10405/head
maliming
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with
7 additions and
7 deletions
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/AbpPageToolbarViewComponent.cs
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/MainNavbarMenuViewComponent.cs
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/LanguageSwitchViewComponent.cs
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/MainNavbarToolbarViewComponent.cs
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/UserMenuViewComponent.cs
-
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/Components/TagEditor/TagEditorViewComponent.cs
-
modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/EmailSettingGroupViewComponent.cs
|
|
|
@ -13,7 +13,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPag |
|
|
|
ToolbarManager = toolbarManager; |
|
|
|
} |
|
|
|
|
|
|
|
public async Task<IViewComponentResult> InvokeAsync(string pageName) |
|
|
|
public virtual async Task<IViewComponentResult> InvokeAsync(string pageName) |
|
|
|
{ |
|
|
|
var items = await ToolbarManager.GetItemsAsync(pageName); |
|
|
|
return View("~/Pages/Shared/Components/AbpPageToolbar/Default.cshtml", items); |
|
|
|
|
|
|
|
@ -13,7 +13,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu |
|
|
|
MenuManager = menuManager; |
|
|
|
} |
|
|
|
|
|
|
|
public async virtual Task<IViewComponentResult> InvokeAsync() |
|
|
|
public virtual async Task<IViewComponentResult> InvokeAsync() |
|
|
|
{ |
|
|
|
var menu = await MenuManager.GetMainMenuAsync(); |
|
|
|
return View("~/Themes/Basic/Components/Menu/Default.cshtml", menu); |
|
|
|
|
|
|
|
@ -17,7 +17,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar |
|
|
|
LanguageProvider = languageProvider; |
|
|
|
} |
|
|
|
|
|
|
|
public async virtual Task<IViewComponentResult> InvokeAsync() |
|
|
|
public virtual async Task<IViewComponentResult> InvokeAsync() |
|
|
|
{ |
|
|
|
var languages = await LanguageProvider.GetLanguagesAsync(); |
|
|
|
var currentLanguage = languages.FindByCulture( |
|
|
|
|
|
|
|
@ -13,7 +13,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar |
|
|
|
ToolbarManager = toolbarManager; |
|
|
|
} |
|
|
|
|
|
|
|
public async virtual Task<IViewComponentResult> InvokeAsync() |
|
|
|
public virtual async Task<IViewComponentResult> InvokeAsync() |
|
|
|
{ |
|
|
|
var toolbar = await ToolbarManager.GetAsync(StandardToolbars.Main); |
|
|
|
return View("~/Themes/Basic/Components/Toolbar/Default.cshtml", toolbar); |
|
|
|
|
|
|
|
@ -13,7 +13,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar |
|
|
|
MenuManager = menuManager; |
|
|
|
} |
|
|
|
|
|
|
|
public async virtual Task<IViewComponentResult> InvokeAsync() |
|
|
|
public virtual async Task<IViewComponentResult> InvokeAsync() |
|
|
|
{ |
|
|
|
var menu = await MenuManager.GetAsync(StandardMenus.User); |
|
|
|
return View("~/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml", menu); |
|
|
|
|
|
|
|
@ -22,7 +22,7 @@ namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Tags.Components.TagEditor |
|
|
|
TagAppService = tagAppService; |
|
|
|
} |
|
|
|
|
|
|
|
public async Task<IViewComponentResult> InvokeAsync(string entityType, string entityId, bool displaySubmitButton = true) |
|
|
|
public virtual async Task<IViewComponentResult> InvokeAsync(string entityType, string entityId, bool displaySubmitButton = true) |
|
|
|
{ |
|
|
|
var tags = |
|
|
|
entityId.IsNullOrWhiteSpace() ? |
|
|
|
|
|
|
|
@ -14,7 +14,7 @@ namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement.Components.Emai |
|
|
|
EmailSettingsAppService = emailSettingsAppService; |
|
|
|
} |
|
|
|
|
|
|
|
public async virtual Task<IViewComponentResult> InvokeAsync() |
|
|
|
public virtual async Task<IViewComponentResult> InvokeAsync() |
|
|
|
{ |
|
|
|
var model = await EmailSettingsAppService.GetAsync(); |
|
|
|
|
|
|
|
|