Merge branch 'main' into feat-upload

Author: ArgoZhang

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.7.1-beta01</Version>
+    <Version>9.7.1-beta02</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Components/BaseComponents/IdComponentBase.cs

@@ -29,16 +29,6 @@ public abstract class IdComponentBase : BootstrapComponentBase
     /// </summary>
     protected virtual string? RetrieveId() => Id;
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    protected override void OnInitialized()
-    {
-        base.OnInitialized();
-
-        Id ??= ComponentIdGenerator.Generate(this);
-    }
-
     /// <summary>
     /// <inheritdoc/>
     /// </summary>

src/BootstrapBlazor/Components/Select/Select.razor.js

@@ -50,6 +50,13 @@ export function hide(id) {
     }
 }
 
+export function resetValue(id, value) {
+    const input = document.getElementById(id);
+    if (input) {
+        input.value = value;
+    }
+}
+
 export function dispose(id) {
     const select = Data.get(id)
     Data.remove(id)

src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor

@@ -16,7 +16,7 @@
         <div class="dropdown-toggle" data-bs-toggle="@ToggleString" data-bs-placement="@PlacementString" data-bs-offset="@OffsetString" data-bs-custom-class="@CustomClassString">
             @if (DisplayTemplate != null)
             {
-                <div id="@InputId" class="@InputClassString" tabindex="0">
+                <div id="@InputId" class="@InputClassString">
                     @DisplayTemplate(SelectedRow)
                 </div>
             }

src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor.cs

@@ -70,10 +70,11 @@ public partial class SelectGeneric<TValue> : ISelectGeneric<TValue>, IModelEqual
 
     /// <summary>
     /// 获得/设置 选项输入更新后转换为 Value 回调方法 默认 null
+    /// <para>返回值为 null 时放弃操作</para>
     /// </summary>
     /// <remarks>设置 <see cref="IsEditable"/> 后生效</remarks>
     [Parameter]
-    public Func<string, Task<TValue>>? TextConvertToValueCallback { get; set; }
+    public Func<string, Task<TValue?>>? TextConvertToValueCallback { get; set; }
 
     /// <summary>
     /// 获得/设置 选项模板支持静态数据
@@ -486,17 +487,24 @@ private async Task OnChange(ChangeEventArgs args)
 
             if (item == null)
             {
-                TValue val = default!;
+                TValue? val = default;
                 if (TextConvertToValueCallback != null)
                 {
                     val = await TextConvertToValueCallback(v);
                 }
-                item = new SelectedItem<TValue>(val, v);
 
-                var items = new List<SelectedItem<TValue>>() { item };
-                items.AddRange(Items);
-                Items = items;
-                CurrentValue = val;
+                if (val is not null)
+                {
+                    item = new SelectedItem<TValue>(val, v);
+                    var items = new List<SelectedItem<TValue>>() { item };
+                    items.AddRange(Items);
+                    Items = items;
+                    CurrentValue = val;
+                }
+                else
+                {
+                    await InvokeVoidAsync("resetValue", InputId, SelectedRow?.Text);
+                }
             }
             else
             {

src/BootstrapBlazor/Components/Tab/TabItem.cs

@@ -8,7 +8,7 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// TabItem component
 /// </summary>
-public class TabItem : ComponentBase
+public class TabItem : IdComponentBase
 {
     /// <summary>
     /// Gets or sets the text. Default is null

src/BootstrapBlazor/Components/Tab/TabItemContent.cs

@@ -15,13 +15,6 @@ internal class TabItemContent : IComponent
     [Parameter, NotNull]
     public TabItem? Item { get; set; }
 
-    /// <summary>
-    /// Gets <see cref="IComponentIdGenerator"/> instrance
-    /// </summary>
-    [Inject]
-    [NotNull]
-    private IComponentIdGenerator? ComponentIdGenerator { get; set; }
-
     private RenderHandle _renderHandle;
 
     void IComponent.Attach(RenderHandle renderHandle)
@@ -49,7 +42,7 @@ private void BuildRenderTree(RenderTreeBuilder builder)
         builder.OpenElement(0, "div");
         builder.SetKey(_key);
         builder.AddAttribute(5, "class", ClassString);
-        builder.AddAttribute(6, "id", ComponentIdGenerator.Generate(Item));
+        builder.AddAttribute(6, "id", Item.Id);
         builder.AddContent(10, Item.ChildContent);
         builder.CloseElement();
     }

test/UnitTest/Components/SelectGenericTest.cs

@@ -856,14 +856,31 @@ public async Task IsEditable_Ok()
             });
             pb.Add(a => a.TextConvertToValueCallback, v =>
             {
-                return Task.FromResult(v);
+                return Task.FromResult(v)!;
             });
         });
         Assert.False(input.IsReadOnly());
 
         await cut.InvokeAsync(() => { input.Change("Test3"); });
         Assert.Equal("Test3", cut.Instance.Value);
         Assert.True(updated);
+
+        // 覆盖返回 null 逻辑
+        cut.SetParametersAndRender(pb =>
+        {
+            pb.Add(a => a.TextConvertToValueCallback, async v =>
+            {
+                await Task.Yield();
+                return null;
+            });
+        });
+        await cut.InvokeAsync(() => { input.Change("Test4"); });
+
+        cut.SetParametersAndRender(pb =>
+        {
+           pb.Add(a => a.Value, null);
+        });
+        await cut.InvokeAsync(() => { input.Change("Test5"); });
     }
 
     [Fact]
@@ -881,7 +898,7 @@ public async Task IsEditable_Generic()
             pb.Add(a => a.IsEditable, true);
             pb.Add(a => a.TextConvertToValueCallback, v =>
             {
-                return Task.FromResult(new Foo() { Id = 3, Address = "Foo3" });
+                return Task.FromResult(new Foo() { Id = 3, Address = "Foo3" })!;
             });
         });