From f4459d8c0b109da9c63b8f542adfff070fe9c760 Mon Sep 17 00:00:00 2001
From: jianglinjun <JLJ05024111@163.com>
Date: Sat, 20 Jul 2024 16:23:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=8C=E4=B8=BA?=
 =?UTF-8?q?=E9=A1=B9hover=E6=97=B6=E9=98=B4=E5=BD=B1=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/action-toolbar/action-toolbar.scss | 23 +++++++++++++------
 src/common/action-toolbar/action-toolbar.tsx  | 22 ++++++++++++++++--
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/common/action-toolbar/action-toolbar.scss b/src/common/action-toolbar/action-toolbar.scss
index d010149b5..2d52c76a7 100644
--- a/src/common/action-toolbar/action-toolbar.scss
+++ b/src/common/action-toolbar/action-toolbar.scss
@@ -23,15 +23,24 @@ $action-toolbar: (
     margin: getCssVar(action-toolbar, item-margin);
 
     @include m(icon) {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: getCssVar('width-icon','medium');
-      height: getCssVar('width-icon','medium');
-      margin-right: getCssVar('spacing','extra-tight');
-      font-size: getCssVar('width-icon','medium');
+      @include when('has-icon') {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: getCssVar('width-icon', 'medium');
+        height: getCssVar('width-icon', 'medium');
+        margin-right: getCssVar('spacing','extra-tight');
+        margin-left: getCssVar('spacing','extra-tight');
+        font-size: getCssVar('width-icon', 'medium');
+      }
+    }
+    @include m('label') {
+      @include when('has-caption') {
+        margin-right: getCssVar('spacing','extra-tight');
+      }
     }
 
+
     &+& {
       margin: getCssVar(action-toolbar, item-margin);
     }
diff --git a/src/common/action-toolbar/action-toolbar.tsx b/src/common/action-toolbar/action-toolbar.tsx
index 14df69129..e8ecdc7d1 100644
--- a/src/common/action-toolbar/action-toolbar.tsx
+++ b/src/common/action-toolbar/action-toolbar.tsx
@@ -147,12 +147,30 @@ export const IBizActionToolbar = defineComponent({
               disabled={this.actionsState[detail.id!].disabled}
               class={this.calcActionItemClass(detail)}
             >
-              <div class={this.ns.em('item', 'icon')}>
+              <div
+                class={[
+                  this.ns.em('item', 'icon'),
+                  this.ns.is(
+                    'has-caption',
+                    detail.showCaption && detail.caption,
+                  ),
+                  this.ns.is('has-icon', detail.showIcon && detail.sysImage),
+                ]}
+              >
                 {detail.showIcon && detail.sysImage && (
                   <iBizIcon icon={detail.sysImage}></iBizIcon>
                 )}
               </div>
-              <div class={this.ns.em('item', 'label')}>
+              <div
+                class={[
+                  this.ns.em('item', 'label'),
+                  this.ns.is(
+                    'has-caption',
+                    detail.showCaption && detail.caption,
+                  ),
+                  this.ns.is('has-icon', detail.showIcon && detail.sysImage),
+                ]}
+              >
                 {detail.showCaption ? detail.caption : ''}
               </div>
             </el-button>,
-- 
Gitee