Skip to content

Commit 98aca6f

Browse files
ArgoZhangArgoZhang
committed
Merge branch 'main' into feat-net10
2 parents e23fd94 + 302c23e commit 98aca6f

35 files changed

+213
-50
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:

‎scripts/linux/deploy.sh‎

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

4343
echo "*********************** install support font ***********************"
44-
sudo apt install fonts-wqy-microhei
44+
yes|sudo apt install fonts-wqy-microhei
4545

4646
echo "*********************** install DOTNET ***********************"
4747
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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.3" />
7373
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.4" />
7474
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
75+
<PackageReference Include="BootstrapBlazor.Tasks.Dashboard" Version="9.0.0" />
7576
<PackageReference Include="BootstrapBlazor.TcpSocket" Version="9.0.0" />
7677
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.1" />
7778
<PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />
@@ -80,7 +81,7 @@
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.Tasks" Version="9.0.2" />
8485
</ItemGroup>
8586

8687
<ItemGroup>

‎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: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
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
}
12+
13+

‎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
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<div class="mask-dialog-demo row">
2+
<div class="col-12">
3+
<h3>MaskDemo</h3>
4+
</div>
5+
<div class="col-12">
6+
<DialogCloseButton></DialogCloseButton>
7+
</div>
8+
</div>

‎src/BootstrapBlazor.Server/Components/Components/MaskDemo.razor.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.mask-dialog-demo {
2+
background-color: var(--bs-body-bg);
3+
border-radius: var(--bs-border-radius);
4+
padding: 1rem;
5+
}

‎src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
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.Data;
76
using Microsoft.Extensions.Options;
87
using Microsoft.JSInterop;
98

‎src/BootstrapBlazor.Server/Components/Layout/MainLayout.razor‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,21 @@
2929
<ThemeMode></ThemeMode>
3030
</DialButtonItem>
3131
<DialButtonItem>
32-
<LinkButton TooltipPlacement="Placement.Left" ButtonStyle="ButtonStyle.Circle" Color="Color.None" TooltipText="@ChatTooltip" class="btn-fade btn-chat" Url="./ai-chat" Icon="fa-solid fa-comments"></LinkButton>
32+
<Tooltip Title="@ChatTooltip" Placement="Placement.Left" class="btn btn-circle btn-fade btn-dial-item d-flex">
33+
<a href="./ai-chat">
34+
<i class="fa-solid fa-comments"></i>
35+
</a>
36+
</Tooltip>
3337
</DialButtonItem>
3438
<DialButtonItem>
3539
<ThemeChooser></ThemeChooser>
3640
</DialButtonItem>
3741
<DialButtonItem>
38-
<LinkButton TooltipPlacement="Placement.Left" ButtonStyle="ButtonStyle.Circle" Color="Color.None" TooltipText="@Title" class="btn-fade btn-update" Url="@WebsiteOption.Value.WikiUrl" Target="_blank" ImageUrl="@WebsiteOption.Value.GetAssetUrl("images/log.svg")"></LinkButton>
42+
<Tooltip Title="@ChatTooltip" Placement="Placement.Left" class="btn btn-circle btn-fade btn-dial-item d-flex">
43+
<a href="@WebsiteOption.Value.WikiUrl" target="_blank">
44+
<i class="fa-solid fa-file-circle-check"></i>
45+
</a>
46+
</Tooltip>
3947
</DialButtonItem>
4048
</ChildContent>
4149
</DialButton>

0 commit comments

Comments
 (0)