Skip to content

Commit 0d16b4d

Browse files
dotnetstddotnetstd
authored
Merge branch 'dotnetcore:main' into main
2 parents 13d3d50 + 280fec1 commit 0d16b4d

File tree

130 files changed

+1871
-458
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+1871
-458
lines changed

‎.github/workflows/docker.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches:
66
- pack
77
- release
8+
- docker
89

910
jobs:
1011
docker:

‎BootstrapBlazor.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "localization", "localizatio
4646
localization\pt.json = localization\pt.json
4747
localization\ru-RU.json = localization\ru-RU.json
4848
localization\th-TH.json = localization\th-TH.json
49+
localization\uk-UA.json = localization\uk-UA.json
4950
localization\zh-TW.json = localization\zh-TW.json
5051
EndProjectSection
5152
EndProject

‎BootstrapBlazor.slnx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
<File Path="localization/de.json" />
1414
<File Path="localization/es.json" />
1515
<File Path="localization/pt.json" />
16+
<File Path="localization/ru-RU.json" />
1617
<File Path="localization/th-TH.json" />
18+
<File Path="localization/uk-UA.json" />
1719
<File Path="localization/zh-TW.json" />
1820
</Folder>
1921
<Folder Name="/scripts/" />

‎exclusion.dic‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,6 @@ univer
118118
rdkit
119119
webkitdirectory
120120
dotx
121+
Modbus
122+
Protocol
123+
vditor

‎localization/uk-UA.json‎

Lines changed: 373 additions & 0 deletions
Large diffs are not rendered by default.

‎scripts/linux/deploy.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
4040
yes|sudo apt install ./google-chrome-stable_current_amd64.deb
4141

4242
echo "*********************** install support font ***********************"
43-
sudo apt install fonts-wqy-microhei
43+
yes|sudo apt install fonts-wqy-microhei
4444

4545
echo "*********************** install DOTNET ***********************"
4646
wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,22 @@
3232
<PackageReference Include="BootstrapBlazor.Chart" Version="9.0.0" />
3333
<PackageReference Include="BootstrapBlazor.ChatBot" Version="9.0.0" />
3434
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.3" />
35-
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.1" />
35+
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.3" />
3636
<PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0" />
37-
<PackageReference Include="BootstrapBlazor.DockView" Version="9.1.18" />
37+
<PackageReference Include="BootstrapBlazor.DockView" Version="9.1.19" />
38+
<PackageReference Include="BootstrapBlazor.Dom2Image" Version="9.0.0" />
3839
<PackageReference Include="BootstrapBlazor.DriverJs" Version="9.0.3" />
3940
<PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.3" />
4041
<PackageReference Include="BootstrapBlazor.FileViewer" Version="9.0.0" />
4142
<PackageReference Include="BootstrapBlazor.FluentSystemIcon" Version="9.0.1" />
42-
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.1.0" />
43+
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.1.1" />
4344
<PackageReference Include="BootstrapBlazor.Gantt" Version="9.0.2" />
4445
<PackageReference Include="BootstrapBlazor.Holiday" Version="9.0.1" />
4546
<PackageReference Include="BootstrapBlazor.Html2Image" Version="9.0.2" />
4647
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="9.0.3" />
4748
<PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.3" />
4849
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="9.0.3" />
49-
<PackageReference Include="BootstrapBlazor.IP2Region" Version="9.0.2" />
50+
<PackageReference Include="BootstrapBlazor.IP2Region" Version="9.0.3" />
5051
<PackageReference Include="BootstrapBlazor.JitsiMeet" Version="9.0.0" />
5152
<PackageReference Include="BootstrapBlazor.JuHeIpLocatorProvider" Version="9.0.0" />
5253
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="9.0.1" />
@@ -63,24 +64,27 @@
6364
<PackageReference Include="BootstrapBlazor.OpcDa" Version="9.0.3" />
6465
<PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.1" />
6566
<PackageReference Include="BootstrapBlazor.PdfViewer" Version="9.0.6" />
66-
<PackageReference Include="BootstrapBlazor.Player" Version="9.0.1" />
67+
<PackageReference Include="BootstrapBlazor.Player" Version="9.0.2" />
6768
<PackageReference Include="BootstrapBlazor.RDKit" Version="9.0.2" />
6869
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.1" />
6970
<PackageReference Include="BootstrapBlazor.SmilesDrawer" Version="9.0.2" />
7071
<PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.3" />
7172
<PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.3" />
72-
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.3" />
73-
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.4" />
73+
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.4" />
74+
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.7" />
7475
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
75-
<PackageReference Include="BootstrapBlazor.TcpSocket" Version="9.0.0" />
76+
<PackageReference Include="BootstrapBlazor.Tasks.Dashboard" Version="9.0.0" />
7677
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.1" />
7778
<PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />
7879
<PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.5" />
7980
<PackageReference Include="BootstrapBlazor.Vditor" Version="9.0.0" />
8081
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.3" />
8182
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.7" />
8283
<PackageReference Include="Longbow.Logging" Version="9.0.1" />
83-
<PackageReference Include="Longbow.Tasks" Version="9.0.0" />
84+
<PackageReference Include="Longbow.Modbus" Version="9.0.0" />
85+
<PackageReference Include="Longbow.Socket" Version="9.0.3" />
86+
<PackageReference Include="Longbow.Tasks" Version="9.0.2" />
87+
<PackageReference Include="Longbow.TcpSocket" Version="9.0.3" />
8488
</ItemGroup>
8589

8690
<ItemGroup>
@@ -89,15 +93,15 @@
8993

9094
<ItemGroup>
9195
<Using Include="BootstrapBlazor.Components" />
92-
<Using Include="BootstrapBlazor.DataAdapters" />
93-
<Using Include="BootstrapBlazor.DataHandlers" />
94-
<Using Include="BootstrapBlazor.DataConverters" />
95-
<Using Include="BootstrapBlazor.TcpSocket" />
9696
<Using Include="BootstrapBlazor.Server.Components.Components" />
9797
<Using Include="BootstrapBlazor.Server.Components.Layout" />
9898
<Using Include="BootstrapBlazor.Server.Data" />
9999
<Using Include="BootstrapBlazor.Server.Extensions" />
100100
<Using Include="BootstrapBlazor.Server.Services" />
101+
<Using Include="Longbow.Socket.DataAdapters" />
102+
<Using Include="Longbow.Socket.DataConverters" />
103+
<Using Include="Longbow.Socket.DataHandlers" />
104+
<Using Include="Longbow.TcpSocket" />
101105
<Using Include="Microsoft.AspNetCore.Components" />
102106
<Using Include="Microsoft.Extensions.Configuration" />
103107
<Using Include="Microsoft.Extensions.DependencyInjection" />

‎src/BootstrapBlazor.Server/Components/App.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<meta name="description" content="基于 Bootstrap 风格的 Blazor UI 组件库，用于研发企业级中后台产品。">
1515
<meta name="author" content="argo ([email protected])">
1616
<meta name="theme-color" content="#712cf9">
17-
<title>@Localizer["SiteTitle"]</title>
17+
<title>Bootstrap Blazor - 组件库</title>
1818
<base href="/" />
1919
<link rel="icon" href="favicon.ico" type="image/x-icon">
2020
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">

‎src/BootstrapBlazor.Server/Components/Components/CustomerFilter.razor‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
@if (IsHeaderRow)
44
{
5-
5+
<Select Items="@_items" @bind-Value="@_value" IsUseDefaultItemWhenValueIsNull="true" IsPopover="true"
6+
ShowLabel="false" SkipValidate="true" OnSelectedItemChanged="_ => OnFilterAsync()"></Select>
67
}
78
else
89
{
9-
<Select Items="@_items" @bind-Value="@Value"></Select>
10+
<Select Items="@_items" @bind-Value="@_value" IsUseDefaultItemWhenValueIsNull="true" IsPopover="true"></Select>
1011
}

‎src/BootstrapBlazor.Server/Components/Components/CustomerFilter.razor.cs‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,45 @@
33
// See the LICENSE file in the project root for more information.
44
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
55

6+
using BootstrapBlazor.Server.Components.Samples.Table;
7+
68
namespace BootstrapBlazor.Server.Components.Components;
79

810
/// <summary>
9-
///
11+
/// CustomerFilter 组件示例代码
1012
/// </summary>
1113
public partial class CustomerFilter
1214
{
13-
private int? Value;
15+
[Inject]
16+
[NotNull]
17+
private IStringLocalizer<TablesFilter>? TableFilterLocalizer { get; set; }
18+
19+
private int? _value;
1420

15-
private readonly IEnumerable<SelectedItem> _items = new SelectedItem[]
21+
private List<SelectedItem> _items = [];
22+
23+
/// <summary>
24+
/// <inheritdoc />
25+
/// </summary>
26+
protected override void OnInitialized()
1627
{
17-
new() { Value = "", Text = "请选择 ..." },
18-
new() { Value = "10", Text = "大于 10" },
19-
new() { Value = "50", Text = "大于 50" },
20-
new() { Value = "80", Text = "大于 80" }
21-
};
28+
base.OnInitialized();
29+
30+
_items =
31+
[
32+
new SelectedItem { Value = "", Text = TableFilterLocalizer["CustomerFilterItem1"] },
33+
new SelectedItem { Value = "10", Text = TableFilterLocalizer["CustomerFilterItem2"] },
34+
new SelectedItem { Value = "50", Text = TableFilterLocalizer["CustomerFilterItem3"] },
35+
new SelectedItem { Value = "80", Text = TableFilterLocalizer["CustomerFilterItem4"] }
36+
];
37+
}
2238

2339
/// <summary>
2440
/// 重置过滤条件方法
2541
/// </summary>
2642
public override void Reset()
2743
{
28-
Value = null;
44+
_value = null;
2945
StateHasChanged();
3046
}
3147

@@ -36,12 +52,12 @@ public override void Reset()
3652
public override FilterKeyValueAction GetFilterConditions()
3753
{
3854
var filter = new FilterKeyValueAction();
39-
if (Value != null)
55+
if (_value != null)
4056
{
4157
filter.Filters.Add(new FilterKeyValueAction()
4258
{
4359
FieldKey = FieldKey,
44-
FieldValue = Value.Value,
60+
FieldValue = _value.Value,
4561
FilterAction = FilterAction.GreaterThan
4662
});
4763
}

0 commit comments

Comments
 (0)