Merge branch 'main' into dev-dom2image

Author: ArgoZhang

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

@@ -71,7 +71,7 @@
     <PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.3" />
-    <PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.6" />
+    <PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.7" />
     <PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
     <PackageReference Include="BootstrapBlazor.Tasks.Dashboard" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.TcpSocket" Version="9.0.0" />

src/BootstrapBlazor.Server/Components/Samples/SelectTables.razor.cs

@@ -99,14 +99,6 @@ class SelectTableMode
     /// <returns></returns>
     private AttributeItem[] GetAttributes() =>
     [
-        new()
-        {
-            Name = "Items",
-            Description = Localizer["AttributeItems"],
-            Type = "IEnumerable<TItem>",
-            ValueList = " — ",
-            DefaultValue = " — "
-        },
         new()
         {
             Name = "TableColumns",

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -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>

src/BootstrapBlazor/Components/Select/SelectTree.razor

@@ -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>

src/BootstrapBlazor/Components/Select/SelectTree.razor.cs

@@ -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>
@@ -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)
@@ -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>
@@ -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>
@@ -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 事件