vxe-table 3.19.8 → 3.19.10

package/es/table/src/columnInfo.js

@@ -120,6 +120,9 @@ export class ColumnInfo {
             titlePrefix: _vm.titlePrefix,
             titleSuffix: _vm.titleSuffix,
             aggFunc: _vm.aggFunc,
+            copyMethod: _vm.copyMethod,
+            cutMethod: _vm.cutMethod,
+            pasteMethod: _vm.pasteMethod,
             // 自定义参数
             params: _vm.params,
             // 渲染属性

package/es/table/src/header.js

@@ -317,13 +317,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
                     }, flSlot
                         ? $xeTable.callSlot(flSlot, cellParams, h)
                         : (rtFloatingFilter && firstFilterOption
-                            ? getSlotVNs(rtFloatingFilter.call($xeTable, h, filterRender, {
-                                $table: $xeTable,
-                                option: firstFilterOption,
-                                column: column,
-                                columnIndex,
-                                $columnIndex
-                            }))
+                            ? getSlotVNs(rtFloatingFilter.call($xeTable, h, filterRender, cellParams))
                             : []))
                 ])
         ]);

package/es/table/src/methods.js

@@ -2406,26 +2406,29 @@ const calcCellAutoHeight = ($xeTable, rowRest, wrapperEl) => {
     const reactData = $xeTable;
     const { scrollXLoad } = reactData;
     const wrapperElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
-    let colHeight = rowRest.height;
+    let colHeight = 0;
     let firstCellStyle = null;
     let topBottomPadding = 0;
     for (let i = 0; i < wrapperElemList.length; i++) {
         const wrapperElem = wrapperElemList[i];
         const cellElem = wrapperElem.parentElement;
+        const cellStyle = cellElem.style;
+        const orHeight = cellStyle.height;
+        if (!scrollXLoad) {
+            cellStyle.height = '';
+        }
         if (!firstCellStyle) {
-            const cellStyle = cellElem.style;
-            const orHeight = cellStyle.height;
-            if (!scrollXLoad) {
-                cellStyle.height = '';
-            }
             firstCellStyle = getComputedStyle(cellElem);
             topBottomPadding = firstCellStyle ? Math.ceil(XEUtils.toNumber(firstCellStyle.paddingTop) + XEUtils.toNumber(firstCellStyle.paddingBottom)) : 0;
-            if (!scrollXLoad) {
-                cellStyle.height = orHeight;
-            }
+        }
+        if (!scrollXLoad) {
+            cellStyle.height = orHeight;
         }
         const cellHeight = wrapperElem ? wrapperElem.clientHeight : 0;
-        colHeight = scrollXLoad ? Math.max(colHeight, Math.ceil(cellHeight + topBottomPadding)) : Math.ceil(cellHeight + topBottomPadding);
+        colHeight = Math.max(colHeight, Math.ceil(cellHeight + topBottomPadding));
+    }
+    if (scrollXLoad) {
+        colHeight = Math.max(colHeight, rowRest.height);
     }
     return colHeight;
 };
@@ -2442,7 +2445,7 @@ const calcCellHeight = ($xeTable) => {
     const treeOpts = $xeTable.computeTreeOpts;
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const el = $xeTable.$refs.refElem;
-    if (!isAllOverflow && (scrollYLoad || scrollXLoad || (treeConfig && treeOpts.showLine)) && el) {
+    if (el && !isAllOverflow && (scrollYLoad || scrollXLoad || (treeConfig && treeOpts.showLine))) {
         const { handleGetRowId } = createHandleGetRowId($xeTable);
         el.setAttribute('data-calc-row', 'Y');
         tableData.forEach(row => {
@@ -2450,7 +2453,7 @@ const calcCellHeight = ($xeTable) => {
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
                 const height = calcCellAutoHeight($xeTable, rowRest, el);
-                rowRest.height = Math.max(defaultRowHeight, scrollXLoad ? Math.max(rowRest.height, height) : height);
+                rowRest.height = Math.max(defaultRowHeight, height);
             }
             el.removeAttribute('data-calc-row');
         });
@@ -3784,8 +3787,8 @@ function updateHeight($xeTable) {
     internalData.customHeight = calcTableHeight($xeTable, 'height');
     internalData.customMinHeight = calcTableHeight($xeTable, 'minHeight');
     internalData.customMaxHeight = calcTableHeight($xeTable, 'maxHeight');
-    // 如果启用虚拟滚动，默认高度
-    if (reactData.scrollYLoad && !(internalData.customHeight || internalData.customMinHeight)) {
+    // 如果启用虚拟滚动，纠正高度
+    if (reactData.scrollYLoad && !(internalData.customHeight || internalData.customMinHeight || internalData.customMaxHeight)) {
         internalData.customHeight = 300;
     }
 }
@@ -4220,6 +4223,26 @@ const Methods = {
         }
         return $xeTable.$nextTick();
     },
+    initData() {
+        const $xeTable = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { data } = props;
+        loadTableData($xeTable, data || [], true).then(() => {
+            if (data && data.length) {
+                internalData.inited = true;
+                internalData.initStatus = true;
+                handleLoadDefaults($xeTable);
+            }
+            handleInitDefaults($xeTable);
+            updateStyle($xeTable);
+            if (!reactData.isAllOverflow) {
+                calcCellHeight($xeTable);
+                updateRowOffsetTop($xeTable);
+            }
+        });
+    },
     /**
      * 加载表格数据
      * @param {Array} datas 数据
@@ -4364,7 +4387,7 @@ const Methods = {
         const internalData = $xeTable;
         const { treeConfig } = props;
         const { isRowGroupStatus } = reactData;
-        const { currKeyField, fullAllDataRowIdData, tableFullData, tableFullTreeData, tableFullGroupData, treeExpandedMaps } = internalData;
+        const { currKeyField, fullAllDataRowIdData, tableFullData, tableFullTreeData, tableFullGroupData, treeExpandedMaps, rowExpandedMaps, selectCheckboxMaps } = internalData;
         const fullAllDataRowIdMaps = isReset ? {} : Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
         const idMaps = {};
@@ -4385,6 +4408,13 @@ const Methods = {
             rowRest.level = level;
             rowRest.index = currIndex;
             rowRest.treeIndex = index;
+            // 更新缓存
+            if (selectCheckboxMaps[rowid]) {
+                selectCheckboxMaps[rowid] = row;
+            }
+            if (rowExpandedMaps[rowid]) {
+                rowExpandedMaps[rowid] = row;
+            }
             idMaps[rowid] = true;
             fullDataRowIdMaps[rowid] = rowRest;
             fullAllDataRowIdMaps[rowid] = rowRest;
@@ -11210,14 +11240,28 @@ const Methods = {
             if (!(scrollXLoad && overflowX)) {
                 xSpaceLeft = 0;
             }
-            if (headerTableElem) {
-                headerTableElem.style.transform = headerTableElem.getAttribute('xvm') ? `translate(${xSpaceLeft}px, 0px)` : '';
-            }
-            if (bodyTableElem) {
-                bodyTableElem.style.transform = `translate(${xSpaceLeft}px, ${reactData.scrollYTop || 0}px)`;
+            if (getConfig().scrollMarginStyle) {
+                // 已废弃方式
+                if (headerTableElem) {
+                    headerTableElem.style.marginLeft = headerTableElem.getAttribute('xvm') ? `${xSpaceLeft}px` : '';
+                }
+                if (bodyTableElem) {
+                    bodyTableElem.style.marginLeft = `${xSpaceLeft}px`;
+                }
+                if (footerTableElem) {
+                    footerTableElem.style.marginLeft = footerTableElem.getAttribute('xvm') ? `${xSpaceLeft}px` : '';
+                }
             }
-            if (footerTableElem) {
-                footerTableElem.style.transform = footerTableElem.getAttribute('xvm') ? `translate(${xSpaceLeft}px, 0px)` : '';
+            else {
+                if (headerTableElem) {
+                    headerTableElem.style.transform = headerTableElem.getAttribute('xvm') ? `translate(${xSpaceLeft}px, 0px)` : '';
+                }
+                if (bodyTableElem) {
+                    bodyTableElem.style.transform = `translate(${xSpaceLeft}px, ${reactData.scrollYTop || 0}px)`;
+                }
+                if (footerTableElem) {
+                    footerTableElem.style.transform = footerTableElem.getAttribute('xvm') ? `translate(${xSpaceLeft}px, 0px)` : '';
+                }
             }
             const containerList = ['main'];
             containerList.forEach(name => {
@@ -11290,22 +11334,27 @@ const Methods = {
             }
             else {
                 const firstRow = afterFullData[startIndex];
-                let rowid = getRowid($xeTable, firstRow);
-                let rowRest = fullAllDataRowIdData[rowid] || {};
-                ySpaceTop = (rowRest.oTop || 0);
-                const lastRow = afterFullData[afterFullData.length - 1];
-                rowid = getRowid($xeTable, lastRow);
-                rowRest = fullAllDataRowIdData[rowid] || {};
-                // 如果为空时还没计算完数据，保持原高度不变
-                if (rowRest.oTop) {
-                    sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
-                    // 是否展开行
-                    if (expandColumn && rowExpandedMaps[rowid]) {
-                        sYHeight += rowRest.expandHeight || expandOpts.height || 0;
+                if (firstRow) {
+                    let rowid = getRowid($xeTable, firstRow);
+                    let rowRest = fullAllDataRowIdData[rowid] || {};
+                    ySpaceTop = (rowRest.oTop || 0);
+                    const lastRow = afterFullData[afterFullData.length - 1];
+                    rowid = getRowid($xeTable, lastRow);
+                    rowRest = fullAllDataRowIdData[rowid] || {};
+                    // 如果为空时还没计算完数据，保持原高度不变
+                    if (rowRest.oTop) {
+                        sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
+                        // 是否展开行
+                        if (expandColumn && rowExpandedMaps[rowid]) {
+                            sYHeight += rowRest.expandHeight || expandOpts.height || 0;
+                        }
+                    }
+                    if (sYHeight > maxYHeight) {
+                        isScrollYBig = true;
                     }
                 }
-                if (sYHeight > maxYHeight) {
-                    isScrollYBig = true;
+                else {
+                    sYHeight = bodyTableElem ? bodyTableElem.clientHeight : 0;
                 }
             }
         }
@@ -11334,14 +11383,27 @@ const Methods = {
         if (!(scrollYLoad && overflowY)) {
             scrollYTop = 0;
         }
-        if (leftBodyTableElem) {
-            leftBodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`;
-        }
-        if (bodyTableElem) {
-            bodyTableElem.style.transform = `translate(${reactData.scrollXLeft || 0}px, ${scrollYTop}px)`;
+        if (getConfig().scrollMarginStyle) {
+            if (leftBodyTableElem) {
+                leftBodyTableElem.style.marginTop = `${scrollYTop}px`;
+            }
+            if (bodyTableElem) {
+                bodyTableElem.style.marginTop = `${scrollYTop}px`;
+            }
+            if (rightbodyTableElem) {
+                rightbodyTableElem.style.marginTop = `${scrollYTop}px`;
+            }
         }
-        if (rightbodyTableElem) {
-            rightbodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`;
+        else {
+            if (leftBodyTableElem) {
+                leftBodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`;
+            }
+            if (bodyTableElem) {
+                bodyTableElem.style.transform = `translate(${reactData.scrollXLeft || 0}px, ${scrollYTop}px)`;
+            }
+            if (rightbodyTableElem) {
+                rightbodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`;
+            }
         }
         containerList.forEach(name => {
             const layoutList = ['header', 'body', 'footer'];

package/es/table/src/table.js

@@ -1598,7 +1598,7 @@ export default {
         const internalData = $xeTable;
         XEUtils.assign(internalData, createInternalData());
         handleKeyField($xeTable);
-        const { data, exportConfig, importConfig, treeConfig, highlightCurrentRow, highlightCurrentColumn } = props;
+        const { exportConfig, importConfig, treeConfig, highlightCurrentRow, highlightCurrentColumn } = props;
         const { scrollXStore, scrollYStore } = internalData;
         const columnOpts = $xeTable.computeColumnOpts;
         const editOpts = $xeTable.computeEditOpts;
@@ -1851,15 +1851,7 @@ export default {
             visibleSize: 0
         });
         this.handleUpdateRowGroup(groupFields);
-        this.loadTableData(data, true).then(() => {
-            if (data && data.length) {
-                this.inited = true;
-                this.initStatus = true;
-                this.handleLoadDefaults();
-            }
-            this.handleInitDefaults();
-            this.updateStyle();
-        });
+        this.initData();
         globalEvents.on($xeTable, 'paste', this.handleGlobalPasteEvent);
         globalEvents.on($xeTable, 'copy', this.handleGlobalCopyEvent);
         globalEvents.on($xeTable, 'cut', this.handleGlobalCutEvent);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.19.8";
+export const version = "3.19.10";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.19.8"}`;
+const version = `table v${"3.19.10"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.8";
+const version = "3.19.10";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2713,7 +2713,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.8"}`;
+const log_version = `table v${"3.19.10"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2853,6 +2853,9 @@ class ColumnInfo {
       titlePrefix: _vm.titlePrefix,
       titleSuffix: _vm.titleSuffix,
       aggFunc: _vm.aggFunc,
+      copyMethod: _vm.copyMethod,
+      cutMethod: _vm.cutMethod,
+      pasteMethod: _vm.pasteMethod,
       // 自定义参数
       params: _vm.params,
       // 渲染属性
@@ -5370,6 +5373,12 @@ const columnProps = {
   contentRender: Object,
   // 聚合函数
   aggFunc: [String, Boolean],
+  // 将单元格复制到剪贴板
+  copyMethod: Function,
+  // 将剪贴单元格的值清除
+  cutMethod: Function,
+  // 从剪贴板赋值到单元格
+  pasteMethod: Function,
   // 额外的参数
   params: Object
 };
@@ -8806,26 +8815,29 @@ const calcCellAutoHeight = ($xeTable, rowRest, wrapperEl) => {
     scrollXLoad
   } = reactData;
   const wrapperElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
-  let colHeight = rowRest.height;
+  let colHeight = 0;
   let firstCellStyle = null;
   let topBottomPadding = 0;
   for (let i = 0; i < wrapperElemList.length; i++) {
     const wrapperElem = wrapperElemList[i];
     const cellElem = wrapperElem.parentElement;
+    const cellStyle = cellElem.style;
+    const orHeight = cellStyle.height;
+    if (!scrollXLoad) {
+      cellStyle.height = '';
+    }
     if (!firstCellStyle) {
-      const cellStyle = cellElem.style;
-      const orHeight = cellStyle.height;
-      if (!scrollXLoad) {
-        cellStyle.height = '';
-      }
       firstCellStyle = getComputedStyle(cellElem);
       topBottomPadding = firstCellStyle ? Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(firstCellStyle.paddingTop) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(firstCellStyle.paddingBottom)) : 0;
-      if (!scrollXLoad) {
-        cellStyle.height = orHeight;
-      }
+    }
+    if (!scrollXLoad) {
+      cellStyle.height = orHeight;
     }
     const cellHeight = wrapperElem ? wrapperElem.clientHeight : 0;
-    colHeight = scrollXLoad ? Math.max(colHeight, Math.ceil(cellHeight + topBottomPadding)) : Math.ceil(cellHeight + topBottomPadding);
+    colHeight = Math.max(colHeight, Math.ceil(cellHeight + topBottomPadding));
+  }
+  if (scrollXLoad) {
+    colHeight = Math.max(colHeight, rowRest.height);
   }
   return colHeight;
 };
@@ -8851,7 +8863,7 @@ const calcCellHeight = $xeTable => {
   const treeOpts = $xeTable.computeTreeOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const el = $xeTable.$refs.refElem;
-  if (!isAllOverflow && (scrollYLoad || scrollXLoad || treeConfig && treeOpts.showLine) && el) {
+  if (el && !isAllOverflow && (scrollYLoad || scrollXLoad || treeConfig && treeOpts.showLine)) {
     const {
       handleGetRowId
     } = createHandleGetRowId($xeTable);
@@ -8861,7 +8873,7 @@ const calcCellHeight = $xeTable => {
       const rowRest = fullAllDataRowIdData[rowid];
       if (rowRest) {
         const height = calcCellAutoHeight($xeTable, rowRest, el);
-        rowRest.height = Math.max(defaultRowHeight, scrollXLoad ? Math.max(rowRest.height, height) : height);
+        rowRest.height = Math.max(defaultRowHeight, height);
       }
       el.removeAttribute('data-calc-row');
     });
@@ -10359,8 +10371,8 @@ function updateHeight($xeTable) {
   internalData.customHeight = calcTableHeight($xeTable, 'height');
   internalData.customMinHeight = calcTableHeight($xeTable, 'minHeight');
   internalData.customMaxHeight = calcTableHeight($xeTable, 'maxHeight');
-  // 如果启用虚拟滚动，默认高度
-  if (reactData.scrollYLoad && !(internalData.customHeight || internalData.customMinHeight)) {
+  // 如果启用虚拟滚动，纠正高度
+  if (reactData.scrollYLoad && !(internalData.customHeight || internalData.customMinHeight || internalData.customMaxHeight)) {
     internalData.customHeight = 300;
   }
 }
@@ -10850,6 +10862,28 @@ const Methods = {
     }
     return $xeTable.$nextTick();
   },
+  initData() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      data
+    } = props;
+    loadTableData($xeTable, data || [], true).then(() => {
+      if (data && data.length) {
+        internalData.inited = true;
+        internalData.initStatus = true;
+        handleLoadDefaults($xeTable);
+      }
+      handleInitDefaults($xeTable);
+      updateStyle($xeTable);
+      if (!reactData.isAllOverflow) {
+        calcCellHeight($xeTable);
+        updateRowOffsetTop($xeTable);
+      }
+    });
+  },
   /**
    * 加载表格数据
    * @param {Array} datas 数据
@@ -11013,7 +11047,9 @@ const Methods = {
       tableFullData,
       tableFullTreeData,
       tableFullGroupData,
-      treeExpandedMaps
+      treeExpandedMaps,
+      rowExpandedMaps,
+      selectCheckboxMaps
     } = internalData;
     const fullAllDataRowIdMaps = isReset ? {} : {
       ...fullAllDataRowIdData
@@ -11055,6 +11091,13 @@ const Methods = {
       rowRest.level = level;
       rowRest.index = currIndex;
       rowRest.treeIndex = index;
+      // 更新缓存
+      if (selectCheckboxMaps[rowid]) {
+        selectCheckboxMaps[rowid] = row;
+      }
+      if (rowExpandedMaps[rowid]) {
+        rowExpandedMaps[rowid] = row;
+      }
       idMaps[rowid] = true;
       fullDataRowIdMaps[rowid] = rowRest;
       fullAllDataRowIdMaps[rowid] = rowRest;
@@ -18981,14 +19024,27 @@ const Methods = {
       if (!(scrollXLoad && overflowX)) {
         xSpaceLeft = 0;
       }
-      if (headerTableElem) {
-        headerTableElem.style.transform = headerTableElem.getAttribute('xvm') ? `translate(${xSpaceLeft}px, 0px)` : '';
-      }
-      if (bodyTableElem) {
-        bodyTableElem.style.transform = `translate(${xSpaceLeft}px, ${reactData.scrollYTop || 0}px)`;
-      }
-      if (footerTableElem) {
-        footerTableElem.style.transform = footerTableElem.getAttribute('xvm') ? `translate(${xSpaceLeft}px, 0px)` : '';
+      if (methods_getConfig().scrollMarginStyle) {
+        // 已废弃方式
+        if (headerTableElem) {
+          headerTableElem.style.marginLeft = headerTableElem.getAttribute('xvm') ? `${xSpaceLeft}px` : '';
+        }
+        if (bodyTableElem) {
+          bodyTableElem.style.marginLeft = `${xSpaceLeft}px`;
+        }
+        if (footerTableElem) {
+          footerTableElem.style.marginLeft = footerTableElem.getAttribute('xvm') ? `${xSpaceLeft}px` : '';
+        }
+      } else {
+        if (headerTableElem) {
+          headerTableElem.style.transform = headerTableElem.getAttribute('xvm') ? `translate(${xSpaceLeft}px, 0px)` : '';
+        }
+        if (bodyTableElem) {
+          bodyTableElem.style.transform = `translate(${xSpaceLeft}px, ${reactData.scrollYTop || 0}px)`;
+        }
+        if (footerTableElem) {
+          footerTableElem.style.transform = footerTableElem.getAttribute('xvm') ? `translate(${xSpaceLeft}px, 0px)` : '';
+        }
       }
       const containerList = ['main'];
       containerList.forEach(name => {
@@ -19075,22 +19131,26 @@ const Methods = {
         ySpaceTop = Math.max(0, startIndex * defaultRowHeight);
       } else {
         const firstRow = afterFullData[startIndex];
-        let rowid = getRowid($xeTable, firstRow);
-        let rowRest = fullAllDataRowIdData[rowid] || {};
-        ySpaceTop = rowRest.oTop || 0;
-        const lastRow = afterFullData[afterFullData.length - 1];
-        rowid = getRowid($xeTable, lastRow);
-        rowRest = fullAllDataRowIdData[rowid] || {};
-        // 如果为空时还没计算完数据，保持原高度不变
-        if (rowRest.oTop) {
-          sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
-          // 是否展开行
-          if (expandColumn && rowExpandedMaps[rowid]) {
-            sYHeight += rowRest.expandHeight || expandOpts.height || 0;
+        if (firstRow) {
+          let rowid = getRowid($xeTable, firstRow);
+          let rowRest = fullAllDataRowIdData[rowid] || {};
+          ySpaceTop = rowRest.oTop || 0;
+          const lastRow = afterFullData[afterFullData.length - 1];
+          rowid = getRowid($xeTable, lastRow);
+          rowRest = fullAllDataRowIdData[rowid] || {};
+          // 如果为空时还没计算完数据，保持原高度不变
+          if (rowRest.oTop) {
+            sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
+            // 是否展开行
+            if (expandColumn && rowExpandedMaps[rowid]) {
+              sYHeight += rowRest.expandHeight || expandOpts.height || 0;
+            }
           }
-        }
-        if (sYHeight > maxYHeight) {
-          isScrollYBig = true;
+          if (sYHeight > maxYHeight) {
+            isScrollYBig = true;
+          }
+        } else {
+          sYHeight = bodyTableElem ? bodyTableElem.clientHeight : 0;
         }
       }
     } else {
@@ -19117,14 +19177,26 @@ const Methods = {
     if (!(scrollYLoad && overflowY)) {
       scrollYTop = 0;
     }
-    if (leftBodyTableElem) {
-      leftBodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`;
-    }
-    if (bodyTableElem) {
-      bodyTableElem.style.transform = `translate(${reactData.scrollXLeft || 0}px, ${scrollYTop}px)`;
-    }
-    if (rightbodyTableElem) {
-      rightbodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`;
+    if (methods_getConfig().scrollMarginStyle) {
+      if (leftBodyTableElem) {
+        leftBodyTableElem.style.marginTop = `${scrollYTop}px`;
+      }
+      if (bodyTableElem) {
+        bodyTableElem.style.marginTop = `${scrollYTop}px`;
+      }
+      if (rightbodyTableElem) {
+        rightbodyTableElem.style.marginTop = `${scrollYTop}px`;
+      }
+    } else {
+      if (leftBodyTableElem) {
+        leftBodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`;
+      }
+      if (bodyTableElem) {
+        bodyTableElem.style.transform = `translate(${reactData.scrollXLeft || 0}px, ${scrollYTop}px)`;
+      }
+      if (rightbodyTableElem) {
+        rightbodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`;
+      }
     }
     containerList.forEach(name => {
       const layoutList = ['header', 'body', 'footer'];
@@ -21072,13 +21144,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
         colid
       },
       class: 'vxe-cell--wrapper vxe-header-cell--wrapper'
-    }, flSlot ? $xeTable.callSlot(flSlot, cellParams, h) : rtFloatingFilter && firstFilterOption ? getSlotVNs(rtFloatingFilter.call($xeTable, h, filterRender, {
-      $table: $xeTable,
-      option: firstFilterOption,
-      column: column,
-      columnIndex,
-      $columnIndex
-    })) : [])])]);
+    }, flSlot ? $xeTable.callSlot(flSlot, cellParams, h) : rtFloatingFilter && firstFilterOption ? getSlotVNs(rtFloatingFilter.call($xeTable, h, filterRender, cellParams)) : [])])]);
   });
 }
 function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
@@ -31909,7 +31975,6 @@ function renderBody(h, $xeTable) {
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, createInternalData());
     handleKeyField($xeTable);
     const {
-      data,
       exportConfig,
       importConfig,
       treeConfig,
@@ -32173,15 +32238,7 @@ function renderBody(h, $xeTable) {
       visibleSize: 0
     });
     this.handleUpdateRowGroup(groupFields);
-    this.loadTableData(data, true).then(() => {
-      if (data && data.length) {
-        this.inited = true;
-        this.initStatus = true;
-        this.handleLoadDefaults();
-      }
-      this.handleInitDefaults();
-      this.updateStyle();
-    });
+    this.initData();
     table_globalEvents.on($xeTable, 'paste', this.handleGlobalPasteEvent);
     table_globalEvents.on($xeTable, 'copy', this.handleGlobalCopyEvent);
     table_globalEvents.on($xeTable, 'cut', this.handleGlobalCutEvent);