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
7 changes: 7 additions & 0 deletions src/BootstrapBlazor/Components/SweetAlert/SwalOption.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ public class SwalOption : PopupOptionBase
/// </summary>
public RenderFragment? BodyTemplate { get; set; }

/// <summary>
/// <para lang="zh">获得/设置 Footer 文本字符串</para>
/// <para lang="en">Gets or sets Footer content string</para>
/// <para>v<version>10.5.0</version></para>
/// </summary>
public string? Footer { get; set; }

/// <summary>
/// <para lang="zh">获得/设置 Footer 组件</para>
/// <para lang="en">Gets or sets Footer Component</para>
Expand Down
11 changes: 9 additions & 2 deletions src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@namespace BootstrapBlazor.Components
@namespace BootstrapBlazor.Components
@inherits BootstrapComponentBase

<div class="swal2-header">
Expand Down Expand Up @@ -70,6 +70,13 @@ else
@if (ShowFooter)
{
<div class="swal2-footer d-flex">
@FooterTemplate
@if (FooterTemplate != null)
{
@FooterTemplate
}
else
{
@Footer
}
Comment thread
ArgoZhang marked this conversation as resolved.
</div>
}
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,14 @@ public partial class SweetAlertBody
[Parameter]
public RenderFragment? BodyTemplate { get; set; }

/// <summary>
/// <para lang="zh">获得/设置 Footer 文本字符串</para>
/// <para lang="en">Gets or sets Footer content string</para>
/// <para>v<version>10.5.0</version></para>
/// </summary>
[Parameter]
public string? Footer { get; set; }

/// <summary>
/// <para lang="zh">获得/设置 Footer 模板</para>
/// <para lang="en">Gets or sets Footer Template</para>
Expand Down
4 changes: 0 additions & 4 deletions src/BootstrapBlazor/Components/Table/Table.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -735,10 +735,6 @@ public async Task ExpandDetailRow(TItem item)
/// <para lang="zh">获得/设置 是否自动刷新表格 默认为 false</para>
/// <para lang="en">Gets or sets Whether to auto refresh. Default false</para>
/// </summary>
/// <remarks>
/// <para lang="zh">此参数在 <see cref="IsExcel"/> 模式下不生效</para>
/// <para lang="en">Not effective in <see cref="IsExcel"/> mode</para>
/// </remarks>
[Parameter]
public bool IsAutoRefresh { get; set; }

Expand Down
1 change: 1 addition & 0 deletions src/BootstrapBlazor/Extensions/SwalExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public static async Task<bool> ShowModal(this SwalService service, SwalOption op
[nameof(SweetAlertBody.Title)] = option.Title,
[nameof(SweetAlertBody.Content)] = option.Content,
[nameof(SweetAlertBody.BodyTemplate)] = option.BodyTemplate,
[nameof(SweetAlertBody.Footer)] = option.Footer,
[nameof(SweetAlertBody.FooterTemplate)] = option.FooterTemplate,
[nameof(SweetAlertBody.ButtonTemplate)] = option.ButtonTemplate,
[nameof(SweetAlertBody.CloseButtonIcon)] = option.CloseButtonIcon,
Expand Down
5 changes: 4 additions & 1 deletion test/UnitTest/Components/SwalTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,12 @@ public void Show_Ok()
cut.InvokeAsync(() => swal.Show(new SwalOption()
{
Content = "I am Eror",
Category = SwalCategory.Information
Category = SwalCategory.Information,
ShowFooter = true,
Footer = "I am Footer"
}));
Assert.Contains("swal2-info", cut.Markup);
Assert.Contains("I am Footer", cut.Markup);
cut.InvokeAsync(() => modal.Instance.CloseCallback());

// 测试 Category
Expand Down
Loading