From 672681502968ba7003c909c96f174a6627c8d1e4 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Wed, 23 Dec 2020 15:21:57 +0800
Subject: [PATCH] Blazor theme menu supports target

---
 .../Themes/Basic/FirstLevelNavMenuItem.razor             | 2 +-
 .../Themes/Basic/LoginDisplay.razor                      | 9 +++++----
 .../Themes/Basic/SecondLevelNavMenuItem.razor            | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

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)
     {
         <li class="nav-item @cssClass @disabled" id="@elementId">
-            <a class="nav-link" href="@url">
+            <a class="nav-link" href="@url" target="@MenuItem.Target">
                 @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
 <AuthorizeView>
@@ -23,7 +24,7 @@
                 {
                     @foreach (var menuItem in Menu.Items)
                     {
-                        <DropdownItem Clicked="@(() => NavigateTo(menuItem.Url))">@menuItem.DisplayName</DropdownItem>
+                        <DropdownItem Clicked="@(() => NavigateToAsync(menuItem.Url, menuItem.Target))">@menuItem.DisplayName</DropdownItem>
                     }
                 }
                 <DropdownDivider />
@@ -37,14 +38,14 @@
 </AuthorizeView>
 @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)
     {
-        <a class="dropdown-item @cssClass @disabled" href="@url" id="@elementId">
+        <a class="dropdown-item @cssClass @disabled" href="@url" target="@MenuItem.Target" id="@elementId">
             @if (MenuItem.Icon != null)
             {
                 if (MenuItem.Icon.StartsWith("fa"))