Merge branch 'main' into feat-upload

Author: ArgoZhang

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

@@ -68,7 +68,7 @@
     <PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.4" />
     <PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />
-    <PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.4" />
+    <PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.5" />
     <PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.7" />
     <PackageReference Include="Longbow.Logging" Version="9.0.0" />

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.6.4</Version>
+    <Version>9.6.5-beta01</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Components/Layout/Layout.razor.cs

@@ -500,8 +500,8 @@ protected override async Task OnInitializedAsync()
             // wasm 模式下 开启权限必须提供 AdditionalAssemblies 参数
             AdditionalAssemblies ??= [Assembly.GetEntryAssembly()!];
 
-            var uri = Navigation.ToAbsoluteUri(Navigation.Uri);
-            var context = RouteTableFactory.Create(AdditionalAssemblies, uri.LocalPath);
+            var url = Navigation.ToBaseRelativePathWithoutQueryAndFragment();
+            var context = RouteTableFactory.Create(AdditionalAssemblies, url);
             if (context.Handler != null)
             {
                 IsAuthenticated = await context.Handler.IsAuthorizedAsync(ServiceProvider, AuthenticationStateTask, Resource);

src/BootstrapBlazor/Extensions/NavigationManagerExtensions.cs

@@ -29,4 +29,27 @@ public static void NavigateTo(this NavigationManager navigation, IServiceProvide
         option.Closable = closable;
         navigation.NavigateTo(url);
     }
+
+    /// <summary>
+    /// 获得当前 Url 的相对路径，不包含 QueryString 和 Fragment（Hash）
+    /// </summary>
+    /// <param name="navigationManager"></param>
+    /// <returns></returns>
+    public static string ToBaseRelativePathWithoutQueryAndFragment(this NavigationManager navigationManager)
+    {
+        var url = navigationManager.ToBaseRelativePath(navigationManager.Uri);
+
+        var index = url.IndexOf('?');
+        if (index > -1)
+        {
+            url = url[..index];
+        }
+
+        index = url.IndexOf('#');
+        if (index > -1)
+        {
+            url = url[..index];
+        }
+        return url;
+    }
 }

test/UnitTest/Extensions/NavigationManagerExtensionsTest.cs

@@ -16,4 +16,15 @@ public void NavigateTo_Ok()
         var provider = Context.Services.GetRequiredService<IServiceProvider>();
         nav.NavigateTo(provider, "/Cat", "Cat", "fa-solid fa-font-awesome", false);
     }
+
+    [Fact]
+    public void ToBaseRelativePathWithoutQueryAndFragment_Ok()
+    {
+        var nav = Context.Services.GetRequiredService<FakeNavigationManager>();
+        nav.NavigateTo("/test?test1=1");
+        Assert.Equal("test", nav.ToBaseRelativePathWithoutQueryAndFragment());
+
+        nav.NavigateTo("/test#1234");
+        Assert.Equal("test", nav.ToBaseRelativePathWithoutQueryAndFragment());
+    }
 }