Browse Source

Merge pull request #6774 from abpframework/liangshiwei/blazor-theme

Blazor theme menu supports target
pull/6778/head
Ahmet Çotur 6 years ago
committed by GitHub
parent
commit
f742b75670
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
  2. 16
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
  3. 2
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor

2
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor

@ -10,7 +10,7 @@
if (MenuItem.Url != null) if (MenuItem.Url != null)
{ {
<li class="nav-item @cssClass @disabled" id="@elementId"> <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 != null)
{ {
if (MenuItem.Icon.StartsWith("fa")) if (MenuItem.Icon.StartsWith("fa"))

16
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor

@ -3,6 +3,7 @@
@using Volo.Abp.MultiTenancy @using Volo.Abp.MultiTenancy
@inject ICurrentUser CurrentUser @inject ICurrentUser CurrentUser
@inject ICurrentTenant CurrentTenant @inject ICurrentTenant CurrentTenant
@inject IJSRuntime JsRuntime
@inject NavigationManager Navigation @inject NavigationManager Navigation
@inject SignOutSessionStateManager SignOutManager @inject SignOutSessionStateManager SignOutManager
<AuthorizeView> <AuthorizeView>
@ -23,7 +24,7 @@
{ {
@foreach (var menuItem in Menu.Items) @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 /> <DropdownDivider />
@ -37,14 +38,21 @@
</AuthorizeView> </AuthorizeView>
@code{ @code{
private void NavigateTo(string uri) private async Task NavigateToAsync(string uri, string target = null)
{ {
Navigation.NavigateTo(uri); if (target == "_blank")
{
await JsRuntime.InvokeVoidAsync("open", uri, target);
}
else
{
Navigation.NavigateTo(uri);
}
} }
private async Task BeginSignOut() private async Task BeginSignOut()
{ {
await SignOutManager.SetSignOutState(); await SignOutManager.SetSignOutState();
NavigateTo("authentication/logout"); await NavigateToAsync("authentication/logout");
} }
} }

2
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor

@ -9,7 +9,7 @@
{ {
if (MenuItem.Url != null) 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 != null)
{ {
if (MenuItem.Icon.StartsWith("fa")) if (MenuItem.Icon.StartsWith("fa"))

Loading…
Cancel
Save