Skip to content

Commit 8a5e3a8

Browse files
ArgoZhangArgoZhang
committed
Merge branch 'main' into feat-net10
2 parents 1062f7b + c5606b1 commit 8a5e3a8

File tree

77 files changed

+1213
-261
lines changed

Some content is hidden

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

77 files changed

+1213
-261
lines changed

‎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

‎localization/uk-UA.json‎

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

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@
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" />
3737
<PackageReference Include="BootstrapBlazor.DockView" Version="9.1.18" />
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" />
@@ -46,7 +47,7 @@
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,17 +64,18 @@
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" />
71+
<PackageReference Include="BootstrapBlazor.Socket" Version="9.0.4" />
7072
<PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.3" />
7173
<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" />
74+
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.4" />
75+
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.7" />
7476
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
7577
<PackageReference Include="BootstrapBlazor.Tasks.Dashboard" Version="9.0.0" />
76-
<PackageReference Include="BootstrapBlazor.TcpSocket" Version="9.0.0" />
78+
<PackageReference Include="BootstrapBlazor.TcpSocket" Version="9.0.4" />
7779
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.1" />
7880
<PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />
7981
<PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.5" />

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ else
99
{
1010
<Select Items="@_items" @bind-Value="@_value" IsUseDefaultItemWhenValueIsNull="true" IsPopover="true"></Select>
1111
}
12-
13-

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<FullScreenButton class="nav-link p-2" TooltipText="@Localizer["FullScreenTooltipText"]" />
3838
</li>
3939
</ul>
40-
<a class="btn btn-bd-download d-none d-lg-block mb-3 mb-md-0 ms-md-3" target="_blank" href="@DownloadUrl">@DownloadText</a>
40+
<a class="btn btn-bd-download d-none d-lg-block mb-3 mb-md-0 ms-md-3" target="_blank" href="@WebsiteOption.Value.WikiUrl">@DownloadText</a>
4141
<div class="navbar-version ms-2">@_versionString</div>
4242
<ThemeProvider class="ms-2 d-none d-lg-block"></ThemeProvider>
4343
</header>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public partial class Header
3636
[NotNull]
3737
private string? TutorialsText { get; set; }
3838

39-
private const string DownloadUrl = "https://github.com/dotnetcore/BootstrapBlazor/releases?wt.mc_id=DT-MVP-5004174";
40-
4139
private string _versionString = "";
4240

4341
/// <summary>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<i class="fa-solid fa-flag" style="cursor: pointer;" @onclick="ToggleShow" />

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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.Components;
7+
8+
/// <summary>
9+
/// TooltipContent 组件用于显示 Tooltip 的内容
10+
/// </summary>
11+
public partial class TooltipContent
12+
{
13+
[CascadingParameter]
14+
private Tooltip? Tooltip { get; set; }
15+
16+
private async Task ToggleShow()
17+
{
18+
if (Tooltip == null)
19+
{
20+
return;
21+
}
22+
23+
await Tooltip.Toggle();
24+
}
25+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="bb-foundation">
1212
<div class="bb-foundation-content">本项目属于 <a href="https://www.dotnetfoundation.org/">.NET 基金会</a>，并根据其 <a href="https://www.dotnetfoundation.org/code-of-conduct">行为准则</a> 运作</div>
1313
<a class="bb-foundation-img d-none d-sm-block" href="https://www.dotnetfoundation.org/">
14-
<img src="@WebsiteOption.Value.GetAssetUrl("images/dotnet_foundation_v4.png")" width="100" />
14+
<img src="@WebsiteOption.Value.GetAssetUrl("images/dotnet_foundation_v4.png")" alt="dotnet-foundation" width="100" />
1515
</a>
1616
</div>
1717
<div class="footer-body">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<DialButton DialMode="DialMode.Radial" Icon="fa-solid fa-gear" Radius="100" Placement="Placement.BottomEnd" class="bb-dial-gear">
2222
<ButtonTemplate>
2323
<div class="btn-circle btn-fade dial-button-gear">
24-
<img src="@WebsiteOption.Value.GetAssetUrl("images/logo.png")" />
24+
<img src="@WebsiteOption.Value.GetAssetUrl("images/logo.png")" alt="logo" />
2525
</div>
2626
</ButtonTemplate>
2727
<ChildContent>

0 commit comments

Comments
 (0)