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
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Table/Table.razor
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<span class="caret"></span>
</button>
<div class="dropdown-menu dropdown-menu-end shadow">
@foreach (var item in VisibleColumns)
@foreach (var item in _visibleColumns)
{
<div class="dropdown-item">
<Checkbox ShowAfterLabel="true" DisplayText="@item.DisplayName" IsDisabled="@GetColumnsListState(item)"
Expand Down
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 @@ -466,7 +466,7 @@ public Func<TItem, bool>? ShowDeleteButtonCallback
/// <summary>
/// 获得/设置 各列是否显示状态集合
/// </summary>
private List<ColumnVisibleItem> VisibleColumns { get; } = [];
private readonly List<ColumnVisibleItem> _visibleColumns = [];

/// <summary>
/// 获得当前可见列集合
Expand All @@ -475,11 +475,11 @@ public Func<TItem, bool>? ShowDeleteButtonCallback
public IEnumerable<ITableColumn> GetVisibleColumns()
{
// 不可见列
var items = VisibleColumns.Where(i => i.Visible);
return Columns.Where(i => !i.GetIgnore() && items.Any(v => v.Name == i.GetFieldName()) && ScreenSize >= i.ShownWithBreakPoint);
var items = _visibleColumns.Where(i => i.Visible).ToList();
return Columns.Where(i => !i.GetIgnore() && items.Find(v => v.Name == i.GetFieldName()) != null && ScreenSize >= i.ShownWithBreakPoint);
}

private bool GetColumnsListState(ColumnVisibleItem item) => VisibleColumns.Find(i => i.Name == item.Name) is { Visible: true } && VisibleColumns.Where(i => i.Visible).DistinctBy(i => i.Name).Count(i => i.Visible) == 1;
private bool GetColumnsListState(ColumnVisibleItem item) => _visibleColumns.Find(i => i.Name == item.Name) is { Visible: true } && _visibleColumns.Where(i => i.Visible).DistinctBy(i => i.Name).Count(i => i.Visible) == 1;

private bool ShowAddForm { get; set; }

Expand Down
4 changes: 2 additions & 2 deletions src/BootstrapBlazor/Components/Table/Table.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1276,8 +1276,8 @@ private void InternalResetVisibleColumns(List<ITableColumn> columns, IEnumerable
}
}
}
VisibleColumns.Clear();
VisibleColumns.AddRange(cols);
_visibleColumns.Clear();
_visibleColumns.AddRange(cols);
}

/// <summary>
Expand Down
Loading