Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions src/BootstrapBlazor/Components/Layout/Layout.razor
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@
RefreshToolbarTooltipText="@RefreshToolbarTooltipText" FullscreenToolbarTooltipText="@FullscreenToolbarTooltipText"
OnToolbarRefreshCallback="OnToolbarRefreshCallback" TabHeader="TabHeader"
Body="@Main" NotAuthorized="NotAuthorized!" NotFound="NotFound!" NotFoundTabText="@NotFoundTabText"
EnableErrorLogger="@_enableErrorLogger" ShowErrorLoggerToast="@_showToast"
ErrorLoggerToastTitle="@ErrorLoggerToastTitle">
EnableErrorLogger="@_enableErrorLogger" ErrorLoggerToastTitle="@ErrorLoggerToastTitle">
</Tab>;

RenderFragment RenderFooter =>
Expand Down
4 changes: 2 additions & 2 deletions src/BootstrapBlazor/Components/Tab/Tab.razor
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ else
<CascadingValue Value="this" IsFixed="true">
@if (IsOnlyRenderActiveTab)
{
var item = Items.FirstOrDefault(i => i.IsActive);
var item = TabItems.Find(i => i.IsActive);
if (item != null)
{
@RenderTabItem(item)
}
}
else
{
foreach (var item in Items)
foreach (var item in TabItems)
{
@RenderTabItem(item)
}
Expand Down
27 changes: 13 additions & 14 deletions src/BootstrapBlazor/Components/Tab/Tab.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -437,12 +437,6 @@ public partial class Tab
[Parameter]
public bool? EnableErrorLogger { get; set; }

/// <summary>
/// 获得/设置 是否显示 Error 提示弹窗 默认 null 使用 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 设置值
/// </summary>
[Parameter]
public bool? ShowErrorLoggerToast { get; set; }

/// <summary>
/// 获得/设置 错误日志 <see cref="Toast"/> 弹窗标题 默认 null
/// </summary>
Expand Down Expand Up @@ -614,7 +608,7 @@ private void AddTabByUrl()
if (!Excluded)
{
// 地址相同参数不同需要重新渲染 TabItem
var tab = Items.FirstOrDefault(tab => tab.Url.TrimStart('/').Equals(requestUrl, StringComparison.OrdinalIgnoreCase));
var tab = TabItems.Find(tab => tab.Url.TrimStart('/').Equals(requestUrl, StringComparison.OrdinalIgnoreCase));
if (tab != null)
{
ActiveTabItem(tab);
Expand Down Expand Up @@ -652,7 +646,7 @@ private async Task OnClickTabItem(TabItem item)
/// </summary>
public void ClickPrevTab()
{
var item = Items.FirstOrDefault(i => i.IsActive);
var item = TabItems.FirstOrDefault(i => i.IsActive);
if (item != null)
{
var index = TabItems.IndexOf(item);
Expand Down Expand Up @@ -1036,8 +1030,8 @@ private RenderFragment RenderTabItemContent(TabItem item) => builder =>
[JSInvokable]
public async Task DragItemCallback(int originIndex, int currentIndex)
{
var firstColumn = Items.ElementAtOrDefault(originIndex);
var targetColumn = Items.ElementAtOrDefault(currentIndex);
var firstColumn = TabItems.ElementAtOrDefault(originIndex);
var targetColumn = TabItems.ElementAtOrDefault(currentIndex);
if (firstColumn != null && targetColumn != null)
{
if (_draggedItems.Count == 0)
Expand Down Expand Up @@ -1138,11 +1132,12 @@ private async Task OnContextMenu(MouseEventArgs e, TabItem item)

private RenderFragment RenderTabList() => builder =>
{
if (!Items.Any() && !string.IsNullOrEmpty(DefaultUrl))
if (TabItems.Count == 0 && !string.IsNullOrEmpty(DefaultUrl))
{
if (ClickTabToNavigation)
{
Navigator.NavigateTo(DefaultUrl);
return;
}
else
{
Expand All @@ -1152,9 +1147,13 @@ private RenderFragment RenderTabList() => builder =>

if (FirstRender)
{
if (!Items.Any(t => t.IsActive))
if (TabItems.Find(t => t.IsActive) == null)
{
Items.FirstOrDefault(i => i.IsDisabled == false)?.SetActive(true);
var item = TabItems.Find(i => i.IsDisabled == false);
if (item != null)
{
item.SetActive(true);
}
}
}

Expand Down Expand Up @@ -1186,7 +1185,7 @@ private RenderFragment RenderContextMenuZoneContent() => builder =>

private RenderFragment RenderTabItems() => builder =>
{
foreach (var item in Items)
foreach (var item in TabItems)
{
if (item.HeaderTemplate != null)
{
Expand Down
5 changes: 3 additions & 2 deletions src/BootstrapBlazor/Components/Tab/TabItemContent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@ private RenderFragment RenderItemContent(RenderFragment? content) => builder =>
builder.AddAttribute(1, nameof(ErrorLogger.ChildContent), content);

var enableErrorLogger = TabSet.EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
var showToast = TabSet.ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;
builder.AddAttribute(2, nameof(ErrorLogger.EnableErrorLogger), enableErrorLogger);
builder.AddAttribute(3, nameof(ErrorLogger.ShowToast), showToast);

// TabItem 不需要 Toast 提示错误信息
builder.AddAttribute(3, nameof(ErrorLogger.ShowToast), false);
builder.AddAttribute(4, nameof(ErrorLogger.ToastTitle), TabSet.ErrorLoggerToastTitle);
builder.AddAttribute(5, nameof(ErrorLogger.OnInitializedCallback), new Func<ErrorLogger, Task>(logger =>
{
Expand Down