From cdb3da94dff15c1cf5061846ea2ad5612c4435a3 Mon Sep 17 00:00:00 2001
From: ShineKOT <1917095344@qq.com>
Date: Mon, 21 Oct 2024 10:56:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=20=E4=BC=98=E5=8C=96=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=BB=84=E5=92=8C=E5=85=B3=E7=B3=BB=E5=88=86=E9=A1=B5=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                            |  1 +
 src/common/button-list/button-list.scss | 16 ++++++++---
 src/control/drtab/drtab.scss            | 36 ++++++++++++++-----------
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 413bcc25d..0f2e98b77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - 更新日历自定义选择按钮名称
 - 更新树导航引擎加载实体数据时先判断是否有主键
 - 优化按钮组和关系分页上方下拉列表 popover 关闭模式
+- 优化按钮组和关系分页图标样式
 
 ## [0.0.28] - 2024-10-18
 
diff --git a/src/common/button-list/button-list.scss b/src/common/button-list/button-list.scss
index 9c478d029..454896a01 100644
--- a/src/common/button-list/button-list.scss
+++ b/src/common/button-list/button-list.scss
@@ -1,3 +1,13 @@
+@mixin button-list-icon-style {
+  .#{bem(icon)} {
+    @include flex(row, center, center);
+
+    width: getCssVar(width-icon, medium);
+    height: getCssVar(width-icon, medium);
+    font-size: getCssVar(width-icon, medium);
+  }
+}
+
 @include b(button-list) {
   width: 100%;
   height: 100%;
@@ -11,6 +21,7 @@
       display: flex;
       align-items: center;
       gap: getCssVar(spacing, extra, tight);
+      @include button-list-icon-style;
     }
   }
 
@@ -27,10 +38,7 @@
       display: flex;
       align-items: center;
       gap: getCssVar(spacing, extra, tight);
-      .ibiz-icon {
-        display: flex;
-        align-items: center;
-      }
+      @include button-list-icon-style;
     }
   }
 }
diff --git a/src/control/drtab/drtab.scss b/src/control/drtab/drtab.scss
index 817776317..67f80b6ff 100644
--- a/src/control/drtab/drtab.scss
+++ b/src/control/drtab/drtab.scss
@@ -10,7 +10,8 @@
     .van-button__text {
       display: flex;
       align-items: center;
-      font-size: getCssVar(font-size, header-5);
+      line-height: getCssVar(font-size, header-4);
+      font-size: getCssVar(font-size, header-4);
       gap: getCssVar(spacing, extra-tight);
     }
   }
@@ -19,9 +20,13 @@
     @include m(title) {
       display: flex;
       align-items: center;
+      gap: getCssVar(spacing, extra-tight);
+      .#{bem(icon)} {
+        @include flex(row, center, center);
 
-      .ibiz-icon {
-        margin-right: getCssVar(spacing, extra-tight);
+        width: getCssVar(width-icon, medium);
+        height: getCssVar(width-icon, medium);
+        font-size: getCssVar(width-icon, medium);
       }
     }
   }
@@ -34,27 +39,26 @@
       align-items: center;
       box-sizing: border-box;
       height: var(--van-popover-action-height);
-      padding: 0 getCssVar(spacing, base-loose) 0 getCssVar(spacing, extra-loose);
-      font-size: var(--van-popover-action-font-size);
-      line-height: var(--van-line-height-md);
+      padding: 0 getCssVar(spacing, base-loose);
+      font-size: getCssVar(font-size, header-5);
+      gap: getCssVar(spacing, tight);
+
+      .#{bem(icon)} {
+        @include flex(row, center, center);
 
-      .ibiz-icon {
-        position: absolute;
-        left: getCssVar(spacing, base-tight);
+        width: getCssVar(width-icon, medium);
+        height: getCssVar(width-icon, medium);
+        font-size: getCssVar(width-icon, medium);
       }
 
       .caption {
         flex-grow: 1;
-        .text {
-          margin-right: rem(6px);
-        }
-        .ibiz-badge {
-          margin-right: rem(6px);
-        }
+        display: flex;
+        align-items: center;
+        gap: getCssVar(spacing, tight);
       }
 
       ion-icon {
-        font-size: getCssVar(font-size, header-5);
         color: getCssVar(color, primary);
       }
 
-- 
Gitee