Revert "wip: 临时提交"

This reverts commit d841341.

Author: ArgoZhang

src/BootstrapBlazor/Components/Tab/Tab.razor

@@ -149,15 +149,15 @@ else
             @ContextMenuTemplate(this)
         }
     </ContextMenu>;
-    
+
     RenderFragment<TabItem> RenderTabItem => item =>
     @<CascadingValue Value="item" IsFixed="true">
         @RenderTabItemContent(item)
     </CascadingValue>;
 
-    RenderFragment RenderDisabledHeaderItem(TabItem item) => 
+    RenderFragment RenderDisabledHeaderItem(TabItem item) =>
     @<div @key="@item" class="@GetItemWrapClassString(item)">
-        <div role="tab" class="@GetClassString(item)" 
+        <div role="tab" class="@GetClassString(item)"
              @oncontextmenu="e => OnContextMenu(e, item)" @oncontextmenu:preventDefault="IsPreventDefault">
             @RenderHeaderItemContent(item)
         </div>
@@ -170,7 +170,11 @@ else
 
     RenderFragment RenderHeaderItem(TabItem item) =>
     @<div @key="@item" class="@GetItemWrapClassString(item)" draggable="@DraggableString">
-        @RenderHeaderLinkItem(item)
+        <DynamicElement TagName="a" href="@item.Url" role="tab" tabindex="-1" class="@GetClassString(item)"
+                        OnContextMenu="e => OnContextMenu(e, item)"
+                        OnClick="@(() => OnClickTabItem(item))">
+            @RenderHeaderItemContent(item)
+        </DynamicElement>
         @if (TabStyle == TabStyle.Chrome)
         {
             <i class="tab-corner tab-corner-left"></i>

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

@@ -534,7 +534,19 @@ protected override void OnParametersSet()
             TabStyle = TabStyle.Default;
         }
 
-        AddTabByUrl();
+        if (ClickTabToNavigation)
+        {
+            if (!HandlerNavigation)
+            {
+                HandlerNavigation = true;
+                Navigator.LocationChanged += Navigator_LocationChanged;
+            }
+            AddTabByUrl();
+        }
+        else
+        {
+            RemoveLocationChanged();
+        }
     }
 
     /// <summary>
@@ -569,6 +581,22 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
     /// <returns></returns>
     protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop, nameof(DragItemCallback));
 
+    private void RemoveLocationChanged()
+    {
+        if (HandlerNavigation)
+        {
+            Navigator.LocationChanged -= Navigator_LocationChanged;
+            HandlerNavigation = false;
+        }
+    }
+
+    private void Navigator_LocationChanged(object? sender, Microsoft.AspNetCore.Components.Routing.LocationChangedEventArgs e)
+    {
+        AddTabByUrl();
+        InvokeUpdate = true;
+        StateHasChanged();
+    }
+
     private void AddTabByUrl()
     {
         var requestUrl = Navigator.ToBaseRelativePath(Navigator.Uri);
@@ -595,12 +623,23 @@ private void AddTabByUrl()
 
     private bool ShouldShowExtendButtons() => ShowExtendButtons && (Placement == Placement.Top || Placement == Placement.Bottom);
 
+    /// <summary>
+    /// 点击 TabItem 时回调此方法
+    /// </summary>
     private async Task OnClickTabItem(TabItem item)
     {
         if (OnClickTabItemAsync != null)
         {
             await OnClickTabItemAsync(item);
         }
+
+        if (!ClickTabToNavigation)
+        {
+            TabItems.ForEach(i => i.SetActive(false));
+            item.SetActive(true);
+            InvokeUpdate = true;
+            StateHasChanged();
+        }
     }
 
     /// <summary>
@@ -1188,6 +1227,7 @@ protected override async ValueTask DisposeAsync(bool disposing)
 
         if (disposing)
         {
+            RemoveLocationChanged();
             ErrorLogger?.UnRegister(this);
         }
     }