Skip to content

Commit f026596

Browse files
committed
refactor: 弃用 OnAutoFitContentAsync 改用 OnAutoFitColumnWidthCallback 回调方法
1 parent 52e0fca commit f026596

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

src/BootstrapBlazor/Components/Table/Table.razor.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ private async Task OnTableRenderAsync(bool firstRender)
10651065
await InvokeVoidAsync("init", Id, Interop, new
10661066
{
10671067
DragColumnCallback = nameof(DragColumnCallback),
1068-
AutoFitContentCallback = OnAutoFitContentAsync == null ? null : nameof(AutoFitContentCallback),
1068+
AutoFitColumnWidthCallback = OnAutoFitColumnWidthCallback == null ? null : nameof(AutoFitContentCallback),
10691069
ResizeColumnCallback = OnResizeColumnAsync != null ? nameof(ResizeColumnCallback) : null,
10701070
ColumnMinWidth = ColumnMinWidth ?? Options.CurrentValue.TableSettings.ColumnMinWidth,
10711071
ScrollWidth = ActualScrollWidth,
@@ -1588,8 +1588,16 @@ private async Task OnContextMenu(MouseEventArgs e, TItem item)
15881588
/// 获得/设置 自动调整列宽回调方法
15891589
/// </summary>
15901590
[Parameter]
1591+
[Obsolete("已弃用,请使用 OnAutoFitColumnWidthCallback 替代; Deprecated, please use OnAutoFitColumnWidthCallback instead")]
1592+
[ExcludeFromCodeCoverage]
15911593
public Func<string, float, Task<float>>? OnAutoFitContentAsync { get; set; }
15921594

1595+
/// <summary>
1596+
/// 获得/设置 自动调整列宽回调方法
1597+
/// </summary>
1598+
[Parameter]
1599+
public Func<string, float, Task<float>>? OnAutoFitColumnWidthCallback { get; set; }
1600+
15931601
/// <summary>
15941602
/// 列宽自适应方法
15951603
/// </summary>
@@ -1654,9 +1662,9 @@ public async Task ResizeColumnCallback(int index, float width)
16541662
public async Task<float> AutoFitContentCallback(string fieldName, float calcWidth)
16551663
{
16561664
float ret = 0;
1657-
if (OnAutoFitContentAsync != null)
1665+
if (OnAutoFitColumnWidthCallback != null)
16581666
{
1659-
ret = await OnAutoFitContentAsync(fieldName, calcWidth);
1667+
ret = await OnAutoFitColumnWidthCallback(fieldName, calcWidth);
16601668
}
16611669
return ret;
16621670
}

src/BootstrapBlazor/Components/Table/Table.razor.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -742,8 +742,8 @@ const autoFitColumnWidth = async (table, col) => {
742742
maxWidth = Math.max(maxWidth, calcCellWidth(cell));
743743
});
744744

745-
if (table.options.autoFitContentCallback !== null) {
746-
const widthValue = await table.invoke.invokeMethodAsync(table.options.autoFitContentCallback, field, maxWidth);
745+
if (table.options.autoFitColumnWidthCallback !== null) {
746+
const widthValue = await table.invoke.invokeMethodAsync(table.options.autoFitColumnWidthCallback, field, maxWidth);
747747
if (widthValue > 0) {
748748
maxWidth = widthValue;
749749
}

test/UnitTest/Components/TableTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8383,7 +8383,7 @@ public async Task AutoFitContentCallback_Ok()
83838383
pb.Add(a => a.AllowDragColumn, true);
83848384
pb.Add(a => a.ClientTableName, "table-unit-test");
83858385
pb.Add(a => a.OnQueryAsync, OnQueryAsync(localizer));
8386-
pb.Add(a => a.OnAutoFitContentAsync, (fieldName, calcWidth) =>
8386+
pb.Add(a => a.OnAutoFitColumnWidthCallback, (fieldName, calcWidth) =>
83878387
{
83888388
name = fieldName;
83898389
var resWidth = Math.Max(100.65f, calcWidth);

0 commit comments

Comments
 (0)