From dff22b346e830311de4695a0cb4f7eb07ac7125b Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 31 May 2025 09:13:04 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20resetValue=20?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Select/Select.razor.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/BootstrapBlazor/Components/Select/Select.razor.js b/src/BootstrapBlazor/Components/Select/Select.razor.js index af61156b497..cc92dab3e86 100644 --- a/src/BootstrapBlazor/Components/Select/Select.razor.js +++ b/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) From f929b822a1d67f3e2dad5d6538aa44a208210058 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 31 May 2025 09:13:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=20tabindex?= =?UTF-8?q?=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/SelectGeneric/SelectGeneric.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor b/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor index 635e0a65d2d..72d2c846123 100644 --- a/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor +++ b/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor @@ -16,7 +16,7 @@
@if (DisplayTemplate != null) { -
+
@DisplayTemplate(SelectedRow)
} From 8e7cede28a4f73d79aaa1ac14550eb65509a49bb Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 31 May 2025 09:14:24 +0800 Subject: [PATCH 3/8] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E8=BE=93?= =?UTF-8?q?=E5=85=A5=20TextConvertToValueCallback=20=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=A9=BA=E6=97=B6=E9=87=8D=E7=BD=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SelectGeneric/SelectGeneric.razor.cs | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor.cs b/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor.cs index 5eb15f93e8f..d4cc6a32445 100644 --- a/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor.cs +++ b/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor.cs @@ -70,10 +70,11 @@ public partial class SelectGeneric : ISelectGeneric, IModelEqual /// /// 获得/设置 选项输入更新后转换为 Value 回调方法 默认 null + /// 返回值为 null 时放弃操作 /// /// 设置 后生效 [Parameter] - public Func>? TextConvertToValueCallback { get; set; } + public Func>? TextConvertToValueCallback { get; set; } /// /// 获得/设置 选项模板支持静态数据 @@ -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(val, v); - var items = new List>() { item }; - items.AddRange(Items); - Items = items; - CurrentValue = val; + if (val is not null) + { + item = new SelectedItem(val, v); + var items = new List>() { item }; + items.AddRange(Items); + Items = items; + CurrentValue = val; + } + else + { + await InvokeVoidAsync("resetValue", InputId, SelectedRow?.Text); + } } else { From d3a2c9e20ac624569fdcba8f8ffd55734bc9b1bb Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 31 May 2025 09:18:45 +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/SelectGenericTest.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/UnitTest/Components/SelectGenericTest.cs b/test/UnitTest/Components/SelectGenericTest.cs index d07b099d2ab..6b8c43582b2 100644 --- a/test/UnitTest/Components/SelectGenericTest.cs +++ b/test/UnitTest/Components/SelectGenericTest.cs @@ -856,7 +856,7 @@ public async Task IsEditable_Ok() }); pb.Add(a => a.TextConvertToValueCallback, v => { - return Task.FromResult(v); + return Task.FromResult(v)!; }); }); Assert.False(input.IsReadOnly()); @@ -864,6 +864,15 @@ public async Task IsEditable_Ok() await cut.InvokeAsync(() => { input.Change("Test3"); }); Assert.Equal("Test3", cut.Instance.Value); Assert.True(updated); + + // 覆盖返回 null 逻辑 + cut.SetParametersAndRender(pb => + { + pb.Add(a => a.TextConvertToValueCallback, v => + { + return Task.FromResult((string?)null); + }); + }); } [Fact] From c1d214ecde161a8fd814b836b045b1c0a55646cf Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 31 May 2025 09:21:12 +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/SelectGenericTest.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/UnitTest/Components/SelectGenericTest.cs b/test/UnitTest/Components/SelectGenericTest.cs index 6b8c43582b2..b71170e1f27 100644 --- a/test/UnitTest/Components/SelectGenericTest.cs +++ b/test/UnitTest/Components/SelectGenericTest.cs @@ -873,6 +873,7 @@ public async Task IsEditable_Ok() return Task.FromResult((string?)null); }); }); + Assert.Equal("Test4", cut.Instance.Value); } [Fact] @@ -890,7 +891,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" })!; }); }); From b2a5e70a48362e964ed9793483dbd64ee5ad8161 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 31 May 2025 09:25:12 +0800 Subject: [PATCH 6/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/SelectGenericTest.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/UnitTest/Components/SelectGenericTest.cs b/test/UnitTest/Components/SelectGenericTest.cs index b71170e1f27..8635e484766 100644 --- a/test/UnitTest/Components/SelectGenericTest.cs +++ b/test/UnitTest/Components/SelectGenericTest.cs @@ -868,12 +868,13 @@ public async Task IsEditable_Ok() // 覆盖返回 null 逻辑 cut.SetParametersAndRender(pb => { - pb.Add(a => a.TextConvertToValueCallback, v => + pb.Add(a => a.TextConvertToValueCallback, async v => { - return Task.FromResult((string?)null); + await Task.Yield(); + return null; }); }); - Assert.Equal("Test4", cut.Instance.Value); + await cut.InvokeAsync(() => { input.Change("Test3"); }); } [Fact] From 048835a0c8c3f86f46d8584e9f60019e75e32a25 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 31 May 2025 19:57:32 +0800 Subject: [PATCH 7/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/SelectGenericTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/UnitTest/Components/SelectGenericTest.cs b/test/UnitTest/Components/SelectGenericTest.cs index 8635e484766..ba8a26598ac 100644 --- a/test/UnitTest/Components/SelectGenericTest.cs +++ b/test/UnitTest/Components/SelectGenericTest.cs @@ -874,7 +874,7 @@ public async Task IsEditable_Ok() return null; }); }); - await cut.InvokeAsync(() => { input.Change("Test3"); }); + await cut.InvokeAsync(() => { input.Change("Test4"); }); } [Fact] From e0e5f12c54616fd97abd8b90f8a1a9a31dbe0bc9 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 31 May 2025 20:01:39 +0800 Subject: [PATCH 8/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/SelectGenericTest.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/UnitTest/Components/SelectGenericTest.cs b/test/UnitTest/Components/SelectGenericTest.cs index ba8a26598ac..45f0f483979 100644 --- a/test/UnitTest/Components/SelectGenericTest.cs +++ b/test/UnitTest/Components/SelectGenericTest.cs @@ -875,6 +875,12 @@ public async Task IsEditable_Ok() }); }); await cut.InvokeAsync(() => { input.Change("Test4"); }); + + cut.SetParametersAndRender(pb => + { + pb.Add(a => a.Value, null); + }); + await cut.InvokeAsync(() => { input.Change("Test5"); }); } [Fact]