From 159075b659de146fed55ac3226f5bf1de87454e0 Mon Sep 17 00:00:00 2001
From: ShineKOT <1917095344@qq.com>
Date: Fri, 14 Feb 2025 11:55:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/form-shell/form-shell.scss | 18 ++++++
 .../src/theme/studio-dark/ctrl.scss           |  2 +-
 .../src/theme/studio-dark/element-plus.scss   | 60 ++++++++++---------
 .../src/theme/studio-dark/tumps.scss          |  6 +-
 4 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/packages/dnd-design/src/components/form-shell/form-shell.scss b/packages/dnd-design/src/components/form-shell/form-shell.scss
index 5dff158d..afee6c73 100644
--- a/packages/dnd-design/src/components/form-shell/form-shell.scss
+++ b/packages/dnd-design/src/components/form-shell/form-shell.scss
@@ -2,6 +2,24 @@
 @include b(form-shell) {
   width: 100%;
   height: 100%;
+  @include b(form-tab-panel) {
+    &.el-tabs {
+      .el-tabs__active-bar {
+        bottom: 0;
+        height: 2px;
+        background-color: getCssVar(form-tab-panel, active, border-color) !important;
+      }
+      .el-tabs__header.is-top .el-tabs__item.is-top.is-active {
+        color: getCssVar(form-tab-panel, active, text-color) !important;
+        background-color: getCssVar(form-tab-panel, active, bg-color) !important;
+      }
+    }
+    &.el-tabs--top {
+      .el-tabs__item.is-top:nth-child(2) {
+        padding-left: 0 !important;
+      }
+    } 
+  }
 }
 
 @include b(light-theme-shell) {
diff --git a/packages/studio-theme/src/theme/studio-dark/ctrl.scss b/packages/studio-theme/src/theme/studio-dark/ctrl.scss
index 50293619..53498d10 100644
--- a/packages/studio-theme/src/theme/studio-dark/ctrl.scss
+++ b/packages/studio-theme/src/theme/studio-dark/ctrl.scss
@@ -161,7 +161,7 @@
 
   @include b(control-form) {
     // 排除表单预览组件
-    &:not(.ibiz-form-shell--light) {
+    &:not(.#{bem('light-theme-shell')}) {
       #{getCssVarName(editor, default, bg, color)}: getCssVar(color, bg, 0);
       #{getCssVarName(editor, hover, border, color)}: getCssVar(color, focus, border);
       #{getCssVarName(editor, focus, box-shadow)}: getCssVar(color, border) 0 0 0 1px inset,getCssVar(color, bg, 0) 0 0 0 2px, getCssVar(color, primary, light, active) 0 0 0 4px;
diff --git a/packages/studio-theme/src/theme/studio-dark/element-plus.scss b/packages/studio-theme/src/theme/studio-dark/element-plus.scss
index d45e8139..e9615002 100644
--- a/packages/studio-theme/src/theme/studio-dark/element-plus.scss
+++ b/packages/studio-theme/src/theme/studio-dark/element-plus.scss
@@ -39,6 +39,13 @@
     margin-left: getCssVar(spacing, base, tight);
   }
 
+  // 按钮组中相邻按钮不应有间距
+  .el-button-group {
+    > .el-button + .el-button {
+      margin-left: 0;
+    }
+  }
+
   .el-input {
     --el-input-focus-border-color: #{getCssVar(color, primary, light, active)};
   }
@@ -62,35 +69,30 @@
     }
   }
 
-  // 排除表单预览组件
-  @include b(control-form) {
-    &:not(.ibiz-form-shell--light) {
-      .el-tabs {
-        .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-top:last-child {
-          padding-right: getCssVar(spacing, base, loose);
-        }
-    
-        .el-tabs__nav-scroll {
-          padding-bottom: 1px;
-    
-          --el-tabs-header-height: 39px;
-        }
-    
-        .el-tabs__item {
-          padding: 0 getCssVar(spacing, base, loose);
-          color: getCssVar(color, text, 2) !important;
-        }
-    
-        .el-tabs__item.is-active {
-          color: getCssVar(color, text, 0) !important;
-        }
-    
-        .el-tabs__active-bar {
-          bottom: -1px;
-          height: 1px;
-          background-color: getCssVar(color, primary, light, active) !important;
-        }
-      }
+  .el-tabs {
+    .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item.is-top:last-child {
+      padding-right: getCssVar(spacing, base, loose);
+    }
+
+    .el-tabs__nav-scroll {
+      padding-bottom: 1px;
+
+      --el-tabs-header-height: 39px;
+    }
+
+    .el-tabs__item {
+      padding: 0 getCssVar(spacing, base, loose);
+      color: getCssVar(color, text, 2) !important;
+    }
+
+    .el-tabs__item.is-active {
+      color: getCssVar(color, text, 0) !important;
+    }
+
+    .el-tabs__active-bar {
+      bottom: -1px;
+      height: 1px;
+      background-color: getCssVar(color, primary, light, active) !important;
     }
   }
 
diff --git a/packages/studio-theme/src/theme/studio-dark/tumps.scss b/packages/studio-theme/src/theme/studio-dark/tumps.scss
index 9c51dfc4..ce3019dc 100644
--- a/packages/studio-theme/src/theme/studio-dark/tumps.scss
+++ b/packages/studio-theme/src/theme/studio-dark/tumps.scss
@@ -2,7 +2,7 @@
 :root.studio_dark {
   @include b(control-form) {
     // 排除表单预览组件
-    &:not(.ibiz-form-shell--light) {
+    &:not(.#{bem('light-theme-shell')}) {
       @include b(form-item-container) {
           #{getCssVarName(form-item-container, label-color)}: getCssVar(color, text, 0);
           #{getCssVarName(form-item-container, label-font-weight)}: bold;
@@ -38,7 +38,7 @@
   // 工具全局编辑器标题与内容文字，分组、分页标题文字颜色提亮，参考原设计工具全局为白色#FFF
   @include b(control-form) {
     // 排除表单预览组件
-    &:not(.ibiz-form-shell--light) {
+    &:not(.#{bem('light-theme-shell')}) {
       #{getCssVarName(color, primary, active, text)}: getCssVar(color, white);
       #{getCssVarName(editor, default-text-color)}: getCssVar(color, white);
   
@@ -66,7 +66,7 @@
   .#{bem('design-property-interactive')} {
     // 排除表单预览组件
     @include b(control-form) {
-      &:not(.ibiz-form-shell--light) {
+      &:not(.#{bem('light-theme-shell')}) {
         .#{bem('form-page-tab')} {
           > .el-tabs__header.is-top {
             .el-tabs__item.is-top {
-- 
Gitee