From 16f9bd4ce0a50412e49b40230db469773d5d7c42 Mon Sep 17 00:00:00 2001
From: lijisanxiong <1518062161@qq.com>
Date: Mon, 29 Apr 2024 16:09:00 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=B7=A5=E5=85=B7=E6=A0=8F?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E6=94=AF=E6=8C=81=E6=8C=89=E9=92=AE=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/control/toolbar/toolbar.tsx | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/control/toolbar/toolbar.tsx b/src/control/toolbar/toolbar.tsx
index 7a6ba370..cdbe5337 100644
--- a/src/control/toolbar/toolbar.tsx
+++ b/src/control/toolbar/toolbar.tsx
@@ -31,6 +31,11 @@ const btnContent = (item: IDEToolbarItem): (string | VNode)[] => {
   return result;
 };
 
+// 计算系统样式表名称
+const calcCssName = (item: IDETBGroupItem | IDETBUIActionItem) => {
+  return item?.sysCss?.cssName;
+};
+
 export const ToolbarControl = defineComponent({
   name: 'IBizToolbarControl',
   props: {
@@ -59,11 +64,6 @@ export const ToolbarControl = defineComponent({
       await c.onItemClick(item, event, params);
     };
 
-    // 计算系统样式表名称
-    const calcCssName = (item: IDETBGroupItem | IDETBUIActionItem) => {
-      return item?.sysCss?.cssName;
-    };
-
     const renderExtraButtons = (extraButtons: IExtraButton[]): VNode[] => {
       return extraButtons.map(button => {
         return (
@@ -86,14 +86,20 @@ export const ToolbarControl = defineComponent({
         detoolbarItems.findIndex(
           item2 => c.state.buttonsState[item2.id!].loading,
         ) !== -1;
+      const groupButtonStyle = (item as IData)?.buttonStyle || '';
       return (
         <el-sub-menu
-          class={ns.b('submenu')}
+          class={[
+            ns.b('submenu'),
+            ns.em('item', groupButtonStyle.toLowerCase()),
+            calcCssName(item),
+          ]}
           index={item.id}
           title={item.tooltip}
           popper-class={[
             ns.b('submenu-popper'),
             ns.bm('submenu-popper', toolbarStyle),
+            ns.em('submenu-popper', groupButtonStyle.toLowerCase()),
             ns.bm('submenu-popper', calcCssName(item)),
           ]}
         >
@@ -177,9 +183,7 @@ export const ToolbarControl = defineComponent({
             },
             title: () => {
               return (
-                <el-button class={calcCssName(item)} loading={loading}>
-                  {btnContent(item)}
-                </el-button>
+                <el-button loading={loading}>{btnContent(item)}</el-button>
               );
             },
           }}
-- 
Gitee