Skip to content

Commit 4640cae

Browse files
authored
refactor(Tab): remove ShowErrorLoggerToast parameter (#6150)
* refactor: 关闭 TabItem 的 Toast 弹窗 * refactor: 更改变量 * refactor: ShowToast 默认值更改为 false * refactor: 移除 ShowErrorLoggerToast 参数
1 parent 3167b47 commit 4640cae

File tree

4 files changed

+19
-20
lines changed

4 files changed

+19
-20
lines changed

src/BootstrapBlazor/Components/Layout/Layout.razor

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@
148148
RefreshToolbarTooltipText="@RefreshToolbarTooltipText" FullscreenToolbarTooltipText="@FullscreenToolbarTooltipText"
149149
OnToolbarRefreshCallback="OnToolbarRefreshCallback" TabHeader="TabHeader"
150150
Body="@Main" NotAuthorized="NotAuthorized!" NotFound="NotFound!" NotFoundTabText="@NotFoundTabText"
151-
EnableErrorLogger="@_enableErrorLogger" ShowErrorLoggerToast="@_showToast"
152-
ErrorLoggerToastTitle="@ErrorLoggerToastTitle">
151+
EnableErrorLogger="@_enableErrorLogger" ErrorLoggerToastTitle="@ErrorLoggerToastTitle">
153152
</Tab>;
154153

155154
RenderFragment RenderFooter =>

src/BootstrapBlazor/Components/Tab/Tab.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ else
2121
<CascadingValue Value="this" IsFixed="true">
2222
@if (IsOnlyRenderActiveTab)
2323
{
24-
var item = Items.FirstOrDefault(i => i.IsActive);
24+
var item = TabItems.Find(i => i.IsActive);
2525
if (item != null)
2626
{
2727
@RenderTabItem(item)
2828
}
2929
}
3030
else
3131
{
32-
foreach (var item in Items)
32+
foreach (var item in TabItems)
3333
{
3434
@RenderTabItem(item)
3535
}

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

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -437,12 +437,6 @@ public partial class Tab
437437
[Parameter]
438438
public bool? EnableErrorLogger { get; set; }
439439

440-
/// <summary>
441-
/// 获得/设置 是否显示 Error 提示弹窗 默认 null 使用 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 设置值
442-
/// </summary>
443-
[Parameter]
444-
public bool? ShowErrorLoggerToast { get; set; }
445-
446440
/// <summary>
447441
/// 获得/设置 错误日志 <see cref="Toast"/> 弹窗标题 默认 null
448442
/// </summary>
@@ -614,7 +608,7 @@ private void AddTabByUrl()
614608
if (!Excluded)
615609
{
616610
// 地址相同参数不同需要重新渲染 TabItem
617-
var tab = Items.FirstOrDefault(tab => tab.Url.TrimStart('/').Equals(requestUrl, StringComparison.OrdinalIgnoreCase));
611+
var tab = TabItems.Find(tab => tab.Url.TrimStart('/').Equals(requestUrl, StringComparison.OrdinalIgnoreCase));
618612
if (tab != null)
619613
{
620614
ActiveTabItem(tab);
@@ -652,7 +646,7 @@ private async Task OnClickTabItem(TabItem item)
652646
/// </summary>
653647
public void ClickPrevTab()
654648
{
655-
var item = Items.FirstOrDefault(i => i.IsActive);
649+
var item = TabItems.FirstOrDefault(i => i.IsActive);
656650
if (item != null)
657651
{
658652
var index = TabItems.IndexOf(item);
@@ -1036,8 +1030,8 @@ private RenderFragment RenderTabItemContent(TabItem item) => builder =>
10361030
[JSInvokable]
10371031
public async Task DragItemCallback(int originIndex, int currentIndex)
10381032
{
1039-
var firstColumn = Items.ElementAtOrDefault(originIndex);
1040-
var targetColumn = Items.ElementAtOrDefault(currentIndex);
1033+
var firstColumn = TabItems.ElementAtOrDefault(originIndex);
1034+
var targetColumn = TabItems.ElementAtOrDefault(currentIndex);
10411035
if (firstColumn != null && targetColumn != null)
10421036
{
10431037
if (_draggedItems.Count == 0)
@@ -1138,11 +1132,12 @@ private async Task OnContextMenu(MouseEventArgs e, TabItem item)
11381132

11391133
private RenderFragment RenderTabList() => builder =>
11401134
{
1141-
if (!Items.Any() && !string.IsNullOrEmpty(DefaultUrl))
1135+
if (TabItems.Count == 0 && !string.IsNullOrEmpty(DefaultUrl))
11421136
{
11431137
if (ClickTabToNavigation)
11441138
{
11451139
Navigator.NavigateTo(DefaultUrl);
1140+
return;
11461141
}
11471142
else
11481143
{
@@ -1152,9 +1147,13 @@ private RenderFragment RenderTabList() => builder =>
11521147

11531148
if (FirstRender)
11541149
{
1155-
if (!Items.Any(t => t.IsActive))
1150+
if (TabItems.Find(t => t.IsActive) == null)
11561151
{
1157-
Items.FirstOrDefault(i => i.IsDisabled == false)?.SetActive(true);
1152+
var item = TabItems.Find(i => i.IsDisabled == false);
1153+
if (item != null)
1154+
{
1155+
item.SetActive(true);
1156+
}
11581157
}
11591158
}
11601159

@@ -1186,7 +1185,7 @@ private RenderFragment RenderContextMenuZoneContent() => builder =>
11861185

11871186
private RenderFragment RenderTabItems() => builder =>
11881187
{
1189-
foreach (var item in Items)
1188+
foreach (var item in TabItems)
11901189
{
11911190
if (item.HeaderTemplate != null)
11921191
{

src/BootstrapBlazor/Components/Tab/TabItemContent.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,10 @@ private RenderFragment RenderItemContent(RenderFragment? content) => builder =>
6565
builder.AddAttribute(1, nameof(ErrorLogger.ChildContent), content);
6666

6767
var enableErrorLogger = TabSet.EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
68-
var showToast = TabSet.ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;
6968
builder.AddAttribute(2, nameof(ErrorLogger.EnableErrorLogger), enableErrorLogger);
70-
builder.AddAttribute(3, nameof(ErrorLogger.ShowToast), showToast);
69+
70+
// TabItem 不需要 Toast 提示错误信息
71+
builder.AddAttribute(3, nameof(ErrorLogger.ShowToast), false);
7172
builder.AddAttribute(4, nameof(ErrorLogger.ToastTitle), TabSet.ErrorLoggerToastTitle);
7273
builder.AddAttribute(5, nameof(ErrorLogger.OnInitializedCallback), new Func<ErrorLogger, Task>(logger =>
7374
{

0 commit comments

Comments
 (0)