From 3be46a4ac590c4c063b42412e267fead30449132 Mon Sep 17 00:00:00 2001
From: Diego <2248356998@qq.com>
Date: Fri, 21 Mar 2025 14:56:37 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BE=8B=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Samples/Selects.razor                     | 9 +++++++++
 .../Components/Samples/Selects.razor.cs                  | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor
index b54eedfce0a..f4d1c5062f8 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor
@@ -36,6 +36,15 @@
         <div class="col-12 col-sm-6">
             <Select Color="Color.Dark" Items="Items" @bind-Value="Model.Name"></Select>
         </div>
+
+
+
+        <div class="col-12 col-sm-6">
+                <Select IsVirtualize @bind-Value="@TestId" Items="@TestItems"
+
+ />
+        </div>
+
     </div>
     <ConsoleLogger @ref="Logger" />
 </DemoBlock>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs
index 4eb82111198..5dc0183754f 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs
@@ -10,6 +10,13 @@ namespace BootstrapBlazor.Server.Components.Samples;
 /// </summary>
 public sealed partial class Selects
 {
+    private long TestId { get; set; } = 1;
+    private IEnumerable<SelectedItem> TestItems { get; set; } = new[]
+{
+        new SelectedItem ("1", "mm1"),
+        new SelectedItem ("2", "mm2") 
+    };
+
     [NotNull]
     private ConsoleLogger? Logger { get; set; }
 

From fdd97e3434058281208f5488f3525baead1e5d07 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 21 Mar 2025 16:07:08 +0800
Subject: [PATCH 2/8] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=20DefaultVir?=
 =?UTF-8?q?tualizeItemText=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Select/Select.razor.cs | 8 +++++++-
 src/BootstrapBlazor/Components/Select/SelectBase.cs   | 8 --------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Select/Select.razor.cs b/src/BootstrapBlazor/Components/Select/Select.razor.cs
index 5786295d175..4bca9288424 100644
--- a/src/BootstrapBlazor/Components/Select/Select.razor.cs
+++ b/src/BootstrapBlazor/Components/Select/Select.razor.cs
@@ -118,6 +118,12 @@ public partial class Select<TValue> : ISelect, ILookup
     [Parameter]
     public object? LookupServiceData { get; set; }
 
+    /// <summary>
+    /// Gets or sets the default text for virtualized items. Default is null.
+    /// </summary>
+    [Parameter]
+    public string? DefaultVirtualizeItemText { get; set; }
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -172,7 +178,7 @@ private SelectedItem? SelectedRow
         if (IsVirtualize)
         {
             _init = false;
-            return new SelectedItem(CurrentValueAsString, CurrentValueAsString);
+            return new SelectedItem(CurrentValueAsString, DefaultVirtualizeItemText ?? CurrentValueAsString);
         }
 
         var item = GetItemWithEnumValue()
diff --git a/src/BootstrapBlazor/Components/Select/SelectBase.cs b/src/BootstrapBlazor/Components/Select/SelectBase.cs
index efacfbd4cf6..8e7b0862f32 100644
--- a/src/BootstrapBlazor/Components/Select/SelectBase.cs
+++ b/src/BootstrapBlazor/Components/Select/SelectBase.cs
@@ -111,14 +111,6 @@ public abstract class SelectBase<TValue> : PopoverSelectBase<TValue>
     [Parameter]
     public int OverscanCount { get; set; } = 4;
 
-    /// <summary>
-    /// Gets or sets the default text for virtualized items. Default is null.
-    /// </summary>
-    [Parameter]
-    [ExcludeFromCodeCoverage]
-    [Obsolete("已弃用，删除即可；Deprecated, just delete")]
-    public string? DefaultVirtualizeItemText { get; set; }
-
     /// <summary>
     /// Gets or sets the callback method when the clear button is clicked. Default is null.
     /// </summary>

From 7c1a589b134cac34de9d1f8faeb2a02aa1edcf9d Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 21 Mar 2025 16:24:33 +0800
Subject: [PATCH 3/8] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E6=8F=90=E9=AB=98=E5=8F=AF=E8=AF=BB=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Select/Select.razor.cs         | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Select/Select.razor.cs b/src/BootstrapBlazor/Components/Select/Select.razor.cs
index 4bca9288424..07b418f8785 100644
--- a/src/BootstrapBlazor/Components/Select/Select.razor.cs
+++ b/src/BootstrapBlazor/Components/Select/Select.razor.cs
@@ -175,17 +175,7 @@ private SelectedItem? SelectedRow
             return null;
         }
 
-        if (IsVirtualize)
-        {
-            _init = false;
-            return new SelectedItem(CurrentValueAsString, DefaultVirtualizeItemText ?? CurrentValueAsString);
-        }
-
-        var item = GetItemWithEnumValue()
-            ?? Rows.Find(i => i.Value == CurrentValueAsString)
-            ?? Rows.Find(i => i.Active)
-            ?? Rows.FirstOrDefault(i => !i.IsDisabled);
-
+        var item = IsVirtualize ? GetItemByVirtulized() : GetItemByRows();
         if (item != null)
         {
             if (_init && DisableItemChangedWhenFirstRender)
@@ -201,9 +191,18 @@ private SelectedItem? SelectedRow
         return item;
     }
 
-    private SelectedItem? GetItemWithEnumValue() => ValueType.IsEnum
-        ? Rows.Find(i => i.Value == Convert.ToInt32(Value).ToString())
-        : null;
+    private SelectedItem? GetItemWithEnumValue() => ValueType.IsEnum ? Rows.Find(i => i.Value == Convert.ToInt32(Value).ToString()) : null;
+
+    private SelectedItem GetItemByVirtulized() => new(CurrentValueAsString, DefaultVirtualizeItemText ?? CurrentValueAsString);
+
+    private SelectedItem? GetItemByRows()
+    {
+        var item = GetItemWithEnumValue()
+            ?? Rows.Find(i => i.Value == CurrentValueAsString)
+            ?? Rows.Find(i => i.Active)
+            ?? Rows.FirstOrDefault(i => !i.IsDisabled);
+        return item;
+    }
 
     /// <summary>
     /// <inheritdoc/>

From 58c350f8bd8015569d09aece0010950f9f7bee3f Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 21 Mar 2025 16:24:40 +0800
Subject: [PATCH 4/8] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/SelectTest.cs | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/test/UnitTest/Components/SelectTest.cs b/test/UnitTest/Components/SelectTest.cs
index c3956644435..b4c5140ac1e 100644
--- a/test/UnitTest/Components/SelectTest.cs
+++ b/test/UnitTest/Components/SelectTest.cs
@@ -371,7 +371,7 @@ await cut.InvokeAsync(() =>
     }
 
     [Fact]
-    public void DisableItemChangedWhenFirstRender_Ok()
+    public void DisableItemChangedWhenFirstRender_False()
     {
         var triggered = false;
 
@@ -394,6 +394,30 @@ public void DisableItemChangedWhenFirstRender_Ok()
         Assert.False(triggered);
     }
 
+    [Fact]
+    public void DisableItemChangedWhenFirstRender_True()
+    {
+        var triggered = false;
+
+        // 空值时，不触发 OnSelectedItemChanged 回调
+        var cut = Context.RenderComponent<Select<string>>(pb =>
+        {
+            pb.Add(a => a.Items, new SelectedItem[]
+            {
+                new("1", "Test"),
+                new("2", "Test2")
+            });
+            pb.Add(a => a.Value, "");
+            pb.Add(a => a.OnSelectedItemChanged, item =>
+            {
+                triggered = true;
+                return Task.CompletedTask;
+            });
+            pb.Add(a => a.DisableItemChangedWhenFirstRender, false);
+        });
+        Assert.True(triggered);
+    }
+
     [Fact]
     public void Color_Ok()
     {

From 7627af17387daff0d664998b0628806dd308718a Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 21 Mar 2025 16:30:26 +0800
Subject: [PATCH 5/8] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/SelectTest.cs | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/test/UnitTest/Components/SelectTest.cs b/test/UnitTest/Components/SelectTest.cs
index b4c5140ac1e..9e0fa240e2a 100644
--- a/test/UnitTest/Components/SelectTest.cs
+++ b/test/UnitTest/Components/SelectTest.cs
@@ -760,6 +760,30 @@ public void ItemClick_Ok()
         });
     }
 
+    [Fact]
+    public void DefaultVirtualizeItemText_Ok()
+    {
+        var cut = Context.RenderComponent<Select<string>>(pb =>
+        {
+            pb.Add(a => a.Items, new SelectedItem[]
+            {
+                new("1", "Test1"),
+                new("2", "Test2")
+            });
+            pb.Add(a => a.Value, "3");
+            pb.Add(a => a.IsVirtualize, true);
+        });
+
+        var input = cut.Find(".form-select");
+        Assert.Contains("value=\"3\"", input.OuterHtml);
+
+        cut.SetParametersAndRender(pb =>
+        {
+            pb.Add(a => a.DefaultVirtualizeItemText, "Test3");
+        });
+        Assert.Contains("value=\"Test3\"", input.OuterHtml);
+    }
+
     [Fact]
     public void IsVirtualize_Items()
     {

From 1b6eed0bdbada388641a74fe306b5e98309101c7 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 21 Mar 2025 16:31:00 +0800
Subject: [PATCH 6/8] =?UTF-8?q?revert:=20=E6=92=A4=E9=94=80=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Samples/Selects.razor                     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor
index f4d1c5062f8..b54eedfce0a 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor
@@ -36,15 +36,6 @@
         <div class="col-12 col-sm-6">
             <Select Color="Color.Dark" Items="Items" @bind-Value="Model.Name"></Select>
         </div>
-
-
-
-        <div class="col-12 col-sm-6">
-                <Select IsVirtualize @bind-Value="@TestId" Items="@TestItems"
-
- />
-        </div>
-
     </div>
     <ConsoleLogger @ref="Logger" />
 </DemoBlock>

From fed92f162fb7b49b20b16a21c2c9c91fb977bdcf Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 21 Mar 2025 16:31:55 +0800
Subject: [PATCH 7/8] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/TreeViewTest.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/UnitTest/Components/TreeViewTest.cs b/test/UnitTest/Components/TreeViewTest.cs
index 13b1d6a249a..36f9c70bfe3 100644
--- a/test/UnitTest/Components/TreeViewTest.cs
+++ b/test/UnitTest/Components/TreeViewTest.cs
@@ -596,6 +596,7 @@ public async Task IsVirtualize_Ok()
         {
             pb.Add(a => a.IsVirtualize, true);
             pb.Add(a => a.RowHeight, 30f);
+            pb.Add(a => a.OverscanCount, 4);
             pb.Add(a => a.OnExpandNodeAsync, async item =>
             {
                 await Task.Delay(10);

From dce30594931f1452c9fd4aa37307a424e560af0a Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 21 Mar 2025 16:36:58 +0800
Subject: [PATCH 8/8] =?UTF-8?q?doc:=20=E6=92=A4=E9=94=80=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Samples/Selects.razor.cs                    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs
index 5dc0183754f..4eb82111198 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs
@@ -10,13 +10,6 @@ namespace BootstrapBlazor.Server.Components.Samples;
 /// </summary>
 public sealed partial class Selects
 {
-    private long TestId { get; set; } = 1;
-    private IEnumerable<SelectedItem> TestItems { get; set; } = new[]
-{
-        new SelectedItem ("1", "mm1"),
-        new SelectedItem ("2", "mm2") 
-    };
-
     [NotNull]
     private ConsoleLogger? Logger { get; set; }