From b4579ebaa3a7bd470b6719b3cd8dfc6cf6d8ee47 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 25 Mar 2025 17:53:59 +0800 Subject: [PATCH 01/17] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BootstrapBlazor.sln | 7 +++++++ src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj | 1 + 2 files changed, 8 insertions(+) diff --git a/BootstrapBlazor.sln b/BootstrapBlazor.sln index c0db3d47fbb..2ef3e336783 100644 --- a/BootstrapBlazor.sln +++ b/BootstrapBlazor.sln @@ -78,6 +78,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{9BAF50BE EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTest.Benchmarks", "tools\Benchmarks\UnitTest.Benchmarks.csproj", "{3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.AzureSpeech", "..\BootstrapBlazor.Extensions\src\components\BootstrapBlazor.AzureSpeech\BootstrapBlazor.AzureSpeech.csproj", "{F20E277F-4236-6487-BCF0-E0AE6745327E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -112,6 +114,10 @@ Global {3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}.Release|Any CPU.Build.0 = Release|Any CPU + {F20E277F-4236-6487-BCF0-E0AE6745327E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F20E277F-4236-6487-BCF0-E0AE6745327E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F20E277F-4236-6487-BCF0-E0AE6745327E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F20E277F-4236-6487-BCF0-E0AE6745327E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -128,6 +134,7 @@ Global {D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF} = {7C1D79F1-87BC-42C1-BD5A-CDE4044AC1BD} {C075C6C8-B9CB-4AC0-9BDF-B2002B4AB99C} = {EA765165-0542-41C8-93F2-85787FEDEDFF} {3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1} = {9BAF50BE-141D-4429-93A9-942F373D1F68} + {F20E277F-4236-6487-BCF0-E0AE6745327E} = {A2182155-43ED-44C1-BF6F-1B70EBD2DFFE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0DCB0756-34FA-4FD0-AE1D-D3F08B5B3A6B} diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj index cf06face498..504a2c9d2d6 100644 --- a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj +++ b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj @@ -77,6 +77,7 @@ + From c4eac3a22fcd7e656f4b19e510cdfbfade69542b Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 25 Mar 2025 20:16:07 +0800 Subject: [PATCH 02/17] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Server/Locales/en-US.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json index 024244ffdbe..ffc0befac1c 100644 --- a/src/BootstrapBlazor.Server/Locales/en-US.json +++ b/src/BootstrapBlazor.Server/Locales/en-US.json @@ -5033,7 +5033,7 @@ "ShowUnsetGroupItemsOnTopAttr": "Whether ungrouped edits are rendered at the beginning", "ShowSkeletonAttr": "Whether to display skeleton screen when first render", "ShowLoadingInFirstRenderAttr": "Whether to display the loading animation when first render", - "ShowColumnListAttr": "Show columnshow/hide control buttons", + "ShowColumnListAttr": "Show Column show/hide control buttons", "OnColumnVisibleChangedAttr": "Trigger this callback when switch show/hide column in the list", "ShowEmptyAttr": "Show no data prompts", "ShowToastAfterSaveOrDeleteModelAttr": "Do you show a toast prompt box after a save/delete failure", From 5ceadcd30802789d9bc143a67fc87740311a69e7 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 25 Mar 2025 20:16:21 +0800 Subject: [PATCH 03/17] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extensions/ServiceCollectionSharedExtensions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs b/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs index b3299da04d8..2bb43263caf 100644 --- a/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs +++ b/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs @@ -44,10 +44,10 @@ public static IServiceCollection AddBootstrapBlazorServices(this IServiceCollect services.AddBootstrapBlazor(configureOptions); // 增加 Azure 语音服务 - //services.AddBootstrapBlazorAzureSpeech(); + services.AddBootstrapBlazorAzureSpeech(); // 增加 Baidu 语音服务 - services.AddBootstrapBlazorBaiduSpeech(); + //services.AddBootstrapBlazorBaiduSpeech(); // 增加 Baidu ORC 服务 services.AddBootstrapBlazorBaiduOcr(); From 8fa835de4b96623ac12d3e8c26ccd0395fc4aeb4 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 25 Mar 2025 20:16:32 +0800 Subject: [PATCH 04/17] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=20Baidu=20?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj index 504a2c9d2d6..0295d29536f 100644 --- a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj +++ b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj @@ -23,7 +23,7 @@ - + From f7d3c64efb7a8e299a58cd2fe5e2b4220869b1e7 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 08:26:05 +0800 Subject: [PATCH 05/17] =?UTF-8?q?revert:=20=E6=92=A4=E9=94=80=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BE=9D=E8=B5=96=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BootstrapBlazor.sln | 7 ------- src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj | 1 - 2 files changed, 8 deletions(-) diff --git a/BootstrapBlazor.sln b/BootstrapBlazor.sln index 2ef3e336783..c0db3d47fbb 100644 --- a/BootstrapBlazor.sln +++ b/BootstrapBlazor.sln @@ -78,8 +78,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{9BAF50BE EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTest.Benchmarks", "tools\Benchmarks\UnitTest.Benchmarks.csproj", "{3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.AzureSpeech", "..\BootstrapBlazor.Extensions\src\components\BootstrapBlazor.AzureSpeech\BootstrapBlazor.AzureSpeech.csproj", "{F20E277F-4236-6487-BCF0-E0AE6745327E}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -114,10 +112,6 @@ Global {3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1}.Release|Any CPU.Build.0 = Release|Any CPU - {F20E277F-4236-6487-BCF0-E0AE6745327E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F20E277F-4236-6487-BCF0-E0AE6745327E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F20E277F-4236-6487-BCF0-E0AE6745327E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F20E277F-4236-6487-BCF0-E0AE6745327E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -134,7 +128,6 @@ Global {D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF} = {7C1D79F1-87BC-42C1-BD5A-CDE4044AC1BD} {C075C6C8-B9CB-4AC0-9BDF-B2002B4AB99C} = {EA765165-0542-41C8-93F2-85787FEDEDFF} {3E6D8D0E-5A36-4CFD-8612-7D64E3FFE7B1} = {9BAF50BE-141D-4429-93A9-942F373D1F68} - {F20E277F-4236-6487-BCF0-E0AE6745327E} = {A2182155-43ED-44C1-BF6F-1B70EBD2DFFE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0DCB0756-34FA-4FD0-AE1D-D3F08B5B3A6B} diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj index 0295d29536f..bc31e3db0fa 100644 --- a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj +++ b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj @@ -77,7 +77,6 @@ - From d9ec27a67acde0e867706295f93cf8ab54d0768f Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 08:26:19 +0800 Subject: [PATCH 06/17] =?UTF-8?q?Revert=20"refactor:=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5ceadcd30802789d9bc143a67fc87740311a69e7. --- .../Extensions/ServiceCollectionSharedExtensions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs b/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs index 2bb43263caf..b3299da04d8 100644 --- a/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs +++ b/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs @@ -44,10 +44,10 @@ public static IServiceCollection AddBootstrapBlazorServices(this IServiceCollect services.AddBootstrapBlazor(configureOptions); // 增加 Azure 语音服务 - services.AddBootstrapBlazorAzureSpeech(); + //services.AddBootstrapBlazorAzureSpeech(); // 增加 Baidu 语音服务 - //services.AddBootstrapBlazorBaiduSpeech(); + services.AddBootstrapBlazorBaiduSpeech(); // 增加 Baidu ORC 服务 services.AddBootstrapBlazorBaiduOcr(); From 0c60dfe428446a6e80a566b5002c20deda2c4504 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 08:26:30 +0800 Subject: [PATCH 07/17] =?UTF-8?q?Revert=20"chore:=20=E7=A7=BB=E9=99=A4=20B?= =?UTF-8?q?aidu=20=E8=AF=AD=E9=9F=B3=E6=9C=8D=E5=8A=A1"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8fa835de4b96623ac12d3e8c26ccd0395fc4aeb4. --- src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj index bc31e3db0fa..cf06face498 100644 --- a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj +++ b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj @@ -23,7 +23,7 @@ - + From 16792d03b3d89e836430ee3075a3bc41069a9ad6 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 10:08:09 +0800 Subject: [PATCH 08/17] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj index cf06face498..26b4e5d6068 100644 --- a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj +++ b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj @@ -62,7 +62,7 @@ - + From eeb838c3be745c53f19fba743509a176bf912ffa Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 11:13:25 +0800 Subject: [PATCH 09/17] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=20Chrome=20?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Tab/Tab.razor | 106 +++++++++--------- .../Components/Tab/Tab.razor.scss | 19 +++- 2 files changed, 74 insertions(+), 51 deletions(-) diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor b/src/BootstrapBlazor/Components/Tab/Tab.razor index 8a67edeae58..fecae26ba74 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor @@ -19,7 +19,11 @@ else } @if (ShowNavigatorButtons) { -
+
+
+ +
+
}
@@ -71,57 +75,59 @@ else }
- @if (ButtonTemplate != null) - { - + + @if (ButtonTemplate != null) + { @ButtonTemplate - - } - @if (ShowToolbar) - { -
- @if (ShowRefreshToolbarButton) - { - - } - @if (ShowFullscreenToolbarButton) - { -
- -
- } - @if (ToolbarTemplate != null) - { - + } + @if (ShowToolbar) + { +
+ @if (ShowRefreshToolbarButton) + { + + } + @if (ShowFullscreenToolbarButton) + { +
+ +
+ } + @if (ToolbarTemplate != null) + { @ToolbarTemplate - - } -
- } - @if (ShowNavigatorButtons) - { -
- } - @if (ShouldShowExtendButtons()) - { - -
-
@CloseCurrentTabText
-
@CloseOtherTabsText
-
@CloseAllTabsText
-
- } - @if (AfterNavigatorTemplate != null) - { - @AfterNavigatorTemplate - } + } +
+ } + @if (ShowNavigatorButtons) + { +
+
+ +
+
+ } + @if (ShouldShowExtendButtons()) + { + +
+
@CloseCurrentTabText
+
@CloseOtherTabsText
+
@CloseAllTabsText
+
+ } + @if (AfterNavigatorTemplate != null) + { + @AfterNavigatorTemplate + } +
diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss index 167bbcfc76b..0f0aa2bcc9a 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss @@ -84,7 +84,7 @@ } .tabs-nav-wrap { - > .nav-link-bar { + .nav-link-bar { cursor: pointer; font-size: 1rem; color: var(--bs-body-color); @@ -548,6 +548,23 @@ .tab-drag-over .tabs-item .tabs-item-body { animation: drag-tab-item 1s linear infinite; } + + .nav-link-bar { + padding: 3px 0.5rem; + + .nav-link-bar-button { + cursor: pointer; + padding: 0 .75rem; + height: 100%; + display: flex; + align-items: center; + border-radius: var(--bs-border-radius); + + &:hover { + background-color: var(--bb-tabs-item-hover-bg-color); + } + } + } } .tabs-chrome > .tabs-header { From 64dfad12ad0aa3602e8fe38711705d719f950925 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 11:20:28 +0800 Subject: [PATCH 10/17] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=E7=AD=89?= =?UTF-8?q?=E5=AE=BD=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Server/Components/Samples/Tabs.razor | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor index fd3fb2ca47d..dbf5b8bd0bc 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor @@ -514,11 +514,11 @@ private void Navigation() - + - - - + + + From 134179dbca27c31b8c08546c1d600eadac3a16bb Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 11:24:12 +0800 Subject: [PATCH 11/17] =?UTF-8?q?revert:=20=E6=92=A4=E9=94=80=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Tab/Tab.razor.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss index 0f0aa2bcc9a..c4dd93301e5 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss @@ -84,7 +84,7 @@ } .tabs-nav-wrap { - .nav-link-bar { + > .nav-link-bar { cursor: pointer; font-size: 1rem; color: var(--bs-body-color); From bfac1779b8e056397828faca22a39d3017fe7b75 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 12:04:09 +0800 Subject: [PATCH 12/17] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Tab/Tab.razor | 20 +++++++++------ .../Components/Tab/Tab.razor.cs | 25 ++++++++++++++++--- .../Components/Tab/Tab.razor.scss | 6 +++++ src/BootstrapBlazor/Locales/en.json | 5 +++- src/BootstrapBlazor/Locales/zh.json | 5 +++- 5 files changed, 48 insertions(+), 13 deletions(-) diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor b/src/BootstrapBlazor/Components/Tab/Tab.razor index fecae26ba74..4868ec29bd5 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor @@ -20,9 +20,11 @@ else @if (ShowNavigatorButtons) {
-
- -
+ +
+ +
+
}
@@ -107,15 +109,19 @@ else @if (ShowNavigatorButtons) {
-
- -
+ +
+ +
+
} @if (ShouldShowExtendButtons()) {
@CloseCurrentTabText
diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.cs b/src/BootstrapBlazor/Components/Tab/Tab.razor.cs index 4c50e196e96..8e9443e82d8 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor.cs +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.cs @@ -167,7 +167,6 @@ public partial class Tab : IHandlerException /// 获得/设置 NotFound 标签文本 默认 null NET6.0/7.0 有效 /// [Parameter] - [NotNull] public string? NotFoundTabText { get; set; } /// @@ -205,21 +204,18 @@ public partial class Tab : IHandlerException /// 获得/设置 关闭当前 TabItem 菜单文本 /// [Parameter] - [NotNull] public string? CloseCurrentTabText { get; set; } /// /// 获得/设置 关闭所有 TabItem 菜单文本 /// [Parameter] - [NotNull] public string? CloseAllTabsText { get; set; } /// /// 获得/设置 关闭其他 TabItem 菜单文本 /// [Parameter] - [NotNull] public string? CloseOtherTabsText { get; set; } /// @@ -345,6 +341,24 @@ public partial class Tab : IHandlerException [Parameter] public Func? OnToolbarRefreshCallback { get; set; } + /// + /// Gets or sets the previous tab navigation link tooltip text. Default is null. + /// + [Parameter] + public string? PrevTabNavLinkTooltipText { get; set; } + + /// + /// Gets or sets the next tab navigation link tooltip text. Default is null. + /// + [Parameter] + public string? NextTabNavLinkTooltipText { get; set; } + + /// + /// Gets or sets the close tab navigation link tooltip text. Default is null. + /// + [Parameter] + public string? CloseTabNavLinkTooltipText { get; set; } + [CascadingParameter] private Layout? Layout { get; set; } @@ -415,6 +429,9 @@ protected override void OnParametersSet() NotFoundTabText ??= Localizer[nameof(NotFoundTabText)]; RefreshToolbarTooltipText ??= Localizer[nameof(RefreshToolbarTooltipText)]; FullscreenToolbarTooltipText ??= Localizer[nameof(FullscreenToolbarTooltipText)]; + PrevTabNavLinkTooltipText ??= Localizer[nameof(PrevTabNavLinkTooltipText)]; + NextTabNavLinkTooltipText ??= Localizer[nameof(NextTabNavLinkTooltipText)]; + CloseTabNavLinkTooltipText ??= Localizer[nameof(CloseTabNavLinkTooltipText)]; PreviousIcon ??= IconTheme.GetIconByKey(ComponentIcons.TabPreviousIcon); NextIcon ??= IconTheme.GetIconByKey(ComponentIcons.TabNextIcon); diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss index c4dd93301e5..37ab229d1ed 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss @@ -564,6 +564,12 @@ background-color: var(--bb-tabs-item-hover-bg-color); } } + + > [data-bs-toggle="tooltip"] { + height: 100%; + display: flex; + align-items: center; + } } } diff --git a/src/BootstrapBlazor/Locales/en.json b/src/BootstrapBlazor/Locales/en.json index e0687cd1daa..606054d4f5e 100644 --- a/src/BootstrapBlazor/Locales/en.json +++ b/src/BootstrapBlazor/Locales/en.json @@ -175,7 +175,10 @@ "CloseAllTabsText": "Close All", "NotFoundTabText": "NotFound", "RefreshToolbarTooltipText": "Refresh", - "FullscreenToolbarTooltipText": "Fullscreen" + "FullscreenToolbarTooltipText": "Fullscreen", + "PrevTabNavLinkTooltipText": "Prev Tab", + "NextTabNavLinkTooltipText": "Next Tab", + "CloseTabNavLinkTooltipText": "Close" }, "BootstrapBlazor.Components.MultiFilter": { "MultiFilterSearchPlaceHolderText": "Please enter ...", diff --git a/src/BootstrapBlazor/Locales/zh.json b/src/BootstrapBlazor/Locales/zh.json index 4ef25b24f36..d934483d50c 100644 --- a/src/BootstrapBlazor/Locales/zh.json +++ b/src/BootstrapBlazor/Locales/zh.json @@ -175,7 +175,10 @@ "CloseAllTabsText": "关闭所有标签", "NotFoundTabText": "未找到", "RefreshToolbarTooltipText": "刷新", - "FullscreenToolbarTooltipText": "全屏" + "FullscreenToolbarTooltipText": "全屏", + "PrevTabNavLinkTooltipText": "上一个标签", + "NextTabNavLinkTooltipText": "下一个标签", + "CloseTabNavLinkTooltipText": "关闭" }, "BootstrapBlazor.Components.MultiFilter": { "MultiFilterSearchPlaceHolderText": "请输入 ...", From 9e5afaeceeb5f54f8272388f2f4cfa6f81138337 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 12:04:17 +0800 Subject: [PATCH 13/17] =?UTF-8?q?style:=20=E6=9B=B4=E6=96=B0=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Tab/Tab.razor.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss index 37ab229d1ed..549a3a808c7 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss @@ -552,6 +552,10 @@ .nav-link-bar { padding: 3px 0.5rem; + &[data-bs-toggle="dropdown"] { + margin-inline-end: .25rem; + } + .nav-link-bar-button { cursor: pointer; padding: 0 .75rem; From 1b30fc9d92b9eb122420ee77a6ac5a26b855c80b Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 12:09:21 +0800 Subject: [PATCH 14/17] =?UTF-8?q?style:=20=E6=9B=B4=E6=96=B0=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Tab/Tab.razor.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss index 549a3a808c7..1c13fa19e36 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss @@ -552,10 +552,6 @@ .nav-link-bar { padding: 3px 0.5rem; - &[data-bs-toggle="dropdown"] { - margin-inline-end: .25rem; - } - .nav-link-bar-button { cursor: pointer; padding: 0 .75rem; @@ -578,6 +574,8 @@ } .tabs-chrome > .tabs-header { + padding: 0 .25rem; + .tabs-item-wrap { overflow: hidden; position: relative; From 846b7b1cd377360eeed2fe11afa15fc3d5a06258 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 12:09:31 +0800 Subject: [PATCH 15/17] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Server/Components/Samples/Tabs.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor index dbf5b8bd0bc..6d8015f47d7 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor @@ -437,7 +437,7 @@ private void Navigation() - +
@Localizer["TabItem1Content"]
 From f7203f5789f0a1b77977e19ef13f92b317d49f2c Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 12:15:01 +0800 Subject: [PATCH 16/17] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Components/TabTest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/UnitTest/Components/TabTest.cs b/test/UnitTest/Components/TabTest.cs index 48c013f74f4..b78809bb9ed 100644 --- a/test/UnitTest/Components/TabTest.cs +++ b/test/UnitTest/Components/TabTest.cs @@ -226,14 +226,14 @@ public void ClickTab_Ok() Assert.True(clicked); // Click Prev - var button = cut.Find(".nav-link-bar.left"); + var button = cut.Find(".nav-link-bar.left .nav-link-bar-button"); button.Click(); button.Click(); button.Click(); Assert.Equal("Tab1-Content", cut.Find(".tabs-body .d-none").InnerHtml); // Click Next - button = cut.Find(".nav-link-bar.right"); + button = cut.Find(".nav-link-bar.right .nav-link-bar-button"); button.Click(); button.Click(); button.Click(); @@ -284,11 +284,11 @@ public void ClickTabToNavigation_True() cut.InvokeAsync(() => cut.Instance.AddTab("/Cat", null!)); // Click Prev - var button = cut.Find(".nav-link-bar.left"); + var button = cut.Find(".nav-link-bar.left .nav-link-bar-button"); button.Click(); // Click Next - button = cut.Find(".nav-link-bar.right"); + button = cut.Find(".nav-link-bar.right .nav-link-bar-button"); button.Click(); button = cut.Find(".tabs-item-close"); From 63a74d17bcd4767e0cff201606c76ac54cbd438d Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 12:18:35 +0800 Subject: [PATCH 17/17] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=AD=A3=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Tab/Tab.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor b/src/BootstrapBlazor/Components/Tab/Tab.razor index 4868ec29bd5..e1fafcdbe15 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor @@ -110,7 +110,7 @@ else {
-
+