From f39a26bc78d9d9638f0c4ec08a8a8f8448cd7762 Mon Sep 17 00:00:00 2001
From: lijisanxiong <1518062161@qq.com>
Date: Fri, 27 Jun 2025 19:36:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=89=A9=E5=B1=95=E8=8F=9C=E5=8D=95this=E6=8C=87?=
 =?UTF-8?q?=E5=90=91=E5=BC=82=E5=B8=B8=E5=AF=BC=E8=87=B4=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=90=8E=E7=BB=98=E5=88=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                   |  4 ++++
 .../extend-button-menu/extend-button-menu.scss |  2 +-
 .../extend-button-menu/extend-button-menu.tsx  | 18 +++++++++++++-----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb27f845b..cf9c92c57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- 修复按钮扩展菜单this指向异常导致打包后绘制报错
+
 ## [0.7.41-alpha.7] - 2025-06-27
 
 ### Added
diff --git a/src/panel-component/app-extend-menu/extend-menu-base/extend-button-menu/extend-button-menu.scss b/src/panel-component/app-extend-menu/extend-menu-base/extend-button-menu/extend-button-menu.scss
index cf078e39b..80160fcf7 100644
--- a/src/panel-component/app-extend-menu/extend-menu-base/extend-button-menu/extend-button-menu.scss
+++ b/src/panel-component/app-extend-menu/extend-menu-base/extend-button-menu/extend-button-menu.scss
@@ -233,7 +233,7 @@ $extend-menu-button-placehold: (
     }
 
     .#{bem('extend-menu-button__separator--horizontal')} {
-        border-color: getCssVar(color, scroll, menu);
+        border-color: getCssVar(color, primary, hover);
     }
     .#{bem('extend-menu-button__content')},
     .#{bem('extend-menu-button__content--item')},
diff --git a/src/panel-component/app-extend-menu/extend-menu-base/extend-button-menu/extend-button-menu.tsx b/src/panel-component/app-extend-menu/extend-menu-base/extend-button-menu/extend-button-menu.tsx
index a6c7e5f1d..14359b04c 100644
--- a/src/panel-component/app-extend-menu/extend-menu-base/extend-button-menu/extend-button-menu.tsx
+++ b/src/panel-component/app-extend-menu/extend-menu-base/extend-button-menu/extend-button-menu.tsx
@@ -144,11 +144,11 @@ function renderMenuContent(_params: IMenuContentParams) {
                 >
                   {menuItem}
                 </div>
-                {
+                {isShowArrow && (
                   <span class={ns.em('content', 'item-arrow')}>
-                    {isShowArrow && rightArrow()}
+                    {rightArrow()}
                   </span>
-                }
+                )}
               </div>
             );
           }),
@@ -223,8 +223,8 @@ export const ExtendButtonMenu = defineComponent({
         handleMenuItemClick,
         handleMenuItemMouseEnter,
         handleMenuItemMouseLeave,
-        isLayout: isLayout.value,
         showCascaderArrow: true,
+        isLayout: false,
       });
     };
 
@@ -294,7 +294,15 @@ export const ExtendButtonMenu = defineComponent({
       >
         {this.layoutMode !== 'BORDER' &&
           renderMenuContent({
-            ...(this as unknown as IMenuContentParams),
+            ns: this.ns,
+            menuAlign: this.menuAlign,
+            isLayout: this.isLayout,
+            position: this.position,
+            menus: this.menus,
+            menuItemsState: this.menuItemsState,
+            handleMenuItemClick: this.handleMenuItemClick,
+            handleMenuItemMouseEnter: this.handleMenuItemMouseEnter,
+            handleMenuItemMouseLeave: this.handleMenuItemMouseLeave,
           })}
       </div>
     );
-- 
Gitee