Skip to content

Commit 1fc97ce

Browse files
ArgoZhangArgoZhang
committed
Merge branch 'main' into test
2 parents 5e5ca0b + 809ede2 commit 1fc97ce

Some content is hidden

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

47 files changed

+527
-339
lines changed

‎.github/pull_request_template.md‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
## Link issues
22
fixes #{issue number}
3-
<!--
4-
[Please fill in the relevant Issue number after the # above, such as #42]
5-
[请在上方 # 后面填写相关 Issue 编号，如 #42]
6-
-->
3+
4+
<!--[Please fill in the relevant Issue number after the # above, such as #42]-->
5+
<!--[请在上方 # 后面填写相关 Issue 编号，如 #42]-->
6+
77
## Summary By Copilot
88

99

1010
## Regression?
1111
- [ ] Yes
1212
- [ ] No
1313

14-
<!--
15-
[If yes, specify the version the behavior has regressed from]
16-
[是否影响老版本]
17-
-->
14+
<!--[If yes, specify the version the behavior has regressed from]-->
15+
<!--[是否影响老版本]-->
16+
1817
## Risk
1918
- [ ] High
2019
- [ ] Medium
2120
- [ ] Low
2221

23-
<!--
24-
[Justify the selection above]
25-
-->
22+
<!--[Justify the selection above]-->
23+
2624
## Verification
2725
- [ ] Manual (required)
2826
- [ ] Automated

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.2" />
3939
<PackageReference Include="BootstrapBlazor.Gantt" Version="9.0.2" />
4040
<PackageReference Include="BootstrapBlazor.Holiday" Version="9.0.1" />
41-
<PackageReference Include="BootstrapBlazor.Html2Image" Version="9.0.0" />
41+
<PackageReference Include="BootstrapBlazor.Html2Image" Version="9.0.2" />
4242
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="9.0.2" />
4343
<PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.3" />
4444
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="9.0.0" />
@@ -47,9 +47,9 @@
4747
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="9.0.1" />
4848
<PackageReference Include="BootstrapBlazor.Markdown" Version="9.0.1" />
4949
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="9.0.1" />
50-
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.1.7" />
50+
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.1.9" />
5151
<PackageReference Include="BootstrapBlazor.Mermaid" Version="9.0.3" />
52-
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.1.3" />
52+
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.1.6" />
5353
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.1" />
5454
<PackageReference Include="BootstrapBlazor.OctIcon" Version="9.0.4" />
5555
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.1" />
@@ -65,7 +65,7 @@
6565
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.1" />
6666
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
6767
<PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />
68-
<PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.0-beta05" />
68+
<PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.0-beta07" />
6969
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.3" />
7070
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.7" />
7171
</ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<li class="nav-item">
2121
<a class="nav-link" href="tutorials">@TutorialsText</a>
2222
</li>
23-
@if (CultureInfo.CurrentUICulture.Name == "zh-CN")
23+
@* @if (CultureInfo.CurrentUICulture.Name == "zh-CN")
2424
{
2525
<li class="nav-item">
2626
<a class="nav-link" href="https://theme.blazor.zone">主题</a>
2727
</li>
28-
}
28+
} *@
2929
</ul>
3030
</div>
3131
<div class="d-flex flex-fill"></div>

‎src/BootstrapBlazor.Server/Components/Components/ThemeMode.razor.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getTheme, switchTheme } from "../../_content/BootstrapBlazor/modules/utility.js"
1+
import { getTheme, switchTheme, calcCenterPosition } from "../../_content/BootstrapBlazor/modules/utility.js"
22
import EventHandler from "../../_content/BootstrapBlazor/modules/event-handler.js"
33

44
export function init(id) {
@@ -12,7 +12,9 @@ export function init(id) {
1212
else {
1313
theme = 'dark';
1414
}
15-
switchTheme(theme, window.innerWidth, window.innerHeight);
15+
16+
const rect = calcCenterPosition(el);
17+
switchTheme(theme, rect.x, rect.y);
1618
});
1719
}
1820
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66

77
main {
88
min-height: calc(100vh - var(--bs-header-height));
9+
position: relative;
10+
z-index: 10;
911
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
.main {
66
padding: var(--bb-main-pading);
7+
position: relative;
8+
z-index: 5;
79
}
810

911
.sidebar-title {

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ protected override async Task OnInitializedAsync()
110110
{
111111
Text = Localizer["OnlineSheet"],
112112
Url = "tutorials/online-sheet",
113+
},
114+
new()
115+
{
116+
Text = Localizer["MemorialMode"],
117+
Url = "tutorials/memorial",
113118
}
114119
]);
115120
}

‎src/BootstrapBlazor.Server/Components/Pages/Coms.razor‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<div class="coms-search">
55
<div class="row">
66
<div class="col-12">
7-
<Search @bind-Value="@SearchText" PlaceHolder="@Localizer["Search"]" OnSearch="@OnSearch" ShowClearButton="true"></Search>
7+
<Search @bind-Value="@SearchText" PlaceHolder="@Localizer["Search"]"
8+
OnSearch="@OnSearch" OnClear="OnClear" ShowClearButton="true"></Search>
89
</div>
910
</div>
1011
<div class="coms-search-filter">

‎src/BootstrapBlazor.Server/Components/Pages/Coms.razor.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,11 @@ public sealed partial class Coms
1919
SearchText = searchText;
2020
return Task.FromResult<IEnumerable<string?>>(ComponentItems.Where(i => i.Contains(searchText, StringComparison.OrdinalIgnoreCase)).ToList());
2121
}
22+
23+
private Task OnClear(string searchText)
24+
{
25+
SearchText = "";
26+
StateHasChanged();
27+
return Task.CompletedTask;
28+
}
2229
}

‎src/BootstrapBlazor.Server/Components/Pages/Template.razor‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,4 @@
2424
<p class="code-label">@Localizer["P7"]</p>
2525
<Pre>dotnet new uninstall Bootstrap.Blazor.Templates</Pre>
2626

27-
<h4>@Localizer["SubTitle1"]</h4>
28-
29-
<p>@((MarkupString)Localizer["P8"].Value)</p>
30-
31-
<p class="code-label">1. @Localizer["P9"]</p>
32-
33-
<p>@Localizer["P10"] <b>Visual Studio @Localizer["P11"]</b> @Localizer["P12"] <b>@Localizer["P13"]</b> <a href="https://marketplace.visualstudio.com/items?itemName=Longbow.BootstrapBlazorUITemplate" target="_blank">[@Localizer["P14"]]</a> @Localizer["P15"] <a href="@TemplateUrl" target="_blank">[@Localizer["P16"]]</a></p>
34-
35-
<img src="@WebsiteOption.CurrentValue.GetAssetUrl("images/search-extensions.png")" style="width: 800px; border-radius: 6px;" class="d-none d-sm-block mb-3" />
36-
37-
<img src="@WebsiteOption.CurrentValue.GetAssetUrl("images/download-extensions.png")" style="width: 800px; border-radius: 6px;" class="d-none d-sm-block mb-3" />
38-
39-
<p class="code-label">2. @Localizer["P17"]</p>
40-
41-
<img src="@WebsiteOption.CurrentValue.GetAssetUrl("images/install-extensions.png")" style="width: auto; border-radius: 6px;" class="d-none d-sm-block mb-3" />
42-
43-
<img src="@WebsiteOption.CurrentValue.GetAssetUrl("images/install-finish.png")" style="width: auto; border-radius: 6px;" class="d-none d-sm-block mb-3" />
44-
45-
<p class="code-label">3. @Localizer["P18"]</p>
46-
47-
<img src="@WebsiteOption.CurrentValue.GetAssetUrl("images/create-project.png")" style="width: 800px; border-radius: 6px;" class="d-none d-sm-block mb-3" />
48-
49-
<img src="@WebsiteOption.CurrentValue.GetAssetUrl("images/project.png")" style="width: 400px; border-radius: 6px;" class="d-none d-sm-block mb-3" />
50-
5127
<Video Name="template" />

0 commit comments

Comments
 (0)