Skip to content

Commit d841341

Browse files
committed
wip: 临时提交
1 parent 877a59c commit d841341

3 files changed

Lines changed: 72 additions & 46 deletions

File tree

src/BootstrapBlazor/Components/Tab/Tab.razor

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,7 @@ else
170170

171171
RenderFragment RenderHeaderItem(TabItem item) =>
172172
@<div @key="@item" class="@GetItemWrapClassString(item)" draggable="@DraggableString">
173-
<a href="@item.Url" role="tab" tabindex="-1" class="@GetClassString(item)"
174-
@oncontextmenu="e => OnContextMenu(e, item)" @oncontextmenu:preventDefault="IsPreventDefault"
175-
@onclick="@(() => OnClickTabItem(item))" @onclick:preventDefault="@(!ClickTabToNavigation)">
176-
@RenderHeaderItemContent(item)
177-
</a>
173+
@RenderHeaderLinkItem(item)
178174
@if (TabStyle == TabStyle.Chrome)
179175
{
180176
<i class="tab-corner tab-corner-left"></i>

src/BootstrapBlazor/Components/Tab/Tab.razor.cs

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -534,19 +534,7 @@ protected override void OnParametersSet()
534534
TabStyle = TabStyle.Default;
535535
}
536536

537-
if (ClickTabToNavigation)
538-
{
539-
if (!HandlerNavigation)
540-
{
541-
HandlerNavigation = true;
542-
Navigator.LocationChanged += Navigator_LocationChanged;
543-
}
544-
AddTabByUrl();
545-
}
546-
else
547-
{
548-
RemoveLocationChanged();
549-
}
537+
AddTabByUrl();
550538
}
551539

552540
/// <summary>
@@ -581,22 +569,6 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
581569
/// <returns></returns>
582570
protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop, nameof(DragItemCallback));
583571

584-
private void RemoveLocationChanged()
585-
{
586-
if (HandlerNavigation)
587-
{
588-
Navigator.LocationChanged -= Navigator_LocationChanged;
589-
HandlerNavigation = false;
590-
}
591-
}
592-
593-
private void Navigator_LocationChanged(object? sender, Microsoft.AspNetCore.Components.Routing.LocationChangedEventArgs e)
594-
{
595-
AddTabByUrl();
596-
InvokeUpdate = true;
597-
StateHasChanged();
598-
}
599-
600572
private void AddTabByUrl()
601573
{
602574
var requestUrl = Navigator.ToBaseRelativePath(Navigator.Uri);
@@ -623,23 +595,12 @@ private void AddTabByUrl()
623595

624596
private bool ShouldShowExtendButtons() => ShowExtendButtons && (Placement == Placement.Top || Placement == Placement.Bottom);
625597

626-
/// <summary>
627-
/// 点击 TabItem 时回调此方法
628-
/// </summary>
629598
private async Task OnClickTabItem(TabItem item)
630599
{
631600
if (OnClickTabItemAsync != null)
632601
{
633602
await OnClickTabItemAsync(item);
634603
}
635-
636-
if (!ClickTabToNavigation)
637-
{
638-
TabItems.ForEach(i => i.SetActive(false));
639-
item.SetActive(true);
640-
InvokeUpdate = true;
641-
StateHasChanged();
642-
}
643604
}
644605

645606
/// <summary>
@@ -1227,7 +1188,6 @@ protected override async ValueTask DisposeAsync(bool disposing)
12271188

12281189
if (disposing)
12291190
{
1230-
RemoveLocationChanged();
12311191
ErrorLogger?.UnRegister(this);
12321192
}
12331193
}
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the Apache 2.0 License
3+
// See the LICENSE file in the project root for more information.
4+
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
5+
6+
using Microsoft.AspNetCore.Components.Rendering;
7+
using Microsoft.AspNetCore.Components.Web;
8+
9+
namespace BootstrapBlazor.Components;
10+
11+
class TabHeader : IComponent
12+
{
13+
[Parameter]
14+
public string? Url { get; set; }
15+
16+
[Parameter]
17+
public string? Class { get; set; }
18+
19+
[Parameter]
20+
public Func<Task>? OnClick { get; set; }
21+
22+
[Parameter]
23+
public RenderFragment? ChildContent { get; set; }
24+
25+
private RenderHandle _renderHandle;
26+
27+
void IComponent.Attach(RenderHandle renderHandle)
28+
{
29+
_renderHandle = renderHandle;
30+
}
31+
32+
/// <summary>
33+
/// <inheritdoc/>
34+
/// </summary>
35+
/// <param name="parameters"></param>
36+
/// <returns></returns>
37+
Task IComponent.SetParametersAsync(ParameterView parameters)
38+
{
39+
parameters.SetParameterProperties(this);
40+
41+
RenderContent();
42+
return Task.CompletedTask;
43+
}
44+
private void RenderContent()
45+
{
46+
_renderHandle.Render(BuildRenderTree);
47+
}
48+
49+
/// <summary>
50+
/// <inheritdoc/>
51+
/// </summary>
52+
/// <param name="builder"></param>
53+
private void BuildRenderTree(RenderTreeBuilder builder)
54+
{
55+
builder.OpenElement(0, "a");
56+
builder.AddAttribute(10, "class", Class);
57+
builder.AddAttribute(20, "href", Url);
58+
builder.AddAttribute(30, "onclick", EventCallback.Factory.Create<MouseEventArgs>(this, e => OnClickCallback()));
59+
builder.AddContent(40, ChildContent);
60+
builder.CloseElement();
61+
}
62+
63+
private async Task OnClickCallback()
64+
{
65+
if (OnClick != null)
66+
{
67+
await OnClick();
68+
}
69+
}
70+
}

0 commit comments

Comments
 (0)