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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.0.6</Version>
<Version>9.0.7</Version>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -19,6 +19,7 @@

<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="9.11.0" />
<PackageReference Include="BootstrapBlazor.Pinyin" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ public partial class SelectCity
[Parameter]
public bool AutoClose { get; set; } = true;

[Inject]
[NotNull]
private IPinyinService? PinyinService { get; set; }

private string? ClassString => CssBuilder.Default("select bb-city")
.AddClass("disabled", IsDisabled)
.AddClassFromAttributes(AdditionalAttributes)
Expand All @@ -55,7 +59,7 @@ public partial class SelectCity
private string? GetActiveClass(string item) => CssBuilder.Default()
.AddClass("active", _values.Contains(item) && IsMultiple)
.AddClass("active", CurrentValue == item && !IsMultiple)
.AddClass("prev", !string.IsNullOrEmpty(_searchText) && PinYinService.GetFirstLetters(item).StartsWith(_searchText))
.AddClass("prev", !string.IsNullOrEmpty(_searchText) && PinyinService.GetFirstLetters(item).StartsWith(_searchText))
.Build();

/// <summary>
Expand Down Expand Up @@ -164,7 +168,7 @@ private HashSet<string> GetProvinces()
return Provinces;
}

if (IsChinese(_searchText))
if (PinyinService.IsChinese(_searchText))
{
return [.. Provinces.Where(i => i.Contains(_searchText) || GetCities(i).Any(city => city.Contains(_searchText)))];
}
Expand All @@ -181,7 +185,7 @@ private HashSet<ProvinceItem> GenerateProvincePinYin()
{
_provinceItems ??= [.. Provinces.Select(i => new ProvinceItem()
{
PinYin = PinYinService.GetFirstLetters(i),
PinYin = PinyinService.GetFirstLetters(i),
Name = i,
Cities = GenerateCityPinYin(i)
})];
Expand All @@ -197,12 +201,10 @@ private HashSet<ProvinceItem> GenerateProvincePinYin()

private HashSet<CityItem> GenerateCityPinYin(string provinceName) => [.. GetCities(provinceName).Select(i => new CityItem()
{
PinYin = PinYinService.GetFirstLetters(i),
PinYin = PinyinService.GetFirstLetters(i),
Name = i
})];

private bool IsChinese(string text) => text.Any(i => i >= 0x4E00 && i <= 0x9FFF);

private static readonly HashSet<string> Provinces = [
"直辖市",
"河北省",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public static class ServiceCollectionExtension
public static IServiceCollection AddBootstrapBlazorRegionService(this IServiceCollection services)
{
services.AddSingleton<IRegionService, DefaultRegionService>();
services.AddPinyinService();

return services;
}
Expand Down
Loading
Loading