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
41 changes: 22 additions & 19 deletions src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ protected override async Task OnParametersSetAsync()
{
if (IsReset)
{
_rows = null;
TreeNodeStateCache.Reset();
}
else
Expand Down Expand Up @@ -822,35 +823,37 @@ private void OnTouchEnd()
TouchStart = false;
}

private List<TreeViewItem<TItem>> Rows => GetTreeRows(Items);

private List<TreeViewItem<TItem>>? _rows = null;

#if NET9_0_OR_GREATER
private readonly Lock _object = new();
#else
private readonly object _object = new();
#endif
private List<TreeViewItem<TItem>> Rows
{
get
{
_rows ??= GetTreeRows(Items);
return _rows;
}
}

private List<TreeViewItem<TItem>> GetTreeRows(List<TreeViewItem<TItem>> items)
/// <summary>
/// 将带层次结构的数据转换为扁平化数据
/// </summary>
/// <param name="items"></param>
/// <returns></returns>
private static List<TreeViewItem<TItem>> GetTreeRows(List<TreeViewItem<TItem>> items)
{
lock (_object)
var rows = new List<TreeViewItem<TItem>>();
if (items != null)
{
var rows = new List<TreeViewItem<TItem>>();
if (items != null)
foreach (var item in items)
{
foreach (var item in items)
rows.Add(item);
if (item.IsExpand)
{
rows.Add(item);
if (item.IsExpand)
{
rows.AddRange(GetTreeRows(item.Items));
}
rows.AddRange(GetTreeRows(item.Items));
}
}
_rows ??= rows;
return rows;
}
return rows;
}

private static string? GetTreeRowStyle(TreeViewItem<TItem> item)
Expand Down
4 changes: 2 additions & 2 deletions src/BootstrapBlazor/Extensions/JSModuleExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ public static async Task<JSModule> LoadModule(this IJSRuntime jsRuntime, string
fileName = $"{fileName}?v={version}";
}

var jSObjectReference = await jsRuntime.InvokeAsync<IJSObjectReference>(identifier: "import", fileName);
return new JSModule(jSObjectReference);
var jSObjectReference = await jsRuntime.InvokeAsync<IJSObjectReference>(identifier: "import", fileName);
return new JSModule(jSObjectReference);
}

/// <summary>
Expand Down
Loading