Skip to content
8 changes: 4 additions & 4 deletions src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ public async Task AddAsync()
{
// 数据源为 DataTable 新建后重建行与列
await DynamicContext.AddAsync(SelectedRows.OfType<IDynamicObject>());
await ResetDynamicContext();
ResetDynamicContext();

if (!IsKeepSelectedRowAfterAdd)
{
Expand Down Expand Up @@ -1030,7 +1030,7 @@ protected async Task DeleteAsync()
if (DynamicContext != null)
{
await DynamicContext.DeleteAsync(SelectedRows.OfType<IDynamicObject>());
await ResetDynamicContext();
ResetDynamicContext();
SelectedRows.Clear();
await OnSelectedRowsChanged();
}
Expand Down Expand Up @@ -1098,7 +1098,7 @@ async Task<bool> DeleteItemsAsync()
}
}

private async Task ResetDynamicContext()
private void ResetDynamicContext()
{
if (DynamicContext != null)
{
Expand All @@ -1112,7 +1112,7 @@ private async Task ResetDynamicContext()
FirstFixedColumnCache.Clear();
LastFixedColumnCache.Clear();

await InternalResetVisibleColumns(Columns);
InternalResetVisibleColumns(Columns);

var queryOption = BuildQueryPageOptions();
// 设置是否为首次查询
Expand Down
12 changes: 6 additions & 6 deletions src/BootstrapBlazor/Components/Table/Table.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ private async Task ProcessFirstRender()
await OnColumnCreating(cols);
}

await InternalResetVisibleColumns(cols);
InternalResetVisibleColumns(cols);

await ReloadColumnVisibleFromBrowserAsync();

Expand Down Expand Up @@ -1278,7 +1278,7 @@ private void ResetColumnWidth(List<ITableColumn> columns)
}
}

private async Task InternalResetVisibleColumns(List<ITableColumn> columns, IEnumerable<ColumnVisibleItem>? items = null)
private void InternalResetVisibleColumns(List<ITableColumn> columns, IEnumerable<ColumnVisibleItem>? items = null)
{
var cols = columns.Select(i => new ColumnVisibleItem(i.GetFieldName(), i.GetVisible()) { DisplayName = i.GetDisplayName() }).ToList();
if (items != null)
Expand All @@ -1304,15 +1304,15 @@ private async Task InternalResetVisibleColumns(List<ITableColumn> columns, IEnum
/// 设置 列可见方法
/// </summary>
/// <param name="columns"></param>
public async Task ResetVisibleColumns(IEnumerable<ColumnVisibleItem> columns)
public void ResetVisibleColumns(IEnumerable<ColumnVisibleItem> columns)
{
// https://github.com/dotnetcore/BootstrapBlazor/issues/6823
if (AllowResizing)
{
_resetColumns = true;
}

await InternalResetVisibleColumns(Columns, columns);
InternalResetVisibleColumns(Columns, columns);
StateHasChanged();
}

Expand Down Expand Up @@ -1507,7 +1507,7 @@ void SetDynamicEditTemplate()
if (DynamicContext.OnValueChanged != null)
{
var parameters = col.ComponentParameters?.ToList() ?? [];
parameters.Add(new(nameof(ValidateBase<string>.OnValueChanged), onValueChanged.Invoke(d, col, (model, column, val) => DynamicContext.OnValueChanged(model, column, val))));
parameters.Add(new(nameof(ValidateBase<>.OnValueChanged), onValueChanged.Invoke(d, col, (model, column, val) => DynamicContext.OnValueChanged(model, column, val))));
col.ComponentParameters = parameters;
}
builder.CreateComponentByFieldType(this, col, row, changedType, false, col.GetLookupService(InjectLookupService), skipValidate: true);
Expand All @@ -1518,7 +1518,7 @@ void SetEditTemplate()
{
var onValueChanged = Utility.GetOnValueChangedInvoke<TItem>(col.PropertyType);
var parameters = col.ComponentParameters?.ToList() ?? [];
parameters.Add(new(nameof(ValidateBase<string>.OnValueChanged), onValueChanged(item, col, (model, column, val) => InternalOnSaveAsync(model, ItemChangedType.Update))));
parameters.Add(new(nameof(ValidateBase<>.OnValueChanged), onValueChanged(item, col, (model, column, val) => InternalOnSaveAsync(model, ItemChangedType.Update))));
col.ComponentParameters = parameters;
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/BootstrapBlazor/Converter/ColumnVisibleItemConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

namespace BootstrapBlazor.Components;

/// <summary>
/// ColumnVisibleItem 序列化转化器
/// </summary>
public class ColumnVisibleItemConverter : JsonConverter<ColumnVisibleItem>
{
/// <summary>
Expand Down Expand Up @@ -45,7 +48,7 @@ public class ColumnVisibleItemConverter : JsonConverter<ColumnVisibleItem>
}
}
}
return new ColumnVisibleItem(name, visible);
return new ColumnVisibleItem(name ?? "", visible);
}

/// <summary>
Expand Down
Loading