Skip to content

feat(Select): redesign IsClearable function #5626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 15, 2025
Merged

feat(Select): redesign IsClearable function #5626

Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9062da8
对Select组件进行修改，设置IsClearable后，如果绑定类型可以为空，清除后清楚所有选中项而不是第一项
Mar 14, 2025
68ebf1a
Merge branch 'main' into Feat_20250313
ArgoZhang Mar 14, 2025
569a38e
修复yige bug
Mar 14, 2025
903ed04
Merge branch 'Feat_20250313' of https://github.com/trycatchfinnally/B…
Mar 14, 2025
48ffa8c
refactor: 更新可为空逻辑
ArgoZhang Mar 14, 2025
e70395e
test: 更新单元测试
ArgoZhang Mar 14, 2025
cabdbf9
doc: 更新示例
ArgoZhang Mar 14, 2025
7f0ee58
refactor: 增加 readonly 关键字
ArgoZhang Mar 15, 2025
cb94702
test: 更新单元测试
ArgoZhang Mar 15, 2025
40b041d
test: 更新单元测试
ArgoZhang Mar 15, 2025
7189486
refactor: 重置 SelectedItem
ArgoZhang Mar 15, 2025
9603422
doc: 更新示例
ArgoZhang Mar 15, 2025
4e58224
doc: 更新示例
ArgoZhang Mar 15, 2025
37d3326
test: 增加不可为空整形设置 IsClearable 单元测试
ArgoZhang Mar 15, 2025
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
32 changes: 29 additions & 3 deletions src/BootstrapBlazor/Components/Select/Select.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,12 +294,15 @@ private SelectedItem? SelectedRow

private SelectedItem? GetSelectedRow()
{

var canBeNull = ValueCanBeNull();
var item = GetItemWithEnumValue()
?? Rows.Find(i => i.Value == CurrentValueAsString)
?? Rows.Find(i => i.Active)
?? Rows.FirstOrDefault(i => !i.IsDisabled)
?? Rows.FirstOrDefault(i => !i.IsDisabled&&!canBeNull)
?? GetVirtualizeItem(CurrentValueAsString);



if (item != null)
{
if (_init && DisableItemChangedWhenFirstRender)
Expand Down Expand Up @@ -576,7 +579,26 @@ private async Task OnClearValue()
{
await OnClearAsync();
}

if (ValueCanBeNull())
{

if (SelectedItem != null) SelectedItem.Active = false;
SelectedItem = null;

// 触发 StateHasChanged
_lastSelectedValueString = string.Empty;
CurrentValueAsString = _lastSelectedValueString;
this.Value = default;
if (this.ValueChanged.HasDelegate)
await this.ValueChanged.InvokeAsync(default);
// 触发 SelectedItemChanged 事件--由于设置成了null
//if (OnSelectedItemChanged != null)
//{
// await OnSelectedItemChanged(SelectedItem);
//}
return;
}
SelectedItem? item;
if (OnQueryAsync != null)
{
Expand All @@ -592,7 +614,11 @@ private async Task OnClearValue()
await SelectedItemChanged(item);
}
}

private bool ValueCanBeNull()
{
var tType = typeof(TValue);
return !tType.IsValueType || Nullable.GetUnderlyingType(tType) != null;
}
private string? ReadonlyString => IsEditable ? null : "readonly";

private async Task OnChange(ChangeEventArgs args)
Expand Down