diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj index b318c5d6181..12923e10f56 100644 --- a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj +++ b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj @@ -31,38 +31,38 @@ - + - + - + - + - + - + - + diff --git a/src/BootstrapBlazor.Server/Components/App.razor b/src/BootstrapBlazor.Server/Components/App.razor index 04b4760bb27..d73225e4964 100644 --- a/src/BootstrapBlazor.Server/Components/App.razor +++ b/src/BootstrapBlazor.Server/Components/App.razor @@ -10,7 +10,7 @@ - + @Localizer["SiteTitle"] @@ -42,7 +42,7 @@ - + @if (Env.IsProduction()) { diff --git a/src/BootstrapBlazor.Server/Components/Layout/ComponentLayout.razor.css b/src/BootstrapBlazor.Server/Components/Layout/ComponentLayout.razor.css index 508cba78b00..f93e04c67c2 100644 --- a/src/BootstrapBlazor.Server/Components/Layout/ComponentLayout.razor.css +++ b/src/BootstrapBlazor.Server/Components/Layout/ComponentLayout.razor.css @@ -33,7 +33,7 @@ .tabs-coms ::deep > .tabs > .tabs-header { position: sticky; top: 0; - z-index: 20; + z-index: 11; } ::deep :is(.code-razor, .code-cs) pre { diff --git a/src/BootstrapBlazor.Server/Extensions/ServicesCollectionExtensions.cs b/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs similarity index 98% rename from src/BootstrapBlazor.Server/Extensions/ServicesCollectionExtensions.cs rename to src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs index a224715fff3..b25b5e7af17 100644 --- a/src/BootstrapBlazor.Server/Extensions/ServicesCollectionExtensions.cs +++ b/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs @@ -10,7 +10,7 @@ namespace Microsoft.Extensions.DependencyInjection; /// /// 注册服务扩展方法 /// -public static class ServicesCollectionExtensions +public static class ServiceCollectionSharedExtensions { /// /// 添加示例后台任务 diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json index 76befef8b70..35d5d6d2f2a 100644 --- a/src/BootstrapBlazor.Server/Locales/en-US.json +++ b/src/BootstrapBlazor.Server/Locales/en-US.json @@ -4730,7 +4730,7 @@ "CountButton": "CountButton", "Splitting": "Splitting", "QueryBuilder": "QueryBuilder", - "SerialService": "ISerialService", + "WebSerial": "ISerialService", "MindMap": "Mind Map", "Mermaid": "Mermaid", "Marquee": "Marquee", @@ -6328,7 +6328,7 @@ "MermaidTitle": "Mermaid", "MermaidDescription": "This component renders Markdown-inspired text definitions to dynamically create and modify diagrams.", "MermaidNormalTitle": "Basic usage", - "NormalIntro": "Mermaid basic style", + "MermaidNormalIntro": "Mermaid basic style", "MermaidStyleTitle": "Custom styles", "MermaidStyleIntro": "", "MermaidType": "Type" diff --git a/src/BootstrapBlazor.Server/docs.json b/src/BootstrapBlazor.Server/docs.json index b034d96f834..d01dc3a1578 100644 --- a/src/BootstrapBlazor.Server/docs.json +++ b/src/BootstrapBlazor.Server/docs.json @@ -99,6 +99,7 @@ "locator": "Locators", "logout": "Logouts", "icon": "BootstrapBlazorIcons", + "iframe": "IFrames", "image-viewer": "ImageViewers", "input-number": "InputNumbers", "input": "Inputs", @@ -140,6 +141,7 @@ "search-dialog": "SearchDialogs", "search": "Searches", "select": "Selects", + "select-generic": "SelectGenerics", "select-object": "SelectObjects", "select-tree": "SelectTrees", "select-table": "SelectTables", diff --git a/test/UnitTestDocs/MenuTest.cs b/test/UnitTestDocs/MenuTest.cs index 6fb8c9c7523..92c5f155960 100644 --- a/test/UnitTestDocs/MenuTest.cs +++ b/test/UnitTestDocs/MenuTest.cs @@ -129,7 +129,7 @@ public void Localizer_Compare(string sourceLanguage, string targetLanguage) var target = configEn.GetChildren().SelectMany(section => section.GetChildren().Select(i => $"{section.Key} - {i.Key}")).ToList(); var result = new List(); - source.Where(i => !target.Contains(i)).ToList().ForEach(i => + source.Except(target).ToList().ForEach(i => { result.Add(i); _logger.WriteLine(i);