diff --git a/src/BootstrapBlazor.Server/Components/Samples/TreeViews.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/TreeViews.razor.cs index 45fdeba725e..f3c5919083a 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/TreeViews.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/TreeViews.razor.cs @@ -117,7 +117,7 @@ private Task OnMaxSelectedCountExceed() return ToastService.Information(Localizer["OnMaxSelectedCountExceedTitle"], Localizer["OnMaxSelectedCountExceedContent", 2]); } - private Task OnTreeItemChecked(List> items) + private Task OnTreeItemChecked(IList> items) { Logger2.Log($"当前共选中{items.Count}项"); return Task.CompletedTask; @@ -149,7 +149,7 @@ private static Task OnFormTreeItemClick(TreeViewItem item) return Task.CompletedTask; } - private Task OnTreeItemChecked2(List> items) + private Task OnTreeItemChecked2(IList> items) { Logger3.Log($"当前共选中{items.Count}项"); return Task.CompletedTask; @@ -191,7 +191,7 @@ private Task SelectedItemOnChanged(SelectedItem selectedItem) return ret; } - private static async Task>?> OnSearchAsync(string searchText) + private static async Task>?> OnSearchAsync(string searchText) { await Task.Delay(20); diff --git a/src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs b/src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs index a1b1a7aacd2..02fd5ea4647 100644 --- a/src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs +++ b/src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs @@ -158,20 +158,20 @@ public partial class TreeView : IModelEqualityComparer /// /// 通过设置 开启 [Parameter] - public Func>?>>? OnSearchAsync { get; set; } + public Func>?>>? OnSearchAsync { get; set; } /// /// 获得/设置 带层次数据集合 /// [Parameter] [NotNull] - public List>? Items { get; set; } + public IList>? Items { get; set; } ///// ///// 获得/设置 扁平化数据集合注意 参数一定要赋值,不然无法呈现层次结构 ///// //[Parameter] - //public List>? FlatItems { get; set; } + //public IList>? FlatItems { get; set; } /// /// 获得/设置 是否显示 CheckBox 默认 false 不显示 @@ -207,7 +207,7 @@ public partial class TreeView : IModelEqualityComparer /// 获得/设置 树形控件节点选中时回调委托 /// [Parameter] - public Func>, Task>? OnTreeItemChecked { get; set; } + public Func>, Task>? OnTreeItemChecked { get; set; } /// /// 获得/设置 点击节点获取子数据集合回调方法 @@ -450,7 +450,7 @@ public async ValueTask TriggerKeyDown(string key) /// /// [JSInvokable] - public Task> GetParentsState(List items) + public Task> GetParentsState(IList items) { var rows = Rows; var result = items.Select(i => @@ -464,12 +464,12 @@ public Task> GetParentsState(List items) item.CheckedState = checkedState; return checkedState; }).ToList(); - return Task.FromResult(result); + return Task.FromResult>(result); } private static bool IsExpand(TreeViewItem item) => item.IsExpand && item.Items.Count > 0; - private List> GetItems(TreeViewItem item) => item.Parent?.Items ?? Items; + private IList> GetItems(TreeViewItem item) => item.Parent?.Items ?? Items; private async Task ActiveTreeViewItem(string key, TreeViewItem item) { @@ -615,7 +615,7 @@ private async Task OnEnterAsync(string? searchText) private Task OnEscAsync(string? searchText) => OnClickResetSearch(); - private List>? _searchItems; + private IList>? _searchItems; private async Task OnClickSearch() { @@ -649,7 +649,7 @@ public void SetActiveItem(TreeViewItem? item) /// /// 重新设置 数据源方法 /// - public void SetItems(List> items) + public void SetItems(IList> items) { //FlatItems = null; Items = items; @@ -661,7 +661,7 @@ public void SetItems(List> items) ///// 重新设置 数据源方法 ///// ///// - //public void SetFlatItems(List> flatItems) + //public void SetFlatItems(IList> flatItems) //{ // Items = null; // FlatItems = flatItems; @@ -793,7 +793,7 @@ private async Task OnCheckStateChanged(TreeViewItem item, CheckboxState s /// public void ClearCheckedItems() { - Items.ForEach(item => + foreach (var item in Items) { item.CheckedState = CheckboxState.UnChecked; TreeNodeStateCache.ToggleCheck(item); @@ -802,7 +802,7 @@ public void ClearCheckedItems() s.CheckedState = CheckboxState.UnChecked; TreeNodeStateCache.ToggleCheck(s); }); - }); + } StateHasChanged(); } @@ -879,9 +879,9 @@ private void OnTouchEnd() TouchStart = false; } - private List>? _rows = null; + private IList>? _rows = null; - private List> Rows + private IList> Rows { get { @@ -891,7 +891,7 @@ private List> Rows } } - private List> GetTreeItems() => _searchItems ?? Items; + private IList> GetTreeItems() => _searchItems ?? Items; private static string? GetTreeRowStyle(TreeViewItem item) { diff --git a/src/BootstrapBlazor/Misc/ExpandableNodeCache.cs b/src/BootstrapBlazor/Misc/ExpandableNodeCache.cs index 409e3380932..018dc7342f7 100644 --- a/src/BootstrapBlazor/Misc/ExpandableNodeCache.cs +++ b/src/BootstrapBlazor/Misc/ExpandableNodeCache.cs @@ -130,7 +130,7 @@ public async Task CheckExpandAsync(TNode node, Func查询结果 查无资料时为 null /// 是否存在 /// 采广度优先搜寻 - public bool TryFind(List items, TItem target, [MaybeNullWhen(false)] out TNode ret) + public bool TryFind(IList items, TItem target, [MaybeNullWhen(false)] out TNode ret) { ret = Find(items, target); return ret != null; @@ -143,7 +143,7 @@ public bool TryFind(List items, TItem target, [MaybeNullWhen(false)] out /// /// 查询结果 查无资料时为 null /// 采广度优先搜寻 - private TNode? Find(List items, TItem target) => Find(items, target, out _); + private TNode? Find(IList items, TItem target) => Find(items, target, out _); /// /// 在全部树状结构 中寻找指定 @@ -153,7 +153,7 @@ public bool TryFind(List items, TItem target, [MaybeNullWhen(false)] out /// 树状阶层,起始为0 /// 查询结果 查无资料时为 null /// 采广度优先搜寻 - public TNode? Find(List source, TItem target, out int degree) + public TNode? Find(IList source, TItem target, out int degree) { degree = -1; var ret = source.FirstOrDefault(item => EqualityComparer.Equals(item.Value, target)); diff --git a/src/BootstrapBlazor/Misc/TreeNodeCache.cs b/src/BootstrapBlazor/Misc/TreeNodeCache.cs index 76e5fc37566..be005a3bb24 100644 --- a/src/BootstrapBlazor/Misc/TreeNodeCache.cs +++ b/src/BootstrapBlazor/Misc/TreeNodeCache.cs @@ -92,7 +92,7 @@ private void IsChecked(TNode node) CheckChildren(nodes, node); } - private void CheckChildren(List> nodes, TNode node) + private void CheckChildren(IList> nodes, TNode node) { if (nodes.Count != 0) { @@ -123,7 +123,7 @@ private void CheckChildren(List> nodes, TNode node) /// 重置是否选中状态 /// /// - public void IsChecked(List nodes) + public void IsChecked(IList nodes) { if (nodes.Count != 0) { @@ -131,7 +131,7 @@ public void IsChecked(List nodes) } } - private void ResetCheckNodes(List items) + private void ResetCheckNodes(IList items) { // 恢复当前节点状态 foreach (var node in items) @@ -153,7 +153,7 @@ private void ResetCheckNodes(List items) /// 数据集合 /// 指定节点 /// - public TNode? FindParentNode(List nodes, TNode node) + public TNode? FindParentNode(IList nodes, TNode node) { TNode? ret = default; foreach (var treeNode in nodes)