From bfc33769ceb637cd46e4825b37c43390fe6e0b4b Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 22 Oct 2025 10:48:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/SelectCity.razor.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.cs b/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.cs index 53f1ac6a..5ba16656 100644 --- a/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.cs +++ b/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.cs @@ -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(); /// @@ -168,7 +168,7 @@ private HashSet 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)))]; } @@ -177,7 +177,10 @@ private HashSet 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 source, string searchText) => source.Any(i => i.StartsWith(searchText, StringComparison.OrdinalIgnoreCase)); private static HashSet? _provinceItems; From 8d0baab887c22f6bb5c40bbe42b7164c0080639a Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 22 Oct 2025 10:48:59 +0800 Subject: [PATCH 2/7] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=A4=A7=E5=86=99=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BootstrapBlazor.Region/Components/SelectCity.razor.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css b/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css index 6db486a9..0e2cefb8 100644 --- a/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css +++ b/src/components/BootstrapBlazor.Region/Components/SelectCity.razor.css @@ -86,10 +86,6 @@ display: none; } -.dropdown-menu-search .search-text { - text-transform: uppercase; -} - .dropdown-menu-search-body { flex: 1; height: 1%; From 858d5cfa7e846f9def9bf7a87f83d86eb3df0288 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 22 Oct 2025 10:49:10 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=A4=9A?= =?UTF-8?q?=E9=9F=B3=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BootstrapBlazor.Region/Data/CityItem.cs | 2 +- src/components/BootstrapBlazor.Region/Data/ProvinceItem.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/BootstrapBlazor.Region/Data/CityItem.cs b/src/components/BootstrapBlazor.Region/Data/CityItem.cs index 38ba7491..3c3a988c 100644 --- a/src/components/BootstrapBlazor.Region/Data/CityItem.cs +++ b/src/components/BootstrapBlazor.Region/Data/CityItem.cs @@ -8,5 +8,5 @@ readonly record struct CityItem { public string Name { get; init; } - public string PinYin { get; init; } + public HashSet PinYin { get; init; } } diff --git a/src/components/BootstrapBlazor.Region/Data/ProvinceItem.cs b/src/components/BootstrapBlazor.Region/Data/ProvinceItem.cs index 5170a2e8..5ff522b1 100644 --- a/src/components/BootstrapBlazor.Region/Data/ProvinceItem.cs +++ b/src/components/BootstrapBlazor.Region/Data/ProvinceItem.cs @@ -8,7 +8,7 @@ readonly record struct ProvinceItem { public string Name { get; init; } - public string PinYin { get; init; } + public HashSet PinYin { get; init; } public HashSet Cities { get; init; } } From 5f9cabf5f0992936b58b448f796047eded0ae844 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 22 Oct 2025 11:00:13 +0800 Subject: [PATCH 4/7] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=20Pinyin=20?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extensions/ServiceCollectionExtension.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/BootstrapBlazor.Region/Extensions/ServiceCollectionExtension.cs b/src/components/BootstrapBlazor.Region/Extensions/ServiceCollectionExtension.cs index f6280698..0a6ee55c 100644 --- a/src/components/BootstrapBlazor.Region/Extensions/ServiceCollectionExtension.cs +++ b/src/components/BootstrapBlazor.Region/Extensions/ServiceCollectionExtension.cs @@ -19,7 +19,6 @@ public static class ServiceCollectionExtension public static IServiceCollection AddBootstrapBlazorRegionService(this IServiceCollection services) { services.AddSingleton(); - services.AddPinyinService(); return services; } From 3b7489a2bd7dfc175e6333f6c30f9917b0bf62c8 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 22 Oct 2025 11:00:30 +0800 Subject: [PATCH 5/7] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BootstrapBlazor.Region.csproj | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/components/BootstrapBlazor.Region/BootstrapBlazor.Region.csproj b/src/components/BootstrapBlazor.Region/BootstrapBlazor.Region.csproj index 515ede6b..98f35d81 100644 --- a/src/components/BootstrapBlazor.Region/BootstrapBlazor.Region.csproj +++ b/src/components/BootstrapBlazor.Region/BootstrapBlazor.Region.csproj @@ -1,7 +1,11 @@  - - 9.0.7 + + 9.0.8-beta01 + + + + 10.0.0-rc.2.1.0 @@ -17,9 +21,12 @@ - - - + + + + + + From 733c03cafaab49be5f181db1956a60d80bd54f64 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 22 Oct 2025 11:00:59 +0800 Subject: [PATCH 6/7] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=20BootstrapB?= =?UTF-8?q?lazor.OCR=20=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BootstrapBlazor.Extensions.slnx | 1 - 1 file changed, 1 deletion(-) diff --git a/BootstrapBlazor.Extensions.slnx b/BootstrapBlazor.Extensions.slnx index 20d0028d..61515384 100644 --- a/BootstrapBlazor.Extensions.slnx +++ b/BootstrapBlazor.Extensions.slnx @@ -50,7 +50,6 @@ - From 4d013c0e71dd68d327f29e07e0ef0c8355a95c80 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 22 Oct 2025 11:01:20 +0800 Subject: [PATCH 7/7] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BE=9D=E8=B5=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Frameworks.props | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Frameworks.props b/src/Frameworks.props index c9c8e368..d11f0344 100644 --- a/src/Frameworks.props +++ b/src/Frameworks.props @@ -1,6 +1,10 @@ - + + net6.0;net7.0;net8.0;net9.0 + + + net6.0;net7.0;net8.0;net9.0;net10.0