diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj index 82c11ecec79..aedced19e5f 100644 --- a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj +++ b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj @@ -66,7 +66,7 @@ - + diff --git a/src/BootstrapBlazor.Server/Components/Samples/OtpInputs.razor b/src/BootstrapBlazor.Server/Components/Samples/OtpInputs.razor index cb85be6dab0..24eff29c2e7 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/OtpInputs.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/OtpInputs.razor @@ -31,7 +31,7 @@ -
+
@@ -56,7 +56,7 @@
-
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/SelectCities.razor b/src/BootstrapBlazor.Server/Components/Samples/SelectCities.razor index 41eac9c4e62..53d6f884af5 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/SelectCities.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/SelectCities.razor @@ -10,11 +10,31 @@ - - - - - +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/SelectCities.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/SelectCities.razor.cs index a371265382a..d26f8989265 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/SelectCities.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/SelectCities.razor.cs @@ -12,5 +12,11 @@ public partial class SelectCities { private string? _value = null; - private string? _multipleValues = null; + private bool _showSearch = true; + + private bool _isMultiple = false; + + private bool _isDisabled = false; + + private bool _autoClose = true; } diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json index e0c61d4d1c3..38474457e23 100644 --- a/src/BootstrapBlazor.Server/Locales/en-US.json +++ b/src/BootstrapBlazor.Server/Locales/en-US.json @@ -7234,9 +7234,7 @@ "CityTitle": "City Selector", "CityDescription": "Provides a city selector classified by province", "CityNormalTitle": "Basic usage", - "CityNormalIntro": "Select a city from the drop-down box", - "CityMultipleTitle": "Multiple", - "CityMultipleIntro": "Enable multiple selection mode by setting IsMultiple , and all cities will be automatically selected when clicking a province in the pop-up window." + "CityNormalIntro": "Select a city from the drop-down box" }, "BootstrapBlazor.Server.Components.Samples.SelectProvinces": { "ProvinceTitle": "Province Selector", diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json index 69d5179a405..5e9eea1bf1b 100644 --- a/src/BootstrapBlazor.Server/Locales/zh-CN.json +++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json @@ -7234,9 +7234,7 @@ "CityTitle": "SelectCity 城市选择器", "CityDescription": "提供以省分类的城市选择器", "CityNormalTitle": "基本用法", - "CityNormalIntro": "通过下拉框的形式选择城市", - "CityMultipleTitle": "多选", - "CityMultipleIntro": "通过设置 IsMultiple 开启多选模式,点击弹窗中省份时自动选中所有城市" + "CityNormalIntro": "通过下拉框的形式选择城市" }, "BootstrapBlazor.Server.Components.Samples.SelectProvinces": { "ProvinceTitle": "SelectProvince 省选择器", diff --git a/src/BootstrapBlazor/wwwroot/modules/base-popover.js b/src/BootstrapBlazor/wwwroot/modules/base-popover.js index d062b18140c..ad08a187f43 100644 --- a/src/BootstrapBlazor/wwwroot/modules/base-popover.js +++ b/src/BootstrapBlazor/wwwroot/modules/base-popover.js @@ -15,7 +15,8 @@ const Popover = { return isDisabled(el) || isDisabled(el.parentNode) || isDisabled(el.querySelector('.form-control')) }, initCallback: null, - hideCallback: null + hideCallback: null, + shownCallback: null }, ...(config || {}) } @@ -105,7 +106,11 @@ const Popover = { popover.hasDisplayNone = true; content.classList.remove("d-none") } - body.append(content) + body.append(content); + + if (popover.shownCallback != null) { + popover.shownCallback(); + } } }