From f73ad99789f947a433ac8f04009cc8e8bbc099b5 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 16 Dec 2020 17:20:15 +0800 Subject: [PATCH 1/2] Set to # only for null URL --- .../Themes/Basic/FirstLevelNavMenuItem.razor | 2 +- .../Themes/Basic/SecondLevelNavMenuItem.razor | 2 +- 2 files changed, 2 insertions(+), 2 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 31090ac092..cf6703ade9 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 @@ -3,7 +3,7 @@ var elementId = MenuItem.ElementId ?? "MenuItem_" + MenuItem.Name.Replace(".", "_"); var cssClass = string.IsNullOrEmpty(MenuItem.CssClass) ? string.Empty : MenuItem.CssClass; var disabled = MenuItem.IsDisabled ? "disabled" : string.Empty; - var url = string.IsNullOrEmpty(MenuItem.Url) ? "#" : MenuItem.Url; + var url = MenuItem.Url == null ? "#" : MenuItem.Url.TrimStart('/'); } @if (MenuItem.IsLeaf) { 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 4e75e26b50..1bcafa97bd 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 @@ -3,7 +3,7 @@ var elementId = MenuItem.ElementId ?? "MenuItem_" + MenuItem.Name.Replace(".", "_"); var cssClass = string.IsNullOrEmpty(MenuItem.CssClass) ? string.Empty : MenuItem.CssClass; var disabled = MenuItem.IsDisabled ? "disabled" : string.Empty; - var url = string.IsNullOrEmpty(MenuItem.Url) ? "#" : MenuItem.Url; + var url = MenuItem.Url == null ? "#" : MenuItem.Url.TrimStart('/'); } @if (MenuItem.IsLeaf) { From 0cd5d78e5374569940c12b5f80a9c9b7483587c7 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 16 Dec 2020 22:55:37 +0800 Subject: [PATCH 2/2] Update MyProjectNameaMenuContributor.cs --- .../Menus/MyProjectNameMenuContributor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs index 7f8964d6cd..8b5aebacce 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs @@ -39,7 +39,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Menus new ApplicationMenuItem( MyProjectNameMenus.Home, l["Menu:Home"], - "", + "/", icon: "fas fa-home" ) );