Merge branch 'main' of https://github.com/dotnetcore/BootstrapBlazor

actions-user · actions-user · commit 38a9e47af4fb · 2025-10-15T01:18:36.000Z
diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
@@ -66,6 +66,7 @@
     <PackageReference Include="BootstrapBlazor.PdfViewer" Version="9.0.6" />
     <PackageReference Include="BootstrapBlazor.Player" Version="9.0.2" />
     <PackageReference Include="BootstrapBlazor.RDKit" Version="9.0.2" />
+    <PackageReference Include="BootstrapBlazor.Region" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.SmilesDrawer" Version="9.0.2" />
     <PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.3" />
diff --git a/src/BootstrapBlazor.Server/Components/Samples/SelectRegions.razor b/src/BootstrapBlazor.Server/Components/Samples/SelectRegions.razor
@@ -0,0 +1,14 @@
+﻿@page "/select-region"
+@inject IStringLocalizer<SelectRegions> Localizer
+
+<h3>@Localizer["RegionTitle"]</h3>
+
+<h4>@Localizer["RegionDescription"]</h4>
+
+<PackageTips Name="BootstrapBlazor.Region" />
+
+<DemoBlock Title="@Localizer["RegionNormalTitle"]"
+           Introduction="@Localizer["RegionNormalIntro"]"
+           Name="Normal">
+    <SelectRegion Value="@_value"></SelectRegion>
+</DemoBlock>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/SelectRegions.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/SelectRegions.razor.cs
@@ -0,0 +1,14 @@
+﻿// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License
+// See the LICENSE file in the project root for more information.
+// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Server.Components.Samples;
+
+/// <summary>
+/// 行政区域选择器示例
+/// </summary>
+public partial class SelectRegions
+{
+    private string _value = "";
+}
diff --git a/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs
@@ -451,6 +451,12 @@ void AddForm(DemoMenuItem item)
                     Url = "floating-label"
                 },
                 new()
+                {
+                    IsNew = true,
+                    Text = Localizer["SelectRegion"],
+                    Url = "select-region"
+                },
+                new()
                 {
                     Text = Localizer["ListGroup"],
                     Url = "list-group"
diff --git a/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs b/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs
@@ -94,6 +94,9 @@ public static IServiceCollection AddBootstrapBlazorServices(this IServiceCollect
         // 增加 JuHe 定位服务
         services.AddBootstrapBlazorJuHeIpLocatorService();
 
+        // 增加 IRegionService
+        services.AddBootstrapBlazorRegionService();
+
         // 增加 PetaPoco ORM 数据服务操作类
         // 需要时打开下面代码
         //services.AddPetaPoco(option =>
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -4872,7 +4872,8 @@
     "OpcDaService": "OpcDaServer",
     "Navbar": "Navbar",
     "TaskDashBoard": "TaskDashBoard",
-    "Dom2ImageService": "IDom2HtmlService"
+    "Dom2ImageService": "IDom2HtmlService",
+    "SelectRegion": "Region Selector"
   },
   "BootstrapBlazor.Server.Components.Samples.Table.TablesHeader": {
     "TablesHeaderTitle": "Header grouping function",
@@ -7220,5 +7221,11 @@
     "Dom2ImageButtonText": "Convert",
     "Dom2ImageDownloadText": "Download",
     "Dom2ImageFullText": "Capture"
+  },
+  "BootstrapBlazor.Server.Components.Samples.SelectRegions": {
+    "RegionTitle": "Region",
+    "RegionDescription": "A simple region cascade selector, provide 4 levels Chinese administrative division data",
+    "RegionNormalTitle": "Basic usage",
+    "RegionNormalIntro": "Use grouping to switch the selection mode for displaying administrative areas"
   }
 }
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -4872,7 +4872,8 @@
     "OpcDaService": "OpcDaServer 服务",
     "Navbar": "导航栏 Navbar",
     "TaskDashBoard": "任务管理器 TaskDashBoard",
-    "Dom2ImageService": "节点转图片服务 IDom2HtmlService"
+    "Dom2ImageService": "节点转图片服务 IDom2HtmlService",
+    "SelectRegion": "行政区域选择器 SelectRegion"
   },
   "BootstrapBlazor.Server.Components.Samples.Table.TablesHeader": {
     "TablesHeaderTitle": "表头分组功能",
@@ -7220,5 +7221,11 @@
     "Dom2ImageButtonText": "转换",
     "Dom2ImageDownloadText": "下载",
     "Dom2ImageFullText": "长截图"
+  },
+  "BootstrapBlazor.Server.Components.Samples.SelectRegions": {
+    "RegionTitle": "Region 行政区域选择器",
+    "RegionDescription": "提供 4 级行政区划选择器",
+    "RegionNormalTitle": "基本用法",
+    "RegionNormalIntro": "使用分组切换显示行政区域的选择模式"
   }
 }
diff --git a/src/BootstrapBlazor.Server/docs.json b/src/BootstrapBlazor.Server/docs.json
@@ -255,7 +255,8 @@
     "navbar": "Navbars",
     "task-board": "TaskBoard",
     "modbus-factory": "Modbus\\ModbusFactories",
-    "serial-port-factory": "SerialPorts\\SerialPortFactories"
+    "serial-port-factory": "SerialPorts\\SerialPortFactories",
+    "select-region": "Regions"
   },
   "video": {
     "table": "BV1ap4y1x7Qn?p=1",
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.11.2-beta07</Version>
+    <Version>9.11.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/DateTimePicker/PopoverDropdownBase.cs b/src/BootstrapBlazor/Components/DateTimePicker/PopoverDropdownBase.cs
@@ -39,6 +39,7 @@ public abstract class PopoverDropdownBase<TValue> : ValidateBase<TValue>
     /// 获得 CustomClass 字符串
     /// </summary>
     protected virtual string? CustomClassString => CssBuilder.Default(CustomClass)
+        .AddClass("popover-region")
         .AddClass("shadow", ShowShadow)
         .Build();
 }
diff --git a/src/BootstrapBlazor/Components/Drawer/Drawer.razor.cs b/src/BootstrapBlazor/Components/Drawer/Drawer.razor.cs
@@ -19,7 +19,7 @@ public partial class Drawer
         .Build();
 
     private string? StyleString => CssBuilder.Default()
-        .AddClass($"--bb-drawer-position: {Position};")
+        .AddClass($"--bb-drawer-position: {Position};", !string.IsNullOrEmpty(Position))
         .AddClass($"--bb-drawer-zindex: {ZIndex};", ZIndex.HasValue)
         .AddStyleFromAttributes(AdditionalAttributes)
         .Build();
diff --git a/src/BootstrapBlazor/Components/Filters/FilterButton.razor b/src/BootstrapBlazor/Components/Filters/FilterButton.razor
@@ -2,13 +2,15 @@
 @typeparam TValue
 @inherits Dropdown<TValue>
 
-<button type="button" class="btn btn-filter dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-    <i class="@FilterIcon" />
-</button>
-<div class="dropdown-menu shadow">
-    @foreach (var item in Items)
-    {
-        <div class="@ActiveItem(item)" @onclick="e => OnItemClick(item)">@item.Text</div>
-    }
+<div id="@Id" class="bb-filter-btn-group">
+    <button type="button" class="btn btn-filter dropdown-toggle" data-bs-toggle="bb.dropdown" aria-expanded="false">
+        <i class="@FilterIcon" />
+    </button>
+    <div class="dropdown-menu shadow">
+        @foreach (var item in Items)
+        {
+            <div class="@ActiveItem(item)" @onclick="e => OnItemClick(item)">@item.Text</div>
+        }
+    </div>
+    <Button Icon="@ClearIcon" Color="Color.None" class="btn-ban text-danger" OnClickWithoutRender="ClearFilter" />
 </div>
-<Button Icon="@ClearIcon" Color="Color.None" class="btn-ban text-danger" OnClickWithoutRender="ClearFilter" />
diff --git a/src/BootstrapBlazor/Components/Filters/FilterButton.razor.js b/src/BootstrapBlazor/Components/Filters/FilterButton.razor.js
@@ -0,0 +1,22 @@
+﻿import Data from "../../modules/data.js"
+import Popover from "../../modules/base-popover.js"
+
+export function init(id) {
+    const el = document.getElementById(id)
+    if (el == null) {
+        return
+    }
+    const popover = Popover.init(el);
+
+    const dropdown = { popover }
+    Data.set(id, dropdown)
+}
+
+export function dispose(id) {
+    const dropdown = Data.get(id)
+    Data.remove(id)
+
+    if (dropdown) {
+        Popover.dispose(dropdown.popover)
+    }
+}
diff --git a/src/BootstrapBlazor/Components/Filters/FilterButton.razor.scss b/src/BootstrapBlazor/Components/Filters/FilterButton.razor.scss
@@ -0,0 +1,4 @@
+﻿.bb-filter-btn-group {
+    display: flex;
+    flex-wrap: nowrap;
+}
diff --git a/src/BootstrapBlazor/Components/Filters/StringFilter.razor b/src/BootstrapBlazor/Components/Filters/StringFilter.razor
@@ -4,7 +4,7 @@
 @if (IsHeaderRow)
 {
     <div class="@FilterRowClassString">
-        <BootstrapInput @bind-Value="@_value1" ShowLabel="false" SkipValidate="true"></BootstrapInput>
+        <BootstrapInput Value="@_value1" OnValueChanged="OnValueChanged" ShowLabel="false" SkipValidate="true"></BootstrapInput>
         <FilterButton Items="Items" @bind-Value="_action1" OnSelectedItemChanged="_ => OnFilterAsync()" OnClearFilter="OnClearFilter" />
     </div>
 }
diff --git a/src/BootstrapBlazor/Components/Filters/StringFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/StringFilter.razor.cs
@@ -128,4 +128,10 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
         }
         await base.SetFilterConditionsAsync(filter);
     }
+
+    private async Task OnValueChanged(string? val)
+    {
+        _value1 = val;
+        await OnFilterAsync();
+    }
 }
diff --git a/src/BootstrapBlazor/Icons/BootstrapIcons.cs b/src/BootstrapBlazor/Icons/BootstrapIcons.cs
@@ -61,7 +61,7 @@ internal static class BootstrapIcons
         { ComponentIcons.StepErrorIcon, "bi bi-x" },
 
         { ComponentIcons.FilterButtonFilterIcon, "bi bi-funnel-fill" },
-        { ComponentIcons.FilterButtonClearIcon, "bi bi-funnel" },
+        { ComponentIcons.FilterButtonClearIcon, "bi bi-ban" },
 
         { ComponentIcons.TableFilterPlusIcon, "bi bi-plus" },
         { ComponentIcons.TableFilterMinusIcon, "bi bi-dash" },
diff --git a/src/BootstrapBlazor/Icons/MaterialDesignIcons.cs b/src/BootstrapBlazor/Icons/MaterialDesignIcons.cs
@@ -61,7 +61,7 @@ internal static class MaterialDesignIcons
         { ComponentIcons.StepErrorIcon, "mdi mdi-close" },
 
         { ComponentIcons.FilterButtonFilterIcon, "mdi mdi-filter-outline" },
-        { ComponentIcons.FilterButtonClearIcon, "mdi mdi-filter-remove-outline" },
+        { ComponentIcons.FilterButtonClearIcon, "mdi mdi-cancel" },
 
         { ComponentIcons.TableFilterPlusIcon, "mdi mdi-plus" },
         { ComponentIcons.TableFilterMinusIcon, "mdi mdi-minus" },
diff --git a/src/BootstrapBlazor/Localization/Json/JsonStringLocalizer.cs b/src/BootstrapBlazor/Localization/Json/JsonStringLocalizer.cs
@@ -107,7 +107,7 @@ public override LocalizedString this[string name]
     private string? GetStringFromJson(string name)
     {
         // get string from json localization file
-        var localizerStrings = MegerResolveLocalizers(CacheManager.GetAllStringsByTypeName(Assembly, typeName));
+        var localizerStrings = MergeResolveLocalizers(CacheManager.GetAllStringsByTypeName(Assembly, typeName));
         var cacheKey = $"name={name}&culture={CultureInfo.CurrentUICulture.Name}";
         string? ret = null;
         if (!_missingManifestCache.ContainsKey(cacheKey))
@@ -143,7 +143,7 @@ public override LocalizedString this[string name]
             if (baseType != type)
             {
                 var baseAssembly = baseType.Assembly;
-                var localizerStrings = MegerResolveLocalizers(CacheManager.GetAllStringsByTypeName(baseAssembly, baseType.FullName!));
+                var localizerStrings = MergeResolveLocalizers(CacheManager.GetAllStringsByTypeName(baseAssembly, baseType.FullName!));
                 var l = localizerStrings.Find(i => i.Name == name);
                 if (l is { ResourceNotFound: false })
                 {
@@ -154,7 +154,7 @@ public override LocalizedString this[string name]
         return ret;
     }
 
-    private List<LocalizedString> MegerResolveLocalizers(IEnumerable<LocalizedString>? localizerStrings)
+    private List<LocalizedString> MergeResolveLocalizers(IEnumerable<LocalizedString>? localizerStrings)
     {
         var localizers = new List<LocalizedString>(CacheManager.GetTypeStringsFromResolve(typeName));
         if (localizerStrings != null)
@@ -174,7 +174,7 @@ private void HandleMissingResourceItem(string name)
         _missingManifestCache.TryAdd($"name={name}&culture={CultureInfo.CurrentUICulture.Name}", null);
     }
 
-    private List<LocalizedString>? _allLocalizerdStrings;
+    private List<LocalizedString>? _allLocalizedStrings;
 
     /// <summary>
     /// 获取当前语言的所有资源信息
@@ -183,15 +183,15 @@ private void HandleMissingResourceItem(string name)
     /// <returns></returns>
     public override IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
     {
-        if (_allLocalizerdStrings == null)
+        if (_allLocalizedStrings == null)
         {
             var items = GetAllStringsFromService()
                 ?? GetAllStringsFromBase()
                 ?? GetAllStringsFromJson();
 
-            _allLocalizerdStrings = MegerResolveLocalizers(items);
+            _allLocalizedStrings = MergeResolveLocalizers(items);
         }
-        return _allLocalizerdStrings;
+        return _allLocalizedStrings;
 
         // 1. 从注入服务中获取所有资源信息
         // get all strings from the other inject service
diff --git a/src/BootstrapBlazor/wwwroot/scss/components.scss b/src/BootstrapBlazor/wwwroot/scss/components.scss
@@ -40,6 +40,7 @@
 @use "../../Components/ErrorLogger/ErrorLogger.razor.scss";
 @use "../../Components/FlipClock/FlipClock.razor.scss";
 @use "../../Components/FileIcon/FileIcon.razor.scss";
+@use "../../Components/Filters/FilterButton.razor.scss";
 @use "../../Components/Filters/MultiFilter.razor.scss";
 @use "../../Components/Filters/TableColumnFilter.razor.scss";
 @use "../../Components/Footer/Footer.razor.scss";

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ public abstract class PopoverDropdownBase<TValue> : ValidateBase<TValue>`
`39`	`39`	`/// 获得 CustomClass 字符串`
`40`	`40`	`/// </summary>`
`41`	`41`	`protected virtual string? CustomClassString => CssBuilder.Default(CustomClass)`
	`42`	`+ .AddClass("popover-region")`
`42`	`43`	`.AddClass("shadow", ShowShadow)`
`43`	`44`	`.Build();`
`44`	`45`	`}`