From 93174d8e1aa6aef6971b26439600d387fe6789d4 Mon Sep 17 00:00:00 2001
From: xuliangzhan <xu_liangzhan@163.com>
Date: Wed, 26 Apr 2023 22:54:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B1=95=E5=BC=80=E8=A1=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                  | 2 +-
 packages/footer/src/footer.ts | 3 ++-
 packages/table/src/body.ts    | 3 ++-
 packages/table/src/table.ts   | 6 ++++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4139e812d..02a710201 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.3.12",
+  "version": "4.3.13-beta.0",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器等...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
diff --git a/packages/footer/src/footer.ts b/packages/footer/src/footer.ts
index e4da3c484..4252b4ec9 100644
--- a/packages/footer/src/footer.ts
+++ b/packages/footer/src/footer.ts
@@ -108,7 +108,8 @@ export default defineComponent({
       const columnOpts = computeColumnOpts.value
       // 如果是使用优化模式
       if (fixedType) {
-        if (scrollXLoad || allColumnFooterOverflow) {
+        // 如果存在展开行使用全量渲染
+        if (!tableReactData.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
           if (!mergeFooterList.length || !footerSpanMethod) {
             tableColumn = fixedColumn
           } else {
diff --git a/packages/table/src/body.ts b/packages/table/src/body.ts
index 49f5cff44..26796c92c 100644
--- a/packages/table/src/body.ts
+++ b/packages/table/src/body.ts
@@ -733,7 +733,8 @@ export default defineComponent({
       // const isMergeRightFixedExceeded = computeIsMergeRightFixedExceeded.value
       // 如果是使用优化模式
       if (fixedType) {
-        if (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
+        // 如果存在展开行使用全量渲染
+        if (!tableReactData.expandColumn && (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
           if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
             tableColumn = fixedColumn
           } else {
diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts
index 788dcc3d3..fdd6760b8 100644
--- a/packages/table/src/table.ts
+++ b/packages/table/src/table.ts
@@ -1468,7 +1468,8 @@ export default defineComponent({
 
             // 如果是使用优化模式
             if (fixedType) {
-              if (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
+              // 如果存在展开行使用全量渲染
+              if (!reactData.expandColumn && (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
                 if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
                   renderColumnList = fixedColumn
                 } else {
@@ -1494,7 +1495,8 @@ export default defineComponent({
             let renderColumnList = tableColumn
             // 如果是使用优化模式
             if (fixedType) {
-              if (scrollXLoad || allColumnFooterOverflow) {
+              // 如果存在展开行使用全量渲染
+              if (!reactData.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
                 if (!mergeFooterList.length || !footerSpanMethod) {
                   renderColumnList = fixedColumn
                 } else {