From 1dafb117ea60aecaac3456fd6f2627e5ca70d2c7 Mon Sep 17 00:00:00 2001
From: fzh <1399952343@qq.com>
Date: Fri, 22 Sep 2023 18:55:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E9=94=81=E5=AE=9A?=
 =?UTF-8?q?=E5=88=97=E5=90=8E=E7=9A=84=E5=90=88=E8=AE=A1=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E5=88=B0=E5=B7=A6=E5=8F=B3=E4=BE=A7=E4=B8=8D?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=98=B4=E5=BD=B1,=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=90=88=E8=AE=A1=E6=96=87=E5=AD=97=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                    |  2 ++
 src/control/grid/grid/grid.scss | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ab798b24..1898c6bb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@
 - 面板按钮显示启用逻辑在成员的基础上考虑界面行为权限的显示与禁用，权限的优先级最高。
 - 卡片视图移除可收缩功能
 - 时间选择器类型为DATEPICKEREX_NOTIME时，不展示图标
+- 表格锁定列后的合计部分滚动到左右侧不出现阴影
+- 调整表格合计文字上下的间距
 
 ### Fixed
 
diff --git a/src/control/grid/grid/grid.scss b/src/control/grid/grid/grid.scss
index 84af8cf6a..e4cd9ca02 100644
--- a/src/control/grid/grid/grid.scss
+++ b/src/control/grid/grid/grid.scss
@@ -10,7 +10,7 @@ $control-grid: (text-color: getCssVar(color, text, 0),
 $control-grid-header: (text-color: getCssVar(color, text, 2),
   cell-padding: getCssVar(control-grid, cell-padding),
   height: auto,
-  bg-color: rgba(var(#{getCssVarName(grey, 1)}), 1),
+  bg-color: getCssVar(color, tertiary, light, hover),
   font-size: getCssVar(font-size, regular),
   font-weight: getCssVar(font-weight, regular),
 );
@@ -25,7 +25,7 @@ $control-grid-page: (text-color: getCssVar(control-grid, text-color),
 );
 
 $control-grid-footer: (text-color: getCssVar(color, text, 2),
-  bg-color: getCssVar(color, fill, 1),
+  bg-color:  getCssVar(color, tertiary, light, hover),
   font-size: getCssVar(font-size, regular),
   font-weight: getCssVar(font-weight, bold),
 );
@@ -215,6 +215,12 @@ $control-grid-footer: (text-color: getCssVar(color, text, 2),
         font-weight: getCssVar(control-grid, footer, font-weight);
         color: getCssVar(control-grid, footer, text-color);
         background-color: getCssVar(control-grid, footer, bg-color);
+        &:first-child {
+          > div {
+            display: inline;
+            vertical-align: 4px;
+          }
+        }
       }
     }
 
-- 
Gitee