Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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/BootstrapBlazor.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.11.2-beta06</Version>
<Version>9.11.2-beta07</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
10 changes: 7 additions & 3 deletions src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -475,11 +475,15 @@ public Func<TItem, bool>? ShowDeleteButtonCallback
public IEnumerable<ITableColumn> GetVisibleColumns()
{
// 不可见列
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);
var items = _visibleColumns.Where(i => i.Visible).Select(a => a.Name).ToList();
return Columns.Where(i => !i.GetIgnore() && items.Contains(i.GetFieldName()) && 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)
{
var items = _visibleColumns.Where(i => i.Visible).Select(a => a.Name).Distinct().ToList();
return items.Contains(item.Name) && items.Count == 1;
}

private bool ShowAddForm { get; set; }

Expand Down
Loading