test/BootstrapBlazor3
1
0
Fork 0
mirror of https://gitee.com/LongbowEnterprise/BootstrapBlazor.git synced 2024-12-06 14:11:49 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

!787 fix(#I2A3Q4): the close button in tab not working

Browse Source 
* refactor: 移除 Task 返回值
* fix: 修复点击关闭小按钮时事件冒泡问题
* fix: 修复关闭 Tab 时更新地址栏
* refactor: 移除 Task.Run
This commit is contained in:
Argo 2020-12-21 00:17:02 +08:00
parent 3b17b12626
commit 81d1715036
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BootstrapBlazor/Components/Tab/Tab.razor
View File

@ -39,7 +39,7 @@
<span class="tabs-item-text">@item.Text</span>
@if (ShowClose && item.Closable)
{
<span class="tabs-item-close" @onclick:stopPropagation @onclick="@(e => Remove(item))">
<span class="tabs-item-close" @onclick:stopPropagation @onclick:preventDefault @onclick="@(e => Remove(item))">
<i class="fa fa-fw fa-close"></i>
</span>
}

18
src/BootstrapBlazor/Components/Tab/Tab.razor.cs
View File

@ -205,7 +205,7 @@ namespace BootstrapBlazor.Components
}
}
private Task InitRouteTable() => Task.Run(() =>
private async Task InitRouteTable()
{
var apps = AdditionalAssemblies == null ? new[] { Assembly.GetEntryAssembly() } : new[] { Assembly.GetEntryAssembly() }.Concat(AdditionalAssemblies).Where(a => a != null);
var componentTypes = apps.SelectMany(a => a!.ExportedTypes.Where(t => typeof(IComponent).IsAssignableFrom(t)));
@ -220,8 +220,8 @@ namespace BootstrapBlazor.Components
}
Navigator.LocationChanged += Navigator_LocationChanged;
InvokeAsync(() => AddTabByUrl(Navigator.ToBaseRelativePath(Navigator.Uri)));
});
await InvokeAsync(() => AddTabByUrl(Navigator.ToBaseRelativePath(Navigator.Uri)));
}
private void Navigator_LocationChanged(object? sender, LocationChangedEventArgs e)
{
@ -376,7 +376,7 @@ namespace BootstrapBlazor.Components
/// 添加 TabItem 方法
/// </summary>
/// <param name="item"></param>
public Task Add(TabItem item)
public void Add(TabItem item)
{
var check = _items.Contains(item);
if (item.IsActive || !check) _items.ForEach(i => i.SetActive(false));
@ -386,7 +386,6 @@ namespace BootstrapBlazor.Components
item.SetActive(true);
}
StateHasChanged();
return Task.CompletedTask;
}
/// <summary>
@ -423,7 +422,11 @@ namespace BootstrapBlazor.Components
// 查找前面的 Tab
activeItem = _items.LastOrDefault();
}
if (activeItem != null) activeItem.SetActive(true);
if (activeItem != null)
{
if (ClickTabToNavigation) Navigator.NavigateTo(activeItem.Url!);
else activeItem.SetActive(true);
}
}
}
@ -431,13 +434,12 @@ namespace BootstrapBlazor.Components
/// 设置指定 TabItem 为激活状态
/// </summary>
/// <param name="item"></param>
public Task ActiveTab(TabItem item)
public void ActiveTab(TabItem item)
{
_items.ForEach(i => i.SetActive(false));
item.SetActive(true);
StateHasChanged();
return Task.CompletedTask;
}
/// <summary>