Skip to content

Commit cba3118

Browse files
committed
refactor: 重构代码
1 parent 4fc264a commit cba3118

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

src/BootstrapBlazor/Components/Table/Table.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<span class="caret"></span>
108108
</button>
109109
<div class="dropdown-menu dropdown-menu-end shadow">
110-
@foreach (var item in VisibleColumns)
110+
@foreach (var item in _visibleColumns)
111111
{
112112
<div class="dropdown-item">
113113
<Checkbox ShowAfterLabel="true" DisplayText="@item.DisplayName" IsDisabled="@GetColumnsListState(item)"

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -466,9 +466,7 @@ public Func<TItem, bool>? ShowDeleteButtonCallback
466466
/// <summary>
467467
/// 获得/设置 各列是否显示状态集合
468468
/// </summary>
469-
private List<ColumnVisibleItem> VisibleColumns { get; } = [];
470-
471-
private HashSet<string> _visibleColumnNames = [];
469+
private readonly List<ColumnVisibleItem> _visibleColumns = [];
472470

473471
/// <summary>
474472
/// 获得当前可见列集合
@@ -477,10 +475,11 @@ public Func<TItem, bool>? ShowDeleteButtonCallback
477475
public IEnumerable<ITableColumn> GetVisibleColumns()
478476
{
479477
// 不可见列
480-
return Columns.Where(i => !i.GetIgnore() && _visibleColumnNames.Contains(i.GetFieldName()) && ScreenSize >= i.ShownWithBreakPoint);
478+
var items = _visibleColumns.Where(i => i.Visible).ToList();
479+
return Columns.Where(i => !i.GetIgnore() && items.Find(v => v.Name == i.GetFieldName()) != null && ScreenSize >= i.ShownWithBreakPoint);
481480
}
482481

483-
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;
482+
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;
484483

485484
private bool ShowAddForm { get; set; }
486485

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,9 +1276,9 @@ private void InternalResetVisibleColumns(List<ITableColumn> columns, IEnumerable
12761276
}
12771277
}
12781278
}
1279-
VisibleColumns.Clear();
1280-
VisibleColumns.AddRange(cols);
1281-
_visibleColumnNames = [.. VisibleColumns.Where(i => i.Visible).Select(a => a.Name)];
1279+
_visibleColumns.Clear();
1280+
_visibleColumns.AddRange(cols);
1281+
_visibleColumnNames = [.. _visibleColumns.Where(i => i.Visible).Select(a => a.Name)];
12821282
}
12831283

12841284
/// <summary>

0 commit comments

Comments
 (0)