From 92062a5296d77961154515aa4db331c8329cbc8a Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 26 Dec 2025 11:42:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20Color/Text=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Table/Table.razor | 2 +- .../Components/Table/Table.razor.Edit.cs | 14 +++++++++++++- .../Components/Table/Table.razor.Localization.cs | 2 ++ src/BootstrapBlazor/Locales/en.json | 3 ++- src/BootstrapBlazor/Locales/zh.json | 3 ++- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor index 842cd253635..88533b388a9 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor +++ b/src/BootstrapBlazor/Components/Table/Table.razor @@ -1041,7 +1041,7 @@ ; RenderFragment RenderMoreButton => item => - @ @if (MoreButtonDropdownTemplate != null) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Edit.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Edit.cs index dca2cde199f..b5637b6bdf6 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Edit.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Edit.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the Apache 2.0 License // See the LICENSE file in the project root for more information. // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone @@ -157,6 +157,18 @@ public partial class Table [Parameter] public bool ShowMoreButton { get; set; } + /// + /// 获得/设置 更多按钮颜色 默认 + /// + [Parameter] + public Color MoreButtonColor { get; set; } = Color.Secondary; + + /// + /// 获得/设置 更多按钮文本 默认 null 读取资源文件设置文本 + /// + [Parameter] + public string? MoreButtonText { get; set; } + /// /// 获得/设置 行内更多按钮下拉框模板 默认 null /// diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs index a04091a140c..e0ab238f8b9 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs @@ -434,5 +434,7 @@ private void OnInitLocalization() AlignCenterTooltipText ??= Localizer[nameof(AlignCenterTooltipText)]; AlignRightText ??= Localizer[nameof(AlignRightText)]; AlignRightTooltipText ??= Localizer[nameof(AlignRightTooltipText)]; + + MoreButtonText ??= Localizer[nameof(MoreButtonText)]; } } diff --git a/src/BootstrapBlazor/Locales/en.json b/src/BootstrapBlazor/Locales/en.json index d6db3b4b02e..a195655f28f 100644 --- a/src/BootstrapBlazor/Locales/en.json +++ b/src/BootstrapBlazor/Locales/en.json @@ -256,7 +256,8 @@ "AlignRightText": "Right", "AlignRightTooltipText": "Click to align text in this column to the right", "ColumnListSelectAllText": "All", - "ColumnListSelectInvertText": "Invert" + "ColumnListSelectInvertText": "Invert", + "MoreButtonText": "More" }, "BootstrapBlazor.Components.EditDialog": { "CloseButtonText": "Close", diff --git a/src/BootstrapBlazor/Locales/zh.json b/src/BootstrapBlazor/Locales/zh.json index 9ae5c40ded7..e443d0dea41 100644 --- a/src/BootstrapBlazor/Locales/zh.json +++ b/src/BootstrapBlazor/Locales/zh.json @@ -256,7 +256,8 @@ "AlignRightText": "右对齐", "AlignRightTooltipText": "点击后本列文本右对齐", "ColumnListSelectAllText": "全选", - "ColumnListSelectInvertText": "反选" + "ColumnListSelectInvertText": "反选", + "MoreButtonText": "更多" }, "BootstrapBlazor.Components.EditDialog": { "CloseButtonText": "关闭", From c529512e3b2453dd1be884efcc3f5f42082038e5 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 26 Dec 2025 11:42:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/Table/TablesColumn.razor | 2 ++ src/BootstrapBlazor.Server/Locales/en-US.json | 4 +++- src/BootstrapBlazor.Server/Locales/zh-CN.json | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesColumn.razor b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesColumn.razor index 2891cc20b6b..63b2ca27726 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesColumn.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesColumn.razor @@ -221,6 +221,8 @@

@((MarkupString)Localizer["ShowMoreButtonDesc"].Value)

+

@((MarkupString)Localizer["MoreButtonTextDesc"].Value)

+

@((MarkupString)Localizer["MoreButtonColorDesc"].Value)

<MoreButtonDropdownTemplate>
     <DropdownItem Text="Action1" Icon="fa-solid fa-flag" OnClick="@@(() => OnAction(context, "Action1"))"></DropdownItem>
     <Divider></Divider>
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
index d6e24d6f43e..bbec8bf5756 100644
--- a/src/BootstrapBlazor.Server/Locales/en-US.json
+++ b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -5111,7 +5111,9 @@
     "ColumnOrderIntro": "Set the order by setting the Order parameter of TableColumn",
     "ShowMoreButtonTitle": "ShowMoreButton",
     "ShowMoreButtonIntro": "By setting the ShowMoreButton parameter, a More button appears when the row expands. Furthermore, by setting the MoreButtonDropdownTemplate template, the dropdown menu options are customized. This design significantly reduces the amount of row space occupied.",
-    "ShowMoreButtonDesc": "MoreButtonDropdownTemplate Context context is the instance of the current row."
+    "ShowMoreButtonDesc": "MoreButtonDropdownTemplate Context context is the instance of the current row.",
+    "MoreButtonTextDesc": "Set the button's text using MoreButtonText",
+    "MoreButtonColorDesc": "Set the button color using MoreButtonColor"
   },
   "BootstrapBlazor.Server.Components.Samples.Table.TablesColumnDrag": {
     "TablesColumnTitle": "Table Column",
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
index 6d57d6d12ef..43841375bc2 100644
--- a/src/BootstrapBlazor.Server/Locales/zh-CN.json
+++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -5111,7 +5111,9 @@
     "ColumnOrderIntro": "通过设置 TableColumn 的 Order 参数进行设置顺序",
     "ShowMoreButtonTitle": "更多按钮",
     "ShowMoreButtonIntro": "通过设置 ShowMoreButton 参数使行扩展按钮出现 更多 按钮，通过设置 MoreButtonDropdownTemplate 模板自定义下拉菜单选项，通过这样的设计大大减少行空间占用",
-    "ShowMoreButtonDesc": "MoreButtonDropdownTemplate 上下文 context 为当前行实例"
+    "ShowMoreButtonDesc": "MoreButtonDropdownTemplate 上下文 context 为当前行实例",
+    "MoreButtonTextDesc": "通过 MoreButtonText 设置按钮显示文本",
+    "MoreButtonColorDesc": "通过 MoreButtonColor 设置按钮颜色"
   },
   "BootstrapBlazor.Server.Components.Samples.Table.TablesColumnDrag": {
     "TablesColumnTitle": "Table 表格",

From e8c8cb77e0dc60a893d54e9247e3d74f903b463d Mon Sep 17 00:00:00 2001
From: Argo Zhang 
Date: Fri, 26 Dec 2025 11:43:02 +0800
Subject: [PATCH 3/5] chore: bump version 10.1.5-beta03

---
 src/BootstrapBlazor/BootstrapBlazor.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index a564b115e62..653674e9db2 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
-
+
 
   
-    10.1.5-beta02
+    10.1.5-beta03
   
 
   

From 602ac90c1e7a7aae3de970bf405f53e3bc8c5bc3 Mon Sep 17 00:00:00 2001
From: Argo Zhang 
Date: Fri, 26 Dec 2025 11:47:53 +0800
Subject: [PATCH 4/5] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=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/TableTest.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
index b7ed8c9ce07..7d9cd04e652 100644
--- a/test/UnitTest/Components/TableTest.cs
+++ b/test/UnitTest/Components/TableTest.cs
@@ -8869,6 +8869,14 @@ public void Table_ShowMoreButton_Ok(TableRenderMode mode)
         });
 
         cut.Contains("
dropdown-item-more-template
+        {
+            pb.Add(a => a.MoreButtonText, "more_button");
+            pb.Add(a => a.MoreButtonColor, Color.Danger);
+        });
+
+        cut.Contains("more_button");
     }
 
     [Fact]

From de1e9c73d3c29ad1566d198c135b391f8201bbb9 Mon Sep 17 00:00:00 2001
From: Argo Zhang 
Date: Fri, 26 Dec 2025 11:48:44 +0800
Subject: [PATCH 5/5] =?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/TableTest.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
index 7d9cd04e652..6c9fb74cc91 100644
--- a/test/UnitTest/Components/TableTest.cs
+++ b/test/UnitTest/Components/TableTest.cs
@@ -8869,6 +8869,7 @@ public void Table_ShowMoreButton_Ok(TableRenderMode mode)
         });
 
         cut.Contains("
dropdown-item-more-template
         {