Skip to content

feat(SelectCity): support polyphonetic characters #626

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
ArgoZhang merged 7 commits into from
Oct 22, 2025
Merged

feat(SelectCity): support polyphonetic characters #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bfc3376
refactor: 精简代码
ArgoZhang Oct 22, 2025
8d0baab
refactor: 移除默认大写样式
ArgoZhang Oct 22, 2025
858d5cf
feat: 支持多音字
ArgoZhang Oct 22, 2025
5f9cabf
refactor: 移除 Pinyin 服务注入
ArgoZhang Oct 22, 2025
3b7489a
chore: 更新版本号
ArgoZhang Oct 22, 2025
733c03c
refactor: 移除 BootstrapBlazor.OCR 项目
ArgoZhang Oct 22, 2025
4d013c0
chore: 更新项目依赖配置
ArgoZhang Oct 22, 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
1 change: 0 additions & 1 deletion BootstrapBlazor.Extensions.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<Project Path="src/components/BootstrapBlazor.Mermaid/BootstrapBlazor.Mermaid.csproj" />
<Project Path="src/components/BootstrapBlazor.MindMap/BootstrapBlazor.MindMap.csproj" />
<Project Path="src/components/BootstrapBlazor.MouseFollower/BootstrapBlazor.MouseFollower.csproj" />
<Project Path="src/components/BootstrapBlazor.OCR/BootstrapBlazor.OCR.csproj" />
<Project Path="src/components/BootstrapBlazor.OctIcon/BootstrapBlazor.OctIcon.csproj" />
<Project Path="src/components/BootstrapBlazor.OfdReader/BootstrapBlazor.OfdReader.csproj" />
<Project Path="src/components/BootstrapBlazor.OfficeViewer/BootstrapBlazor.OfficeViewer.csproj" />
Expand Down
6 changes: 5 additions & 1 deletion src/Frameworks.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<Project>

<PropertyGroup>
<PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'">
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(VisualStudioVersion)' == '18.0'">
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>

Expand Down
17 changes: 12 additions & 5 deletions src/components/BootstrapBlazor.Region/BootstrapBlazor.Region.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.0.7</Version>
<PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'">
<Version>9.0.8-beta01</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(VisualStudioVersion)' == '18.0'">
<Version>10.0.0-rc.2.1.0</Version>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -17,9 +21,12 @@
<EmbeddedResource Include="Data\**\*.json" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="9.11.0" />
<PackageReference Include="BootstrapBlazor.Pinyin" Version="9.0.0" />
<ItemGroup Condition="'$(VisualStudioVersion)' == '17.0'">
<PackageReference Include="BootstrapBlazor" Version="9.11.5-beta01" />
</ItemGroup>

<ItemGroup Condition="'$(VisualStudioVersion)' == '18.0'">
<PackageReference Include="BootstrapBlazor" Version="10.0.0-rc.2.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
9 changes: 6 additions & 3 deletions src/components/BootstrapBlazor.Region/Components/SelectCity.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,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) && StartsWith(PinyinService.GetFirstLetters(item), _searchText))
.Build();

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

if (PinyinService.IsChinese(_searchText))
if (PinyinService.ContainsChinese(_searchText))
{
return [.. Provinces.Where(i => i.Contains(_searchText) || GetCities(i).Any(city => city.Contains(_searchText)))];
}
Expand All @@ -177,7 +177,10 @@ private HashSet<string> GetProvinces()
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static bool FilterProvince(ProvinceItem item, string searchText) => item.PinYin.StartsWith(searchText) || item.Cities.Any(city => city.PinYin.StartsWith(searchText));
private static bool FilterProvince(ProvinceItem item, string searchText) => StartsWith(item.PinYin, searchText) || item.Cities.Any(city => StartsWith(city.PinYin, searchText));

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static bool StartsWith(HashSet<string> source, string searchText) => source.Any(i => i.StartsWith(searchText, StringComparison.OrdinalIgnoreCase));

private static HashSet<ProvinceItem>? _provinceItems;

Expand Down
4 changes: 0 additions & 4 deletions src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@
display: none;
}

.dropdown-menu-search .search-text {
text-transform: uppercase;
Comment thread
ArgoZhang marked this conversation as resolved.
}

.dropdown-menu-search-body {
flex: 1;
height: 1%;
Expand Down
2 changes: 1 addition & 1 deletion src/components/BootstrapBlazor.Region/Data/CityItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ readonly record struct CityItem
{
public string Name { get; init; }

public string PinYin { get; init; }
public HashSet<string> PinYin { get; init; }
}
2 changes: 1 addition & 1 deletion src/components/BootstrapBlazor.Region/Data/ProvinceItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readonly record struct ProvinceItem
{
public string Name { get; init; }

public string PinYin { get; init; }
public HashSet<string> PinYin { get; init; }

public HashSet<CityItem> Cities { get; init; }
}
1 change: 0 additions & 1 deletion src/components/BootstrapBlazor.Region/Extensions/ServiceCollectionExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public static class ServiceCollectionExtension
public static IServiceCollection AddBootstrapBlazorRegionService(this IServiceCollection services)
{
services.AddSingleton<IRegionService, DefaultRegionService>();
services.AddPinyinService();

return services;
}
Expand Down