Browse Source
Merge pull request #11622 from abpframework/liangshiwei/theme
Fix Blazor-server depoly to sub app problem
pull/11624/head
maliming
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
-
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml
|
|
|
@ -5,7 +5,7 @@ |
|
|
|
var elementId = string.IsNullOrEmpty(menuItem.ElementId) ? string.Empty : $"id=\"{menuItem.ElementId}\""; |
|
|
|
var cssClass = string.IsNullOrEmpty(menuItem.CssClass) ? string.Empty : menuItem.CssClass; |
|
|
|
var disabled = menuItem.IsDisabled ? "disabled" : string.Empty; |
|
|
|
var url = string.IsNullOrEmpty(menuItem.Url) ? "#" : Url.Content(menuItem.Url); |
|
|
|
var url = string.IsNullOrEmpty(menuItem.Url) ? "#" : Url.IsLocalUrl(menuItem.Url) ? Url.Content(menuItem.Url.EnsureStartsWith('~')) : menuItem.Url; |
|
|
|
if (menuItem.IsLeaf) |
|
|
|
{ |
|
|
|
if (menuItem.Url != null) |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
var elementId = string.IsNullOrEmpty(Model.ElementId) ? string.Empty : $"id=\"{Model.ElementId}\""; |
|
|
|
var cssClass = string.IsNullOrEmpty(Model.CssClass) ? string.Empty : Model.CssClass; |
|
|
|
var disabled = Model.IsDisabled ? "disabled" : string.Empty; |
|
|
|
var url = string.IsNullOrEmpty(Model.Url) ? "#" : Url.Content(Model.Url); |
|
|
|
var url = string.IsNullOrEmpty(Model.Url) ? "#" : Url.IsLocalUrl(Model.Url) ? Url.Content(Model.Url.EnsureStartsWith('~')) : Model.Url; |
|
|
|
} |
|
|
|
@if (Model.IsLeaf) |
|
|
|
{ |
|
|
|
|
