Skip to content

fix(Table): should show the Toast when not set BootstrapBlazorOption ToastDelay #5810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 11, 2025
Merged

fix(Table): should show the Toast when not set BootstrapBlazorOption ToastDelay #5810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1e92c8
wip: 临时提交
ArgoZhang Apr 11, 2025
4c89567
test: 更新单元测试
ArgoZhang Apr 11, 2025
9e10ab2
refactor: 重构代码
ArgoZhang Apr 11, 2025
07a6ae2
refactor: 移除参数
ArgoZhang Apr 11, 2025
464c880
refactor: 重构 ToastDelay 取值逻辑
ArgoZhang Apr 11, 2025
a554738
test: 更新单元测试
ArgoZhang Apr 11, 2025
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
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Message/MessageService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public async Task Show(MessageOption option, Message? message = null)
{
if (!option.ForceDelay)
{
if (Options.MessageDelay != 0)
if (Options.MessageDelay > 0)
{
option.Delay = Options.MessageDelay;
}
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/SweetAlert/SwalService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class SwalService(IOptionsMonitor<BootstrapBlazorOptions> options) : Boot
/// <param name="swal">指定弹窗组件 默认为 null 使用 <see cref="BootstrapBlazorRoot"/> 组件内置弹窗组件</param>
public async Task Show(SwalOption option, SweetAlert? swal = null)
{
if (!option.ForceDelay && options.CurrentValue.SwalDelay != 0)
if (!option.ForceDelay && options.CurrentValue.SwalDelay > 0)
{
option.Delay = options.CurrentValue.SwalDelay;
}
Expand Down
15 changes: 11 additions & 4 deletions src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,11 +1153,18 @@ private async Task ExecuteExportAsync(Func<Task<bool>> callback)
}
}

private ToastOption GetToastOption(string title) => new()
private ToastOption GetToastOption(string title)
{
Title = title,
Delay = Options.CurrentValue.ToastDelay
};
var option = new ToastOption()
{
Title = title,
};
if (Options.CurrentValue.ToastDelay > 0)
{
option.Delay = Options.CurrentValue.ToastDelay;
}
return option;
}

private Task ExportAsync() => ExecuteExportAsync(() => OnExportAsync != null
? OnExportAsync(new TableExportDataContext<TItem>(TableExportType.Unknown, Rows, GetVisibleColumns(), BuildQueryPageOptions()))
Expand Down
3 changes: 3 additions & 0 deletions test/UnitTest/Components/TableDialogTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using AngleSharp.Dom;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.Extensions.Localization;
using Microsoft.Extensions.Options;
using System.Reflection;

namespace UnitTest.Components;
Expand All @@ -15,6 +16,8 @@ public class TableDialogTest : TableDialogTestBase
[Fact]
public async Task EditAsync_Ok()
{
var options = Context.Services.GetRequiredService<IOptionsMonitor<BootstrapBlazorOptions>>();
options.CurrentValue.ToastDelay = 0;
var localizer = Context.Services.GetRequiredService<IStringLocalizer<Foo>>();
var items = Foo.GenerateFoo(localizer, 2);
var cut = Context.RenderComponent<BootstrapBlazorRoot>(pb =>
Expand Down