Browse Source
Merge pull request #26366 from abpframework/auto-merge-forward/rel-10.7-to-rel-11.0-118
Auto-merge forward rel-10.7 → rel-11.0
pull/26369/head
Volosoft Agent
2 weeks ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with
18 additions and
4 deletions
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LanguageSwitch.razor
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor.cs
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs
|
|
|
@ -11,7 +11,7 @@ |
|
|
|
<DropdownToggle Color="Color.Default"> |
|
|
|
@_currentLanguage.DisplayName |
|
|
|
</DropdownToggle> |
|
|
|
<DropdownMenu> |
|
|
|
<DropdownMenu Style="@MenuStyle"> |
|
|
|
@foreach (var language in _otherLanguages) |
|
|
|
{ |
|
|
|
<DropdownItem Clicked="() => ChangeLanguage(language)">@language.DisplayName</DropdownItem> |
|
|
|
@ -23,6 +23,9 @@ |
|
|
|
private IReadOnlyList<LanguageInfo> _otherLanguages; |
|
|
|
private LanguageInfo _currentLanguage; |
|
|
|
|
|
|
|
// Blazorise's dropdown-menu-end sets right: 0, which wins over the computed left offset in an RTL layout |
|
|
|
private static string MenuStyle => CultureHelper.IsRtl ? "right: auto" : null; |
|
|
|
|
|
|
|
protected override async Task OnInitializedAsync() |
|
|
|
{ |
|
|
|
var languages = await LanguageProvider.GetLanguagesAsync(); |
|
|
|
|
|
|
|
@ -23,7 +23,7 @@ |
|
|
|
<span>@CurrentUser.UserName</span> |
|
|
|
} |
|
|
|
</DropdownToggle> |
|
|
|
<DropdownMenu> |
|
|
|
<DropdownMenu Style="@MenuStyle"> |
|
|
|
@if (Menu != null) |
|
|
|
{ |
|
|
|
@foreach (var menuItem in Menu.Items) |
|
|
|
|
|
|
|
@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Components; |
|
|
|
using Microsoft.AspNetCore.Components.Routing; |
|
|
|
using Microsoft.AspNetCore.Http; |
|
|
|
using Microsoft.AspNetCore.RequestLocalization; |
|
|
|
using Volo.Abp.Localization; |
|
|
|
using Volo.Abp.UI.Navigation; |
|
|
|
|
|
|
|
namespace Volo.Abp.AspNetCore.Components.Server.BasicTheme.Themes.Basic; |
|
|
|
@ -18,6 +19,9 @@ public partial class LoginDisplay : IDisposable |
|
|
|
|
|
|
|
protected ApplicationMenu Menu { get; set; } |
|
|
|
|
|
|
|
// Blazorise's dropdown-menu-end sets right: 0, which wins over the computed left offset in an RTL layout
|
|
|
|
protected static string MenuStyle => CultureHelper.IsRtl ? "right: auto" : null; |
|
|
|
|
|
|
|
protected override async Task OnInitializedAsync() |
|
|
|
{ |
|
|
|
Menu = await MenuManager.GetAsync(StandardMenus.User); |
|
|
|
|
|
|
|
@ -16,7 +16,7 @@ |
|
|
|
<DropdownToggle Color="Color.Default"> |
|
|
|
@_currentLanguage.DisplayName |
|
|
|
</DropdownToggle> |
|
|
|
<DropdownMenu> |
|
|
|
<DropdownMenu Style="@MenuStyle"> |
|
|
|
@foreach (var language in _otherLanguages) |
|
|
|
{ |
|
|
|
<DropdownItem Clicked="() => ChangeLanguageAsync(language)">@language.DisplayName</DropdownItem> |
|
|
|
@ -29,6 +29,9 @@ |
|
|
|
private LanguageInfo _currentLanguage; |
|
|
|
private bool _useRouteBasedCulture; |
|
|
|
|
|
|
|
// Blazorise's dropdown-menu-end sets right: 0, which wins over the computed left offset in an RTL layout |
|
|
|
private static string MenuStyle => CultureHelper.IsRtl ? "right: auto" : null; |
|
|
|
|
|
|
|
protected override async Task OnInitializedAsync() |
|
|
|
{ |
|
|
|
var config = await ConfigurationClient.GetAsync(); |
|
|
|
|
|
|
|
@ -22,7 +22,7 @@ |
|
|
|
<span>@CurrentUser.UserName</span> |
|
|
|
} |
|
|
|
</DropdownToggle> |
|
|
|
<DropdownMenu> |
|
|
|
<DropdownMenu Style="@MenuStyle"> |
|
|
|
@if (Menu != null) |
|
|
|
{ |
|
|
|
@foreach (var menuItem in Menu.Items) |
|
|
|
|
|
|
|
@ -7,6 +7,7 @@ using Microsoft.JSInterop; |
|
|
|
using Volo.Abp.AspNetCore.Components.Web; |
|
|
|
using Volo.Abp.AspNetCore.Components.Web.Security; |
|
|
|
using Volo.Abp.AspNetCore.Components.WebAssembly; |
|
|
|
using Volo.Abp.Localization; |
|
|
|
using Volo.Abp.UI.Navigation; |
|
|
|
|
|
|
|
namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic; |
|
|
|
@ -24,6 +25,9 @@ public partial class LoginDisplay : IDisposable |
|
|
|
|
|
|
|
protected ApplicationMenu Menu { get; set; } |
|
|
|
|
|
|
|
// Blazorise's dropdown-menu-end sets right: 0, which wins over the computed left offset in an RTL layout
|
|
|
|
protected static string MenuStyle => CultureHelper.IsRtl ? "right: auto" : null; |
|
|
|
|
|
|
|
protected string LoginUrl { get; set; } = string.Empty; |
|
|
|
|
|
|
|
protected string LogoutUrl { get; set; } = string.Empty; |
|
|
|
|