Skip to content

feat(TableRowContext): add RenderMode parameter #4596

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 3 commits into from
Nov 2, 2024
Merged

feat(TableRowContext): add RenderMode parameter #4596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3be1904
feat: add RenderMode on TableRowContext
ArgoZhang Nov 2, 2024
6786549
test: 更新单元测试
ArgoZhang Nov 2, 2024
7f747d1
test: 增加单元测试覆盖率
ArgoZhang Nov 2, 2024
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
8 changes: 4 additions & 4 deletions src/BootstrapBlazor/Components/Table/Table.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
if (RowTemplate != null)
{
var columns = GetVisibleColumns();
@RowTemplate(new(item, columns))
@RowTemplate(new(item, columns, ActiveRenderMode))
}
else
{
Expand Down Expand Up @@ -259,7 +259,7 @@
@if (RowContentTemplate != null)
{
var columns = GetVisibleColumns();
@RowContentTemplate(new(item, columns))
@RowContentTemplate(new(item, columns, ActiveRenderMode))
}
else
{
Expand Down Expand Up @@ -393,7 +393,7 @@
if (RowTemplate != null)
{
var columns = GetVisibleColumns();
@RowTemplate(new(item, columns))
@RowTemplate(new(item, columns, ActiveRenderMode))
}
else
{
Expand Down Expand Up @@ -728,7 +728,7 @@
@if (RowContentTemplate != null)
{
var columns = GetVisibleColumns();
@RowContentTemplate(new (item, columns));
@RowContentTemplate(new (item, columns, ActiveRenderMode));
}
else
{
Expand Down
10 changes: 8 additions & 2 deletions src/BootstrapBlazor/Components/Table/TableRowContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@ namespace BootstrapBlazor.Components;
/// </summary>
/// <param name="model"></param>
/// <param name="columns"></param>
public class TableRowContext<TItem>(TItem model, IEnumerable<ITableColumn> columns)
/// <param name="renderMode"></param>
public class TableRowContext<TItem>(TItem model, IEnumerable<ITableColumn> columns, TableRenderMode renderMode)
{
/// <summary>
/// 获得/设置 当前渲染模式
/// </summary>
public TableRenderMode RenderMode { get; } = renderMode;

/// <summary>
/// 获得/设置 行数据实例
/// </summary>
Expand All @@ -21,5 +27,5 @@ public class TableRowContext<TItem>(TItem model, IEnumerable<ITableColumn> colum
/// <summary>
/// 获得/设置 当前绑定字段数据实例
/// </summary>
public IEnumerable<ITableColumn> Columns => columns;
public IEnumerable<ITableColumn> Columns { get; } = columns;
}
6 changes: 3 additions & 3 deletions test/UnitTest/Components/TableTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7575,7 +7575,7 @@ public void TableColumnContext_Exception()
[Fact]
public void TableRowContext_Exception()
{
Assert.Throws<ArgumentNullException>(() => new TableRowContext<Foo?>(null, [new InternalTableColumn("Name", typeof(string))]));
Assert.Throws<ArgumentNullException>(() => new TableRowContext<Foo?>(null, [new InternalTableColumn("Name", typeof(string))], TableRenderMode.Table));
}

[Fact]
Expand Down Expand Up @@ -8104,7 +8104,7 @@ public void RowContentTemplate_Ok(TableRenderMode mode)
});
pb.Add(a => a.RowContentTemplate, context => builder =>
{
builder.OpenElement(0, "div");
builder.OpenElement(0, context.RenderMode == TableRenderMode.CardView ? "div" : "tr");
builder.AddContent(1, $"template-{context.Row.Name}");
builder.CloseElement();

Expand Down Expand Up @@ -8141,7 +8141,7 @@ public void RowTemplate_Ok(TableRenderMode mode)
});
pb.Add(a => a.RowTemplate, context => builder =>
{
builder.OpenElement(0, mode == TableRenderMode.CardView ? "div" : "tr");
builder.OpenElement(0, context.RenderMode == TableRenderMode.CardView ? "div" : "tr");
builder.AddContent(1, new MarkupString(mode == TableRenderMode.CardView ? $"<div>template-{context.Row.Name}</div>" : $"<td>template-{context.Row.Name}</td>"));
builder.CloseElement();

Expand Down