Skip to content

fix(Tab): add OrdinalIgnoreCase parameter compatible locales #6215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 12, 2025
Merged

fix(Tab): add OrdinalIgnoreCase parameter compatible locales #6215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
062679b
refactor: 移除 RouteTabFactory 老代码
ArgoZhang Jun 12, 2025
1eeb835
fix: 增加忽略文化信息代码
ArgoZhang Jun 12, 2025
0abd144
chore: bump version 9.7.3-beta01
ArgoZhang Jun 12, 2025
544086e
refactor: 提升性能
ArgoZhang Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.7.3</Version>
<Version>9.7.4-beta01</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
44 changes: 2 additions & 42 deletions src/BootstrapBlazor/Router/RouteTableFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,6 @@
namespace BootstrapBlazor.Components;

[ExcludeFromCodeCoverage]
#if NET5_0
internal static class RouteTableFactory
{
[NotNull]
private static Microsoft.AspNetCore.Components.Routing.IRouteTable? Routes { get; set; }
private static readonly HashSet<Assembly> _assemblies = new();

/// <summary>
///
/// </summary>
/// <param name="assemblies"></param>
/// <param name="url"></param>
/// <returns></returns>
public static RouteContext Create(IEnumerable<Assembly>? assemblies, string url)
{
RefreshRouteTable(assemblies);
if (url.IndexOf("?") > 0) url = url[..url.IndexOf("?")];
var routeContext = new Microsoft.AspNetCore.Components.Routing.RouteContext(url);
Routes.Route(routeContext);
return new RouteContext()
{
Handler = routeContext.Handler,
Parameters = routeContext.Parameters,
Segments = routeContext.Segments
};
}

private static void RefreshRouteTable(IEnumerable<Assembly>? assemblies)
{
assemblies ??= Enumerable.Empty<Assembly>();
var assembliesSet = new HashSet<Assembly>(assemblies);
if (!_assemblies.SetEquals(assembliesSet))
{
Routes = Microsoft.AspNetCore.Components.Routing.RouteTableFactory.Create(assemblies);
_assemblies.Clear();
_assemblies.UnionWith(assembliesSet);
}
}
}
#else
internal static class RouteTableFactory
{
[NotNull]
Expand All @@ -63,7 +23,8 @@ internal static class RouteTableFactory
public static RouteContext Create(IEnumerable<Assembly> assemblies, string url)
{
RefreshRouteTable(assemblies);
if (url.IndexOf("?") > 0) url = url[..url.IndexOf("?")];
var len = url.IndexOf("?", StringComparison.OrdinalIgnoreCase);
if (len > 0) url = url[..len];
var routeContext = new Microsoft.AspNetCore.Components.Routing.RouteContext(url);
Routes.Route(routeContext);
return new RouteContext()
Expand All @@ -85,4 +46,3 @@ private static void RefreshRouteTable(IEnumerable<Assembly> assemblies)
}
}
}
#endif