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

---
 src/control/grid/grid/grid.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/control/grid/grid/grid.scss b/src/control/grid/grid/grid.scss
index 84af8cf6..f33b003b 100644
--- a/src/control/grid/grid/grid.scss
+++ b/src/control/grid/grid/grid.scss
@@ -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: rgba(#{getCssVar(grey, 1)}, 1),
   font-size: getCssVar(font-size, regular),
   font-weight: getCssVar(font-weight, bold),
 );
-- 
Gitee


From 95714fab0a1f373dcd6a50e6bfcf900d695cc4eb Mon Sep 17 00:00:00 2001
From: fzh <1399952343@qq.com>
Date: Fri, 22 Sep 2023 18:33:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=90=88=E8=AE=A1=E6=96=87=E5=AD=97=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=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 | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ab798b2..1898c6bb 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 f33b003b..5c67d2d6 100644
--- a/src/control/grid/grid/grid.scss
+++ b/src/control/grid/grid/grid.scss
@@ -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