Merge pull request #4188 from abpframework/liangshiwei/patch-1

Update predefined application menu

framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs

@@ -102,7 +102,7 @@ namespace Volo.Abp.UI.Navigation
 
             Name = name;
             DisplayName = displayName;
-            Url = url?.EnsureStartsWith('~');
+            Url = url;
             Icon = icon;
             Order = order;
             CustomData = customData;

modules/account/src/Volo.Abp.Account.Web/AbpAccountUserMenuContributor.cs

@@ -19,8 +19,8 @@ namespace Volo.Abp.Account.Web
             var uiResource = context.GetLocalizer<AbpUiResource>();
             var accountResource = context.GetLocalizer<AccountResource>();
 
-            context.Menu.AddItem(new ApplicationMenuItem("Account.Manage", accountResource["ManageYourProfile"], url: "/Account/Manage", icon: "fa fa-cog", order: 1000, null));
+            context.Menu.AddItem(new ApplicationMenuItem("Account.Manage", accountResource["ManageYourProfile"], url: "~/Account/Manage", icon: "fa fa-cog", order: 1000, null));
-            context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", uiResource["Logout"], url: "/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000));
+            context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", uiResource["Logout"], url: "~/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000));
 
             return Task.CompletedTask;
         }

modules/blogging/src/Volo.Blogging.Web/BloggingMenuContributor.cs

@@ -28,7 +28,7 @@ namespace Volo.Blogging
                 //TODO: Using the same permission. Reconsider.
                 if (await context.IsGrantedAsync(BloggingPermissions.Blogs.Management))
                 {
-                    managementRootMenuItem.AddItem(new ApplicationMenuItem("BlogManagement.Blogs", l["Menu:Blogs"], "/Admin/Blogs"));
+                    managementRootMenuItem.AddItem(new ApplicationMenuItem("BlogManagement.Blogs", l["Menu:Blogs"], "~/Admin/Blogs"));
                 }
 
                 context.Menu.AddItem(managementRootMenuItem);

modules/docs/src/Volo.Docs.Admin.Web/Navigation/DocsMenuContributor.cs

@@ -29,7 +29,7 @@ namespace Volo.Docs.Admin.Navigation
 
             if (await context.IsGrantedAsync(DocsAdminPermissions.Projects.Default))
             {
-                rootMenuItem.AddItem(new ApplicationMenuItem(DocsMenuNames.Projects, l["Menu:ProjectManagement"], "/Docs/Admin/Projects"));
+                rootMenuItem.AddItem(new ApplicationMenuItem(DocsMenuNames.Projects, l["Menu:ProjectManagement"], "~/Docs/Admin/Projects"));
             }
 
         }

modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs

@@ -30,12 +30,12 @@ namespace Volo.Abp.Identity.Web.Navigation
 
                 if (hasRolePermission)
                 {
-                    identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Roles, l["Roles"], url: "/Identity/Roles"));
+                    identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Roles, l["Roles"], url: "~/Identity/Roles"));
                 }
 
                 if (hasUserPermission)
                 {
-                    identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Users, l["Users"], url: "/Identity/Users"));
+                    identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Users, l["Users"], url: "~/Identity/Users"));
                 }
             }
         }

modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs

@@ -37,7 +37,7 @@ namespace Volo.Abp.SettingManagement.Web.Navigation
                     new ApplicationMenuItem(
                         SettingManagementMenuNames.GroupName,
                         l["Settings"],
-                        "/SettingManagement",
+                        "~/SettingManagement",
                         icon: "fa fa-cog"
                     )
                 );

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/AbpTenantManagementWebMainMenuContributor.cs

@@ -25,7 +25,7 @@ namespace Volo.Abp.TenantManagement.Web.Navigation
 
             if (await context.IsGrantedAsync(TenantManagementPermissions.Tenants.Default))
             {
-                tenantManagementMenuItem.AddItem(new ApplicationMenuItem(TenantManagementMenuNames.Tenants, l["Tenants"], url: "/TenantManagement/Tenants"));
+                tenantManagementMenuItem.AddItem(new ApplicationMenuItem(TenantManagementMenuNames.Tenants, l["Tenants"], url: "~/TenantManagement/Tenants"));
             }
         }
     }

modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Navigation/AbpVirtualFileExplorerMenuContributor.cs

@@ -17,7 +17,7 @@ namespace Volo.Abp.VirtualFileExplorer.Web.Navigation
 
             var l = context.GetLocalizer<VirtualFileExplorerResource>();
 
-            context.Menu.Items.Add(new ApplicationMenuItem(VirtualFileExplorerMenuNames.Index, l["Menu:VirtualFileExplorer"], icon: "fa fa-file", url: "/VirtualFileExplorer"));
+            context.Menu.Items.Add(new ApplicationMenuItem(VirtualFileExplorerMenuNames.Index, l["Menu:VirtualFileExplorer"], icon: "fa fa-file", url: "~/VirtualFileExplorer"));
 
             return Task.CompletedTask;
         }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs

@@ -43,7 +43,7 @@ namespace MyCompanyName.MyProjectName.Web.Menus
 
             var l = context.GetLocalizer<MyProjectNameResource>();
 
-            context.Menu.Items.Insert(0, new ApplicationMenuItem("MyProjectName.Home", l["Menu:Home"], "/"));
+            context.Menu.Items.Insert(0, new ApplicationMenuItem("MyProjectName.Home", l["Menu:Home"], "~/"));
 
             return Task.CompletedTask;
         }
@@ -59,7 +59,7 @@ namespace MyCompanyName.MyProjectName.Web.Menus
             if (currentUser.IsAuthenticated)
             {
                 context.Menu.AddItem(new ApplicationMenuItem("Account.Manage", accountStringLocalizer["ManageYourProfile"], $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage", icon: "fa fa-cog", order: 1000, null, "_blank"));
-                context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000));
+                context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "~/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000));
             }
 
             return Task.CompletedTask;

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs

@@ -28,7 +28,7 @@ namespace MyCompanyName.MyProjectName.Web.Menus
 
             var l = context.GetLocalizer<MyProjectNameResource>();
 
-            context.Menu.Items.Insert(0, new ApplicationMenuItem("MyProjectName.Home", l["Menu:Home"], "/"));
+            context.Menu.Items.Insert(0, new ApplicationMenuItem("MyProjectName.Home", l["Menu:Home"], "~/"));
         }
     }
 }

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostMenuContributor.cs

@@ -50,7 +50,7 @@ namespace MyCompanyName.MyProjectName
                 context.Menu.Items.Add(new ApplicationMenuItem(
                     "Account.Logout",
                     l["Logout"],
-                    "/Account/Logout",
+                    "~/Account/Logout",
                     "fas fa-power-off",
                     order: int.MaxValue - 1000
                 ));