From f129fcef5382400bf175fa0407f34f307212afe5 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Mon, 13 Oct 2025 12:20:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs index 3dad4b3a7a5..68db69ef686 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs @@ -475,8 +475,8 @@ public Func? ShowDeleteButtonCallback public IEnumerable 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; From 7e815d21eeaffc8f1f67ede873ed2794818fb702 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Mon, 13 Oct 2025 12:34:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=20GetColumns?= =?UTF-8?q?ListState=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs index 68db69ef686..846d8987f25 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs @@ -479,7 +479,11 @@ public IEnumerable GetVisibleColumns() 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; } From 3d138eb63132ede6fbd881537f19a4d50d889cc0 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Mon, 13 Oct 2025 12:34:23 +0800 Subject: [PATCH 3/4] chore: bump version 9.11.2-beta07 --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 4ad69d74b86..a5f50a44419 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.11.2-beta06 + 9.11.2-beta07 From 19d61f53afc46ff6bcc9c05cdfc767e4c347f14e Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Mon, 13 Oct 2025 12:46:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=20ToHashSet?= =?UTF-8?q?=20=E6=8F=90=E9=AB=98=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs index 846d8987f25..67c3314a4ef 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs @@ -475,13 +475,13 @@ public Func? ShowDeleteButtonCallback public IEnumerable GetVisibleColumns() { // 不可见列 - var items = _visibleColumns.Where(i => i.Visible).Select(a => a.Name).ToList(); + var items = _visibleColumns.Where(i => i.Visible).Select(a => a.Name).ToHashSet(); return Columns.Where(i => !i.GetIgnore() && items.Contains(i.GetFieldName()) && ScreenSize >= i.ShownWithBreakPoint); } private bool GetColumnsListState(ColumnVisibleItem item) { - var items = _visibleColumns.Where(i => i.Visible).Select(a => a.Name).Distinct().ToList(); + var items = _visibleColumns.Where(i => i.Visible).Select(a => a.Name).Distinct().ToHashSet(); return items.Contains(item.Name) && items.Count == 1; }