Skip to content

feat(Table): add RenderContentRow improve readability #6917

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 9 commits into from
Oct 16, 2025
Merged

feat(Table): add RenderContentRow improve readability #6917

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8349f14
refactor: 增加 TableContentColumn
ArgoZhang Oct 15, 2025
e0124b2
refactor: 使用 TableContentCell 组件渲染
ArgoZhang Oct 15, 2025
cbffc27
feat: 增加 CellClass 逻辑
ArgoZhang Oct 15, 2025
c40edf8
refactor: 移除 TableContentCell 组件
ArgoZhang Oct 16, 2025
8de67b6
doc: 移除过期注释
ArgoZhang Oct 16, 2025
024cec2
doc: 更正单词拼写错误
ArgoZhang Oct 16, 2025
d4df546
doc: 更正单词拼写错误
ArgoZhang Oct 16, 2025
fe78258
refactor: 重构代码提高可读性
ArgoZhang Oct 16, 2025
295438f
refactor: 重构代码
ArgoZhang Oct 16, 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
132 changes: 46 additions & 86 deletions src/BootstrapBlazor/Components/Table/Table.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,11 +725,6 @@
<div class="@LineCellClassString">@GetLineNo(item)</div>
</td>
}
@{
var index = 0;
var colIndex = 0;
var isInCell = InCellMode && SelectedRows.FirstOrDefault() == item;
}
@if (ShowExtendButtons && IsExtendButtonsInRowHeader)
{
@RenderRowExtendButtons(item)
Expand All @@ -741,94 +736,59 @@
}
else
{
@foreach (var col in GetVisibleColumns())
{
if (colIndex > 1)
{
colIndex--;
continue;
}
var cellClass = "";
var colSpan = 0;
string? value = null;
RenderFragment? valueTemplate = null;
if (col.OnCellRender != null)
{
var cell = new TableCellArgs { Row = item, ColumnName = col.GetFieldName() };
col.OnCellRender(cell);
cellClass = cell.Class;
colSpan = cell.Colspan;
valueTemplate = cell.ValueTemplate;
value = cell.Value;
colIndex = colSpan;
}
<td colspan="@GetColSpan(colSpan)" class="@GetFixedCellClassString(col, cellClass)" style="@GetFixedCellStyleString(col)">
@{
var isFirstColOfTree = IsTree && index++ == 0;
var degree = 0;
var isExpend = false;
var hasChildren = false;
if (isFirstColOfTree)
{
var treeItem = TreeNodeCache.Find(TreeRows, item, out degree);
if(treeItem != null)
{
isExpend = treeItem.IsExpand;
hasChildren = treeItem.HasChildren;
}
}
var hesTreeChildren = isFirstColOfTree && hasChildren;
}
<DynamicElement TagName="div" TriggerClick="@hesTreeChildren"
OnClick="@ToggleTreeRow(item)" StopPropagation="hesTreeChildren"
class="@GetCellClassString(col, hesTreeChildren, isInCell)" style="@GetCellStyleString(col)">
@if (isFirstColOfTree)
{
<div class="is-node" style="@GetTreeStyleString(degree)">
@if (hesTreeChildren)
{
<i class="@GetTreeClassString(isExpend)"></i>
}
</div>
}
@if (IsExcel)
{
@RenderExcelCell(col, item, ItemChangedType.Update)
}
else if(isInCell)
{
@RenderCell(col, EditModel, AddInCell ? ItemChangedType.Add : ItemChangedType.Update)
}
else
{
var triggerDoubleClick = OnDoubleClickCellCallback != null;
<DynamicElement TagName="div" TriggerDoubleClick="triggerDoubleClick" GenerateElement="false"
OnDoubleClick="TriggerDoubleClickCell(col, item)" StopPropagation="true"
class="@GetDoubleClickCellClassString(triggerDoubleClick)">
@if (valueTemplate != null)
{
@valueTemplate
}
else if (value != null)
{
@value
}
else
{
@GetValue(col, item)
}
</DynamicElement>
}
</DynamicElement>
</td>
}
@RenderContentRow(item);
}
@if (ShowExtendButtons && !IsExtendButtonsInRowHeader)
{
@RenderRowExtendButtons(item)
}
</DynamicElement>;

RenderFragment<TableContentCellContext<TItem>> RenderContentCell => context =>
@<td colspan="@GetColSpan(context.ColSpan)" class="@GetFixedCellClassString(context.Col, context.CellClass)" style="@GetFixedCellStyleString(context.Col)">
<DynamicElement TagName="div" TriggerClick="@context.HasTreeChildren"
OnClick="@ToggleTreeRow(context.Item)" StopPropagation="context.HasTreeChildren"
class="@GetCellClassString(context.Col, context.HasTreeChildren, context.IsInCell)" style="@GetCellStyleString(context.Col)">
@if (context.IsFirstColOfTree)
{
<div class="is-node" style="@GetTreeStyleString(context.Degree)">
@if (context.HasTreeChildren)
{
<i class="@GetTreeClassString(context.IsExpand)"></i>
}
</div>
}
@if (IsExcel)
{
@RenderExcelCell(context.Col, context.Item, ItemChangedType.Update)
}
else if(context.IsInCell)
{
@RenderCell(context.Col, EditModel, AddInCell ? ItemChangedType.Add : ItemChangedType.Update)
}
else
{
var triggerDoubleClick = OnDoubleClickCellCallback != null;
<DynamicElement TagName="div" TriggerDoubleClick="triggerDoubleClick" GenerateElement="false"
OnDoubleClick="TriggerDoubleClickCell(context.Col, context.Item)" StopPropagation="true"
class="@GetDoubleClickCellClassString(triggerDoubleClick)">
@if (context.ValueTemplate != null)
{
@context.ValueTemplate
}
else if (context.Value != null)
{
@context.Value
}
else
{
@GetValue(context.Col, context.Item)
}
</DynamicElement>
}
</DynamicElement>
</td>;

RenderFragment<PlaceholderContext> RenderPlaceholderRow => context =>
@<tr>
@if (IsMultipleSelect)
Expand Down
64 changes: 61 additions & 3 deletions src/BootstrapBlazor/Components/Table/Table.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,10 +1305,7 @@ protected async Task LoopQueryAsync()
try
{
AutoRefreshCancelTokenSource ??= new();
// 自动刷新功能
await Task.Delay(AutoRefreshInterval, AutoRefreshCancelTokenSource.Token);

// 不调用 QueryAsync 防止出现 Loading 动画 保持屏幕静止
await QueryAsync();
StateHasChanged();
}
Expand Down Expand Up @@ -1367,6 +1364,67 @@ protected RenderFragment GetValue(ITableColumn col, TItem item) => builder =>
};
#endregion

private RenderFragment RenderContentRow(TItem item) => builder =>
{
var index = 0;
var colIndex = 0;
var isInCell = InCellMode && SelectedRows.FirstOrDefault() == item;

foreach (var col in GetVisibleColumns())
{
if (colIndex > 1)
{
colIndex--;
continue;
}
var cellClass = "";
var colSpan = 0;
string? value = null;
RenderFragment? valueTemplate = null;
if (col.OnCellRender != null)
{
var cell = new TableCellArgs { Row = item, ColumnName = col.GetFieldName() };
col.OnCellRender(cell);
cellClass = cell.Class;
colSpan = cell.Colspan;
valueTemplate = cell.ValueTemplate;
value = cell.Value;
colIndex = colSpan;
}

var isFirstColOfTree = IsTree && index++ == 0;
var degree = 0;
var isExpand = false;
var hasChildren = false;
if (isFirstColOfTree)
{
var treeItem = TreeNodeCache.Find(TreeRows, item, out degree);
if (treeItem != null)
{
isExpand = treeItem.IsExpand;
hasChildren = treeItem.HasChildren;
}
}
var hasTreeChildren = isFirstColOfTree && hasChildren;
var context = new TableContentCellContext<TItem>()
{
Item = item,
ColSpan = colSpan,
Col = col,
CellClass = cellClass,
HasTreeChildren = hasTreeChildren,
IsInCell = isInCell,
Degree = degree,
IsExpand = isExpand,
IsFirstColOfTree = isFirstColOfTree,
ValueTemplate = valueTemplate,
Value = value
};

builder.AddContent(0, RenderContentCell(context));
}
};

/// <summary>
/// 渲染单元格方法
/// </summary>
Expand Down
31 changes: 31 additions & 0 deletions src/BootstrapBlazor/Components/Table/TableContentCellContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the Apache 2.0 License
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

namespace BootstrapBlazor.Components;

readonly record struct TableContentCellContext<TItem>
{
public TItem Item { get; init; }

public int ColSpan { get; init; }

public ITableColumn Col { get; init; }

public string? CellClass { get; init; }

public bool HasTreeChildren { get; init; }

public bool IsInCell { get; init; }

public int Degree { get; init; }

public bool IsExpand { get; init; }

public bool IsFirstColOfTree { get; init; }

public RenderFragment? ValueTemplate { get; init; }

public string? Value { get; init; }
}
Loading