From a3c6ea01dc203b038d727d212dfb9e77eccd6abc Mon Sep 17 00:00:00 2001
From: lijisanxiong <1518062161@qq.com>
Date: Tue, 29 Apr 2025 21:50:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=A0=8F=E9=A6=96=E9=A1=B9+=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C=E5=BD=93?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E7=BB=84=E4=BB=85=E6=9C=89=E4=B8=A4=E9=A1=B9?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8B=E6=8B=89=E6=9C=AA=E7=BB=98=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                    |  1 +
 src/control/toolbar/toolbar.tsx | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0289b3078..c77e13c65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - 修复菜单项svg图标样式异常
 - 修复表格单击事件在双击时重复触发
 - 修复路由快速切换时，导航标签页显示异常
+- 修复工具栏首项+分组展开模式下，当行为组仅有两项时下拉未绘制
 
 ## [0.7.40-alpha.14] - 2025-04-24
 
diff --git a/src/control/toolbar/toolbar.tsx b/src/control/toolbar/toolbar.tsx
index 3a82689ac..34f11385b 100644
--- a/src/control/toolbar/toolbar.tsx
+++ b/src/control/toolbar/toolbar.tsx
@@ -396,9 +396,9 @@ export const ToolbarControl = defineComponent({
       details: IAppDEUIActionGroupDetail[],
       index: number,
     ): number => {
-      const firstItem: IParams = details.slice(index, 1);
-      if (firstItem[0]) {
-        if (c.state.buttonsState[firstItem[0].id!].visible) {
+      const firstItem: IParams = details[index];
+      if (firstItem) {
+        if (c.state.buttonsState[firstItem.id!]?.visible) {
           return index;
         }
         return getFirstIndex(details, index + 1);
@@ -413,9 +413,18 @@ export const ToolbarControl = defineComponent({
         const { uiactionGroupDetails } = uiactionGroup;
         const firstIndex = getFirstIndex(uiactionGroupDetails, 0);
         if (firstIndex !== -1) {
-          const firstItem = uiactionGroupDetails.slice(firstIndex, 1);
-          const remainders = uiactionGroupDetails.slice(firstIndex + 1);
-          const enableDropdown = remainders.length > 1;
+          const firstItem = uiactionGroupDetails[firstIndex];
+          // 获取剩余项截取位置下标，过滤掉不显示行为项后的下标
+          const remainderIndex = getFirstIndex(
+            uiactionGroupDetails,
+            firstIndex + 1,
+          );
+          // 如果剩余项下标存在，则截取行为组内剩余行为项
+          const remainders =
+            remainderIndex !== -1
+              ? uiactionGroupDetails.slice(remainderIndex)
+              : [];
+          const enableDropdown = remainders.length > 0;
           const groupButtonStyle = (item as IDETBGroupItem).buttonStyle || '';
           return (
             <el-dropdown
@@ -431,7 +440,7 @@ export const ToolbarControl = defineComponent({
               {{
                 default: () =>
                   renderActionButton(
-                    firstItem[0],
+                    firstItem,
                     convertBtnType(groupButtonStyle),
                   ),
                 dropdown: () =>
-- 
Gitee