Skip to content

Commit 57d8b4f

Browse files
authored
fix(Layout): missing route handler when url has # (#5795)
* refactor: remove comment * refactor: 增加激活标签页空保护 * refactor: 使用 ToAbsoluteUri 防止报错
1 parent 30ab0b3 commit 57d8b4f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,8 +491,8 @@ protected override async Task OnInitializedAsync()
491491
// wasm 模式下 开启权限必须提供 AdditionalAssemblies 参数
492492
AdditionalAssemblies ??= [Assembly.GetEntryAssembly()!];
493493

494-
var url = Navigation.ToBaseRelativePath(Navigation.Uri);
495-
var context = RouteTableFactory.Create(AdditionalAssemblies, url);
494+
var uri= Navigation.ToAbsoluteUri(Navigation.Uri);
495+
var context = RouteTableFactory.Create(AdditionalAssemblies, uri.LocalPath);
496496
if (context.Handler != null)
497497
{
498498
IsAuthenticated = await context.Handler.IsAuthorizedAsync(ServiceProvider, AuthenticationStateTask, Resource);

src/BootstrapBlazor/Components/Tab/Tab.razor.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ const active = tab => {
5656
resize(tab)
5757

5858
const activeTab = tab.tabNav.querySelector('.tabs-item-wrap.active')
59+
if (activeTab === null) {
60+
return
61+
}
5962
if (activeTab) {
6063
if (tab.vertical) {
6164
const top = getPosition(activeTab).top - getPosition(activeTab.parentNode).top + activeTab.offsetHeight
@@ -69,7 +72,6 @@ const active = tab => {
6972
}
7073
}
7174
else {
72-
// mark sure display total active tabitem
7375
const right = getPosition(activeTab).left - getPosition(activeTab.parentNode).left + activeTab.offsetWidth
7476
const navWidth = tab.scroll.offsetWidth
7577
const marginX = navWidth - right + 2

0 commit comments

Comments
 (0)