feat: support path base (#117)

ElderJames · web-flow · commit 42a2737d9276 · 2025-01-26T14:08:21.000+08:00
diff --git a/src/layout/example/AntDesign.ProLayout.Wasm/Shared/ProLayout.razor b/src/layout/example/AntDesign.ProLayout.Wasm/Shared/ProLayout.razor
@@ -1,10 +1,11 @@
 ﻿@inherits LayoutComponentBase
 
 <BasicLayout
-    Logo="@("https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg")"
+    Logo="@("logo.png")"
     MenuData="MenuData"
     Theme="MenuTheme.Light"
     MenuAccordion
+    BaseURL=""
     @bind-OpenKeys="openKeys"
     @bind-Collapsed="collapsed"
     @bind-SelectedKeys=selectedKeys>
diff --git a/src/layout/example/AntDesign.ProLayout.Wasm/wwwroot/data/menu.json b/src/layout/example/AntDesign.ProLayout.Wasm/wwwroot/data/menu.json
@@ -1,50 +1,50 @@
 [
     {
-        "path": "/",
+        "path": "",
         "name": "welcome",
         "key": "welcome",
         "icon": "smile"
     },
     {
-        "path": "/admin",
+        "path": "admin",
         "name": "admin",
         "key": "admin",
         "icon": "crown",
         "children": [
             {
-                "path": "/admin/sub-page",
+                "path": "admin/sub-page",
                 "name": "sub-page",
                 "key": "admin.sub-page",
                 "icon": "crown"
             },
             {
-                "path": "/admin/sub-page2",
+                "path": "admin/sub-page2",
                 "name": "sub-page2",
                 "key": "admin.sub-page2",
                 "icon": "crown"
             },
             {
-                "path": "/admin/sub-page3",
+                "path": "admin/sub-page3",
                 "name": "sub-page3",
                 "key": "admin.sub-page3",
                 "icon": "crown"
             }
         ]
     },
     {
-        "path": "/list",
+        "path": "list",
         "name": "list.table-list",
         "key": "list.table-list",
         "icon": "table",
         "children": [
             {
-                "path": "/list/sub-page",
+                "path": "list/sub-page",
                 "name": "sub-page",
                 "key": "list.sub-page",
                 "icon": "crown"
             },
             {
-                "path": "/list/sub-page2",
+                "path": "list/sub-page2",
                 "name": "sub-page2",
                 "key": "list.sub-page2",
                 "icon": "crown"
diff --git a/src/layout/example/AntDesign.ProLayout.Wasm/wwwroot/logo.png b/src/layout/example/AntDesign.ProLayout.Wasm/wwwroot/logo.png
diff --git a/src/layout/src/BasicLayout.razor b/src/layout/src/BasicLayout.razor
@@ -38,7 +38,7 @@
             @if (HeaderRender && Pure)
             {
                 <CascadingValue Value="RightContentRender" Name="RightContentRender">
-                    <HeaderView SiderWidth="SiderWidth" Logo="Logo" MenuData="MenuData" Title="@Title" HeaderContentRender="HeaderContentRender" />
+                    <HeaderView SiderWidth="SiderWidth" Logo="Logo" MenuData="MenuData" Title="@Title" HeaderContentRender="HeaderContentRender" BaseURL="@BaseURL" />
                 </CascadingValue>
             }
 
diff --git a/src/layout/src/BasicLayout.razor.cs b/src/layout/src/BasicLayout.razor.cs
@@ -40,7 +40,7 @@ public partial class BasicLayout : IBasicLayout
         [Parameter] public EventCallback<string[]> OpenKeysChanged { get; set; }
         [Parameter] public MenuTheme Theme { get; set; }
         [Parameter] public OneOf<string, RenderFragment> Logo { get; set; }
-        [Parameter] public string BaseURL { get; set; } = "/";
+        [Parameter] public string BaseURL { get; set; } = "";
         [Parameter] public int SiderWidth { get; set; } = 208;
         [Parameter] public RenderFragment MenuExtraRender { get; set; }
         [Parameter] public bool MenuAccordion { get; set; }
diff --git a/src/layout/src/GlobalHeader/GlobalHeader.razor b/src/layout/src/GlobalHeader/GlobalHeader.razor
@@ -49,7 +49,7 @@ else
             if (Layout == Layout.Mix)
             {
                 <div class="@BaseClassName-logo" style="min-width:@(SiderWidth)px">
-                    <a href="/">
+                    <a href="@BaseURL">
                         @if (Logo.IsT0)
                         {
                             <img src="@Logo.AsT0" alt="@Logo.AsT0" />
diff --git a/src/layout/src/GlobalHeader/GlobalHeader.razor.cs b/src/layout/src/GlobalHeader/GlobalHeader.razor.cs
@@ -39,6 +39,8 @@ public partial class GlobalHeader : AntProComponentBase, IGlobalHeader
         [Parameter]
         public OneOf<string, RenderFragment> Logo { get; set; }
 
+        [Parameter] public string BaseURL { get; set; } = "";
+
         [CascadingParameter(Name = nameof(RightContentRender))]
         public RenderFragment RightContentRender { get; set; }
 
diff --git a/src/layout/src/HeaderView.razor b/src/layout/src/HeaderView.razor
@@ -12,7 +12,7 @@
     }
     else
     {
-        <GlobalHeader SiderWidth="SiderWidth" Logo="Logo" Title="@Title">
+        <GlobalHeader SiderWidth="SiderWidth" Logo="Logo" Title="@Title" BaseURL="@BaseURL">
             @HeaderContentRender
         </GlobalHeader>
     }
diff --git a/src/layout/src/HeaderView.razor.cs b/src/layout/src/HeaderView.razor.cs
@@ -21,6 +21,7 @@ public partial class HeaderView : IHeaderView
         public string PrefixCls { get; set; } = "ant-pro";
         [Parameter] public bool Collapsed { get; set; }
         [Parameter] public bool IsMobile { get; set; }
+        [Parameter] public string BaseURL { get; set; } = "";
         [Parameter] public OneOf<string, RenderFragment> Logo { get; set; }
         [Parameter] public bool HasSiderMenu { get; set; }
         [Parameter] public int SiderWidth { get; set; }
diff --git a/src/layout/src/SiderMenu/SiderMenu.razor.cs b/src/layout/src/SiderMenu/SiderMenu.razor.cs
@@ -35,7 +35,7 @@ public partial class SiderMenu : ISiderMenu
         [Parameter] public EventCallback<bool> OnCollapse { get; set; }
         [Parameter] public string[] OpenKeys { get; set; } = [];
         [Parameter] public OneOf<string, RenderFragment> Logo { get; set; }
-        [Parameter] public string BaseURL { get; set; } = "/";
+        [Parameter] public string BaseURL { get; set; } = "";
         [Parameter] public int SiderWidth { get; set; } = 208;
         [Parameter] public BreakpointType Breakpoint { get; set; } = BreakpointType.Lg;
         [Parameter] public bool Hide { get; set; }

Original file line number	Diff line number	Diff line change
`@@ -1,50 +1,50 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "path": "/",`
	`3`	`+ "path": "",`
`4`	`4`	`"name": "welcome",`
`5`	`5`	`"key": "welcome",`
`6`	`6`	`"icon": "smile"`
`7`	`7`	`},`
`8`	`8`	`{`
`9`		`- "path": "/admin",`
	`9`	`+ "path": "admin",`
`10`	`10`	`"name": "admin",`
`11`	`11`	`"key": "admin",`
`12`	`12`	`"icon": "crown",`
`13`	`13`	`"children": [`
`14`	`14`	`{`
`15`		`- "path": "/admin/sub-page",`
	`15`	`+ "path": "admin/sub-page",`
`16`	`16`	`"name": "sub-page",`
`17`	`17`	`"key": "admin.sub-page",`
`18`	`18`	`"icon": "crown"`
`19`	`19`	`},`
`20`	`20`	`{`
`21`		`- "path": "/admin/sub-page2",`
	`21`	`+ "path": "admin/sub-page2",`
`22`	`22`	`"name": "sub-page2",`
`23`	`23`	`"key": "admin.sub-page2",`
`24`	`24`	`"icon": "crown"`
`25`	`25`	`},`
`26`	`26`	`{`
`27`		`- "path": "/admin/sub-page3",`
	`27`	`+ "path": "admin/sub-page3",`
`28`	`28`	`"name": "sub-page3",`
`29`	`29`	`"key": "admin.sub-page3",`
`30`	`30`	`"icon": "crown"`
`31`	`31`	`}`
`32`	`32`	`]`
`33`	`33`	`},`
`34`	`34`	`{`
`35`		`- "path": "/list",`
	`35`	`+ "path": "list",`
`36`	`36`	`"name": "list.table-list",`
`37`	`37`	`"key": "list.table-list",`
`38`	`38`	`"icon": "table",`
`39`	`39`	`"children": [`
`40`	`40`	`{`
`41`		`- "path": "/list/sub-page",`
	`41`	`+ "path": "list/sub-page",`
`42`	`42`	`"name": "sub-page",`
`43`	`43`	`"key": "list.sub-page",`
`44`	`44`	`"icon": "crown"`
`45`	`45`	`},`
`46`	`46`	`{`
`47`		`- "path": "/list/sub-page2",`
	`47`	`+ "path": "list/sub-page2",`
`48`	`48`	`"name": "sub-page2",`
`49`	`49`	`"key": "list.sub-page2",`
`50`	`50`	`"icon": "crown"`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`@if (HeaderRender && Pure)`
`39`	`39`	`{`
`40`	`40`	`<CascadingValue Value="RightContentRender" Name="RightContentRender">`
`41`		`- <HeaderView SiderWidth="SiderWidth" Logo="Logo" MenuData="MenuData" Title="@Title" HeaderContentRender="HeaderContentRender" />`
	`41`	`+ <HeaderView SiderWidth="SiderWidth" Logo="Logo" MenuData="MenuData" Title="@Title" HeaderContentRender="HeaderContentRender" BaseURL="@BaseURL" />`
`42`	`42`	`</CascadingValue>`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ else`
`49`	`49`	`if (Layout == Layout.Mix)`
`50`	`50`	`{`
`51`	`51`	`<div class="@BaseClassName-logo" style="min-width:@(SiderWidth)px">`
`52`		`- <a href="/">`
	`52`	`+ <a href="@BaseURL">`
`53`	`53`	`@if (Logo.IsT0)`
`54`	`54`	`{`
`55`	`55`	`<img src="@Logo.AsT0" alt="@Logo.AsT0" />`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`}`
`13`	`13`	`else`
`14`	`14`	`{`
`15`		`- <GlobalHeader SiderWidth="SiderWidth" Logo="Logo" Title="@Title">`
	`15`	`+ <GlobalHeader SiderWidth="SiderWidth" Logo="Logo" Title="@Title" BaseURL="@BaseURL">`
`16`	`16`	`@HeaderContentRender`
`17`	`17`	`</GlobalHeader>`
`18`	`18`	`}`