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
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.9.3-beta01</Version>
<Version>9.9.3-beta02</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Select/SelectTree.razor
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
else
{
<input type="text" id="@InputId" readonly disabled="@Disabled" placeholder="@PlaceHolder" class="@InputClassName" value="@SelectedItem?.Text" />
<input type="text" id="@InputId" readonly disabled="@Disabled" placeholder="@PlaceHolder" class="@InputClassName" value="@_selectedItem?.Text" />
}
<span class="@AppendClassName"><i class="@DropdownIcon"></i></span>
</div>
Expand Down
49 changes: 17 additions & 32 deletions src/BootstrapBlazor/Components/Select/SelectTree.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ public partial class SelectTree<TValue> : IModelEqualityComparer<TValue>
[NotNull]
private IStringLocalizer<SelectTree<TValue>>? Localizer { get; set; }

[Inject]
[NotNull]
private IIconTheme? IconTheme { get; set; }

/// <summary>
/// 获得 input 组件 Id 方法
/// </summary>
Expand All @@ -161,19 +165,9 @@ public partial class SelectTree<TValue> : IModelEqualityComparer<TValue>
/// </summary>
private string? InputId => $"{Id}_input";

/// <summary>
/// 获得/设置 上次选项
/// </summary>
private TreeViewItem<TValue>? SelectedItem { get; set; }

private List<TreeViewItem<TValue>>? ItemCache { get; set; }

[NotNull]
private List<TreeViewItem<TValue>>? ExpandedItemsCache { get; set; }

[Inject]
[NotNull]
private IIconTheme? IconTheme { get; set; }
private TreeViewItem<TValue>? _selectedItem;
private List<TreeViewItem<TValue>>? _itemCache;
private List<TreeViewItem<TValue>>? _expandedItemsCache;

private string? SelectTreeCustomClassString => CssBuilder.Default(CustomClassString)
.AddClass("select-tree", IsPopover)
Expand All @@ -190,19 +184,6 @@ protected override void OnInitialized()
AddRequiredValidator();
}

/// <summary>
/// <inheritdoc/>
/// </summary>
protected override async Task OnInitializedAsync()
{
await base.OnInitializedAsync();

if (Value != null)
{
await TriggerItemChanged(s => Equals(s.Value, Value));
}
}

/// <summary>
/// <inheritdoc/>
/// </summary>
Expand Down Expand Up @@ -263,18 +244,22 @@ private async Task TriggerItemChanged(Func<TreeViewItem<TValue>, bool> predicate
if (currentItem != null)
{
currentItem.IsActive = true;
await ItemChanged(currentItem);

if (_selectedItem == null || !Equals(_selectedItem.Value, Value))
{
await ItemChanged(currentItem);
}
}
}

private List<TreeViewItem<TValue>> GetExpandedItems()
{
if (ItemCache != Items)
if (_itemCache != Items)
{
ItemCache = Items;
ExpandedItemsCache = TreeViewExtensions.GetAllItems(ItemCache).ToList();
_itemCache = Items;
_expandedItemsCache = [.. TreeViewExtensions.GetAllItems(_itemCache)];
}
return ExpandedItemsCache;
return _expandedItemsCache!;
}

/// <summary>
Expand All @@ -295,7 +280,7 @@ private async Task OnItemClick(TreeViewItem<TValue> item)
/// <returns></returns>
private async Task ItemChanged(TreeViewItem<TValue> item)
{
SelectedItem = item;
_selectedItem = item;
CurrentValue = item.Value;

// 触发 SelectedItemChanged 事件
Expand Down
Loading