Skip to content

Commit aacc732

Browse files
actions-useractions-user
committed
2 parents b7d8e10 + 5654794 commit aacc732

File tree

11 files changed

+113
-24
lines changed

11 files changed

+113
-24
lines changed

‎src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<PackageReference Include="BootstrapBlazor.PdfViewer" Version="9.0.6" />
6767
<PackageReference Include="BootstrapBlazor.Player" Version="9.0.2" />
6868
<PackageReference Include="BootstrapBlazor.RDKit" Version="9.0.2" />
69-
<PackageReference Include="BootstrapBlazor.Region" Version="9.0.2" />
69+
<PackageReference Include="BootstrapBlazor.Region" Version="9.0.4" />
7070
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.1" />
7171
<PackageReference Include="BootstrapBlazor.SmilesDrawer" Version="9.0.2" />
7272
<PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.3" />

‎src/BootstrapBlazor.Server/Components/Samples/OtpInputs.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<DemoBlock Title="@Localizer["OtpInputsNormalTitle"]"
3232
Introduction="@Localizer["OtpInputsNormalIntro"]"
3333
Name="Normal">
34-
<div class="row g-3 mb-3">
34+
<section ignore class="row g-3 mb-3">
3535
<div class="col-12 col-sm-6">
3636
<BootstrapInputGroup>
3737
<BootstrapInputGroupLabel DisplayText="Type"></BootstrapInputGroupLabel>
@@ -56,7 +56,7 @@
5656
<Switch @bind-Value="@_disabled"></Switch>
5757
</BootstrapInputGroup>
5858
</div>
59-
</div>
59+
</section>
6060
<OtpInput Value="@_value" Type="_otpInputType" PlaceHolder="@_placeHolder" IsReadonly="_readonly" IsDisabled="_disabled"></OtpInput>
6161
</DemoBlock>
6262

‎src/BootstrapBlazor.Server/Components/Samples/SelectCities.razor‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,31 @@
1010
<DemoBlock Title="@Localizer["CityNormalTitle"]"
1111
Introduction="@Localizer["CityNormalIntro"]"
1212
Name="Normal">
13-
<SelectCity Value="@_value"></SelectCity>
14-
</DemoBlock>
15-
16-
<DemoBlock Title="@Localizer["CityMultipleTitle"]"
17-
Introduction="@Localizer["CityMultipleIntro"]"
18-
Name="IsMultiple">
19-
<SelectCity IsMultiple="true" Value="@_multipleValues"></SelectCity>
13+
<div class="row g-3 mb-3">
14+
<div class="col-12 col-sm-6">
15+
<BootstrapInputGroup>
16+
<BootstrapInputGroupLabel DisplayText="ShowSearch"></BootstrapInputGroupLabel>
17+
<Switch @bind-Value="_showSearch"></Switch>
18+
</BootstrapInputGroup>
19+
</div>
20+
<div class="col-12 col-sm-6">
21+
<BootstrapInputGroup>
22+
<BootstrapInputGroupLabel DisplayText="AutoClose"></BootstrapInputGroupLabel>
23+
<Switch @bind-Value="_autoClose"></Switch>
24+
</BootstrapInputGroup>
25+
</div>
26+
<div class="col-12 col-sm-6">
27+
<BootstrapInputGroup>
28+
<BootstrapInputGroupLabel DisplayText="IsMultiple"></BootstrapInputGroupLabel>
29+
<Switch @bind-Value="@_isMultiple"></Switch>
30+
</BootstrapInputGroup>
31+
</div>
32+
<div class="col-12 col-sm-6">
33+
<BootstrapInputGroup>
34+
<BootstrapInputGroupLabel DisplayText="IsDisabled"></BootstrapInputGroupLabel>
35+
<Switch @bind-Value="@_isDisabled"></Switch>
36+
</BootstrapInputGroup>
37+
</div>
38+
</div>
39+
<SelectCity Value="@_value" ShowSearch="_showSearch" IsMultiple="_isMultiple" IsDisabled="_isDisabled" AutoClose="_autoClose"></SelectCity>
2040
</DemoBlock>

‎src/BootstrapBlazor.Server/Components/Samples/SelectCities.razor.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,11 @@ public partial class SelectCities
1212
{
1313
private string? _value = null;
1414

15-
private string? _multipleValues = null;
15+
private bool _showSearch = true;
16+
17+
private bool _isMultiple = false;
18+
19+
private bool _isDisabled = false;
20+
21+
private bool _autoClose = true;
1622
}

‎src/BootstrapBlazor.Server/Components/Samples/SelectProvinces.razor‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@page "/select-province"
2+
@inject IStringLocalizer<SelectProvinces> Localizer
3+
4+
<h3>@Localizer["ProvinceTitle"]</h3>
5+
6+
<h4>@Localizer["ProvinceDescription"]</h4>
7+
8+
<PackageTips Name="BootstrapBlazor.Region" />
9+
10+
<DemoBlock Title="@Localizer["ProvinceNormalTitle"]"
11+
Introduction="@Localizer["ProvinceNormalIntro"]"
12+
Name="Normal">
13+
<SelectProvince Value="@_value"></SelectProvince>
14+
</DemoBlock>
15+
16+
<DemoBlock Title="@Localizer["ProvinceMultipleTitle"]"
17+
Introduction="@Localizer["ProvinceMultipleIntro"]"
18+
Name="IsMultiple">
19+
<SelectProvince IsMultiple="true" Value="@_multipleValues"></SelectProvince>
20+
</DemoBlock>

‎src/BootstrapBlazor.Server/Components/Samples/SelectProvinces.razor.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the Apache 2.0 License
3+
// See the LICENSE file in the project root for more information.
4+
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
5+
6+
namespace BootstrapBlazor.Server.Components.Samples;
7+
8+
/// <summary>
9+
/// 省选择器示例
10+
/// </summary>
11+
public partial class SelectProvinces
12+
{
13+
private string? _value = null;
14+
15+
private string? _multipleValues = null;
16+
}
17+

‎src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -524,14 +524,20 @@ void AddForm(DemoMenuItem item)
524524
new()
525525
{
526526
IsNew = true,
527-
Text = Localizer["SelectCity"],
528-
Url = "select-city"
527+
Text = Localizer["SelectRegion"],
528+
Url = "select-region"
529529
},
530530
new()
531531
{
532532
IsNew = true,
533-
Text = Localizer["SelectRegion"],
534-
Url = "select-region"
533+
Text = Localizer["SelectProvince"],
534+
Url = "select-province"
535+
},
536+
new()
537+
{
538+
IsNew = true,
539+
Text = Localizer["SelectCity"],
540+
Url = "select-city"
535541
},
536542
new()
537543
{

‎src/BootstrapBlazor.Server/Locales/en-US.json‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4874,6 +4874,7 @@
48744874
"TaskDashBoard": "TaskDashBoard",
48754875
"Dom2ImageService": "IDom2HtmlService",
48764876
"SelectRegion": "Region Selector",
4877+
"SelectProvince": "Province Selector",
48774878
"SelectCity": "City Selector"
48784879
},
48794880
"BootstrapBlazor.Server.Components.Samples.Table.TablesHeader": {
@@ -7233,8 +7234,14 @@
72337234
"CityTitle": "City Selector",
72347235
"CityDescription": "Provides a city selector classified by province",
72357236
"CityNormalTitle": "Basic usage",
7236-
"CityNormalIntro": "Select a city from the drop-down box",
7237-
"CityMultipleTitle": "Multiple",
7238-
"CityMultipleIntro": "Enable multiple selection mode by setting <code>IsMultiple</code> , and all cities will be automatically selected when clicking a province in the pop-up window."
7237+
"CityNormalIntro": "Select a city from the drop-down box"
7238+
},
7239+
"BootstrapBlazor.Server.Components.Samples.SelectProvinces": {
7240+
"ProvinceTitle": "Province Selector",
7241+
"ProvinceDescription": "Provide a drop-down box to select the province",
7242+
"ProvinceNormalTitle": "Basic usage",
7243+
"ProvinceNormalIntro": "Select the province from the drop-down box",
7244+
"ProvinceMultipleTitle": "Multiple",
7245+
"ProvinceMultipleIntro": "Enable multiple selection mode by setting <code>IsMultiple</code>"
72397246
}
72407247
}

‎src/BootstrapBlazor.Server/Locales/zh-CN.json‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4874,6 +4874,7 @@
48744874
"TaskDashBoard": "任务管理器 TaskDashBoard",
48754875
"Dom2ImageService": "节点转图片服务 IDom2HtmlService",
48764876
"SelectRegion": "行政区域选择器 SelectRegion",
4877+
"SelectProvince": "省选择器 SelectProvince",
48774878
"SelectCity": "城市选择器 SelectCity"
48784879
},
48794880
"BootstrapBlazor.Server.Components.Samples.Table.TablesHeader": {
@@ -7233,8 +7234,14 @@
72337234
"CityTitle": "SelectCity 城市选择器",
72347235
"CityDescription": "提供以省分类的城市选择器",
72357236
"CityNormalTitle": "基本用法",
7236-
"CityNormalIntro": "通过下拉框的形式选择城市",
7237-
"CityMultipleTitle": "多选",
7238-
"CityMultipleIntro": "通过设置 <code>IsMultiple</code> 开启多选模式，点击弹窗中省份时自动选中所有城市"
7237+
"CityNormalIntro": "通过下拉框的形式选择城市"
7238+
},
7239+
"BootstrapBlazor.Server.Components.Samples.SelectProvinces": {
7240+
"ProvinceTitle": "SelectProvince 省选择器",
7241+
"ProvinceDescription": "提供下拉框选择省/直辖市/特别行政区",
7242+
"ProvinceNormalTitle": "基本用法",
7243+
"ProvinceNormalIntro": "通过下拉框的形式选择省/直辖市/特别行政区",
7244+
"ProvinceMultipleTitle": "多选",
7245+
"ProvinceMultipleIntro": "通过设置 <code>IsMultiple</code> 开启多选模式"
72397246
}
72407247
}

‎src/BootstrapBlazor.Server/docs.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,8 @@
257257
"modbus-factory": "Modbus\\ModbusFactories",
258258
"serial-port-factory": "SerialPorts\\SerialPortFactories",
259259
"select-region": "SelectRegions",
260-
"select-city": "SelectCities"
260+
"select-city": "SelectCities",
261+
"select-province": "SelectProvinces"
261262
},
262263
"video": {
263264
"table": "BV1ap4y1x7Qn?p=1",

0 commit comments

Comments
 (0)