Merge branch 'dotnetcore:main' into main

Author: syminomega

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

@@ -31,9 +31,9 @@
     <PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="9.0.2" />
     <PackageReference Include="BootstrapBlazor.Chart" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.ChatBot" Version="9.0.0" />
-    <PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.0" />
+    <PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0" />
-    <PackageReference Include="BootstrapBlazor.DockView" Version="9.1.13" />
+    <PackageReference Include="BootstrapBlazor.DockView" Version="9.1.16" />
     <PackageReference Include="BootstrapBlazor.DriverJs" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.FileViewer" Version="9.0.0" />
@@ -56,6 +56,7 @@
     <PackageReference Include="BootstrapBlazor.MindMap" Version="9.1.6" />
     <PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.OctIcon" Version="9.0.4" />
+    <PackageReference Include="BootstrapBlazor.OfficeViewer" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.PdfViewer" Version="9.0.3" />
@@ -67,7 +68,7 @@
     <PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.4" />
-    <PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.5" />
+    <PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
     <PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.5" />

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

@@ -14,18 +14,9 @@
             <li class="nav-item">
                 <a class="nav-link" href="introduction">@IntroductionText</a>
             </li>
-            <li class="nav-item">
-                <a class="nav-link" href="components">@ComponentsText</a>
-            </li>
             <li class="nav-item">
                 <a class="nav-link" href="tutorials">@TutorialsText</a>
             </li>
-            @* @if (CultureInfo.CurrentUICulture.Name == "zh-CN")
-            {
-                <li class="nav-item">
-                    <a class="nav-link" href="https://theme.blazor.zone">主题</a>
-                </li>
-            } *@
         </ul>
     </div>
     <div class="d-flex flex-fill"></div>
@@ -43,7 +34,7 @@
             </a>
         </li>
         <li class="nav-item">
-            <FullScreenButton class="nav-link p-2" TooltipText="点击切换全屏模式" />
+            <FullScreenButton class="nav-link p-2" TooltipText="@Localizer["FullScreenTooltipText"]" />
         </li>
     </ul>
     <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>

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

@@ -30,9 +30,6 @@ public partial class Header
     [NotNull]
     private string? IntroductionText { get; set; }
 
-    [NotNull]
-    private string? ComponentsText { get; set; }
-
     [NotNull]
     private string? DownloadText { get; set; }
 
@@ -53,7 +50,6 @@ protected override void OnInitialized()
         DownloadText ??= Localizer[nameof(DownloadText)];
         HomeText ??= Localizer[nameof(HomeText)];
         IntroductionText ??= Localizer[nameof(IntroductionText)];
-        ComponentsText ??= Localizer[nameof(ComponentsText)];
         TutorialsText ??= Localizer[nameof(TutorialsText)];
         _versionString = $"v{PackageVersionService.Version}";
     }

src/BootstrapBlazor.Server/Components/Layout/PageLayout.razor

@@ -6,9 +6,11 @@
 </HeadContent>
 
 <CascadingValue Value="this" IsFixed="true">
-    <Layout IsPage="true" IsFullSide="@IsFullSide" IsFixedHeader="@IsFixedHeader" IsFixedFooter="@IsFixedFooter" IsFixedTabHeader="IsFixedTabHeader"
+    <Layout IsPage="true" IsFullSide="@IsFullSide" IsFixedHeader="@IsFixedHeader"
+            IsFixedFooter="@IsFixedFooter" IsFixedTabHeader="IsFixedTabHeader"
             ShowFooter="@ShowFooter" ShowGotoTop="true" ShowCollapseBar="true" Menus="@Menus"
-            UseTabSet="@UseTabSet" TabDefaultUrl="layout-page" AdditionalAssemblies="new[] { GetType().Assembly }" class="@LayoutClassString">
+            UseTabSet="@UseTabSet" TabDefaultUrl="layout-page" AdditionalAssemblies="new[] { GetType().Assembly }"
+            class="@LayoutClassString">
         <Header>
             <span class="ms-3 flex-fill">Bootstrap of Blazor</span>
             <Widget></Widget>

src/BootstrapBlazor.Server/Components/Layout/PageLayout.razor.cs

@@ -61,7 +61,7 @@ protected override async Task OnInitializedAsync()
 
         Menus = new List<MenuItem>
         {
-            new() { Text = "返回组件库", Icon = "fa-fw fa-solid fa-house", Url = "components" },
+            new() { Text = "返回文档", Icon = "fa-fw fa-solid fa-house", Url = "introduction" },
             new() { Text = "后台模拟器", Icon = "fa-fw fa-solid fa-desktop", Url = "layout-page" },
             new() { Text = "示例网页", Icon = "fa-fw fa-solid fa-laptop", Url = "layout-demo/text=Parameter1" }
         };