Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.2.5</Version>
<Version>9.2.6</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<span class="form-select-append"><i class="@Icon"></i></span>
<span class="form-select-append ac-loading"><i class="@LoadingIcon"></i></span>
<ul class="dropdown-menu">
@foreach (var item in FilterItems)
@foreach (var item in Rows)
{
<li @key="item" class="dropdown-item" @onclick="() => OnClickItem(item)">
@if (ItemTemplate == null)
Expand All @@ -30,7 +30,7 @@
}
</li>
}
@if (ShowNoDataTip && FilterItems.Count == 0)
@if (ShowNoDataTip && Rows.Count == 0)
{
<li class="dropdown-item">@NoDataTip</li>
}
Expand Down
16 changes: 10 additions & 6 deletions src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ protected override void OnParametersSet()
PlaceHolder ??= Localizer[nameof(PlaceHolder)];
Icon ??= IconTheme.GetIconByKey(ComponentIcons.AutoCompleteIcon);

FilterItems ??= Items?.ToList() ?? [];
Items ??= [];
}

/// <summary>
Expand All @@ -130,6 +130,8 @@ private async Task OnClickItem(string val)
}
}

private List<string> Rows => FilterItems ?? Items.ToList();

/// <summary>
/// TriggerOnChange 方法
/// </summary>
Expand All @@ -142,14 +144,16 @@ public async Task TriggerOnChange(string val)
var items = await OnCustomFilter(val);
FilterItems = items.ToList();
}
else if (string.IsNullOrEmpty(val))
{
FilterItems = Items.ToList();
}
else
{
var comparison = IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
var items = string.IsNullOrEmpty(val)
? Items
: IsLikeMatch
? Items.Where(s => s.Contains(val, comparison))
: Items.Where(s => s.StartsWith(val, comparison));
var items = IsLikeMatch
? Items.Where(s => s.Contains(val, comparison))
: Items.Where(s => s.StartsWith(val, comparison));
FilterItems = items.ToList();
}

Expand Down
11 changes: 10 additions & 1 deletion test/UnitTest/Components/AutoCompleteTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,16 @@ public async Task IsLikeMatch_Test()
{
pb.Add(a => a.IsLikeMatch, true);
});
menus = cut.FindAll(".dropdown-item");
await cut.InvokeAsync(() => cut.Instance.TriggerOnChange("as"));
menus = cut.FindAll(".dropdown-item");
Assert.Equal(2, menus.Count);

await cut.InvokeAsync(() => cut.Instance.TriggerOnChange("k1"));
menus = cut.FindAll(".dropdown-item");
Assert.Single(menus);

await cut.InvokeAsync(() => cut.Instance.TriggerOnChange(""));
menus = cut.FindAll(".dropdown-item");
Assert.Equal(2, menus.Count);
}

Expand All @@ -102,6 +110,7 @@ public async Task IgnoreCase_Ok()
{
pb.Add(a => a.IgnoreCase, true);
});
await cut.InvokeAsync(() => cut.Instance.TriggerOnChange("t"));
menus = cut.FindAll(".dropdown-item");
Assert.Equal(2, menus.Count);
}
Expand Down
Loading