From 8f9006c96d4409da707a148138fa48ac1f35003f Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Mon, 7 Apr 2025 10:58:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20vxe=20=E5=8F=B3=E4=B8=8A=E8=A7=92too?=
 =?UTF-8?q?lbar=E6=8C=89=E9=92=AE=E8=89=B2/=E7=BF=BB=E9=A1=B5=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E8=89=B2=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/effects/plugins/src/vxe-table/style.css | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/effects/plugins/src/vxe-table/style.css b/packages/effects/plugins/src/vxe-table/style.css
index 8dc19b8a..5a97d7f2 100644
--- a/packages/effects/plugins/src/vxe-table/style.css
+++ b/packages/effects/plugins/src/vxe-table/style.css
@@ -46,9 +46,12 @@
   --vxe-ui-table-row-current-background-color: hsl(var(--accent));
   --vxe-ui-table-row-hover-current-background-color: hsl(var(--accent-hover));
 
-  height: auto !important;
-
   /* --vxe-ui-table-fixed-scrolling-box-shadow-color: rgb(0 0 0 / 80%); */
+
+  /** 右上角toolbar按钮色/翻页主题色保持一致 */
+  --vxe-ui-font-primary-lighten-color: hsl(var(--primary-500));
+
+  height: auto !important;
 }
 
 html[data-vxe-ui-theme='dark'] .vxe-grid {

From 4f2354b53a751216da185f1146a7031617a52d4d Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Mon, 7 Apr 2025 11:10:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update:=20=E5=85=BC=E5=AE=B9=E4=BB=A5?=
 =?UTF-8?q?=E5=89=8D=E4=BB=A3=E7=A0=81=20=E5=85=88=E8=BF=94=E5=9B=9Ebody?=
 =?UTF-8?q?=20=E8=BF=99=E6=A0=B7=E4=BC=9A=E9=80=A0=E6=88=90=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=B7=9F=E9=9A=8F=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/utils/src/helpers/get-popup-container.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/utils/src/helpers/get-popup-container.ts b/packages/utils/src/helpers/get-popup-container.ts
index ac9e5b3b..bd9b1a91 100644
--- a/packages/utils/src/helpers/get-popup-container.ts
+++ b/packages/utils/src/helpers/get-popup-container.ts
@@ -27,5 +27,5 @@ export function getVxePopupContainer(_node?: HTMLElement): HTMLElement {
   /**
    * 兼容以前代码 先返回body 这样会造成无法跟随滚动
    */
-  return _node?.parentElement ?? document.body;
+  return document.body;
 }