diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
index cf6703ade9..b2fab0807d 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
@@ -10,7 +10,7 @@
if (MenuItem.Url != null)
{
-
+
@if (MenuItem.Icon != null)
{
if (MenuItem.Icon.StartsWith("fa"))
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
index 58d4d5753e..32f90142eb 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
@@ -3,6 +3,7 @@
@using Volo.Abp.MultiTenancy
@inject ICurrentUser CurrentUser
@inject ICurrentTenant CurrentTenant
+@inject IJSRuntime JsRuntime
@inject NavigationManager Navigation
@inject SignOutSessionStateManager SignOutManager
@@ -23,7 +24,7 @@
{
@foreach (var menuItem in Menu.Items)
{
- @menuItem.DisplayName
+ @menuItem.DisplayName
}
}
@@ -37,14 +38,14 @@
@code{
- private void NavigateTo(string uri)
+ private async Task NavigateToAsync(string uri, string target = "_self")
{
- Navigation.NavigateTo(uri);
+ await JsRuntime.InvokeVoidAsync("open", uri, target);
}
private async Task BeginSignOut()
{
await SignOutManager.SetSignOutState();
- NavigateTo("authentication/logout");
+ await NavigateToAsync("authentication/logout");
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
index 1bcafa97bd..f9e47c4c27 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
@@ -9,7 +9,7 @@
{
if (MenuItem.Url != null)
{
-
+
@if (MenuItem.Icon != null)
{
if (MenuItem.Icon.StartsWith("fa"))