vxe-table 3.12.10-beta.2 → 3.12.10-beta.21

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.10-beta.2";
+const version = "3.12.10-beta.21";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2255,7 +2255,10 @@ core_.VxeUI.setConfig({
     },
     resizableConfig: {
       dragMode: 'auto',
-      showDragTip: true
+      showDragTip: true,
+      isSyncAutoHeight: true,
+      isSyncAutoWidth: true,
+      minHeight: 18
     },
     radioConfig: {
       // trigger: 'default'
@@ -2289,6 +2292,11 @@ core_.VxeUI.setConfig({
     columnConfig: {
       maxFixedSize: 4
     },
+    cellConfig: {
+      padding: true
+    },
+    headerCellConfig: {},
+    footerCellConfig: {},
     // menuConfig: {
     //   visibleMethod () {}
     // },
@@ -2393,18 +2401,20 @@ core_.VxeUI.setConfig({
       isReplace: true
     },
     virtualXConfig: {
-      // enabled: false,
-      gt: 60
-      // oSize: 0
+      enabled: true,
+      gt: 60,
+      preSize: 0,
+      oSize: 1
     },
     virtualYConfig: {
-      // enabled: false,
-      gt: 100
-      // oSize: 0
+      enabled: true,
+      gt: 100,
+      preSize: 1,
+      oSize: 2
     },
     scrollbarConfig: {
-      width: 10,
-      height: 10
+      // width: 0,
+      // height: 0
     }
   },
   // export: {
@@ -2824,7 +2834,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.10-beta.2"}`;
+const log_version = `table v${"3.12.10-beta.21"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2927,6 +2937,7 @@ class ColumnInfo {
       filterRender: _vm.filterRender,
       treeNode: _vm.treeNode,
       dragSort: _vm.dragSort,
+      rowResize: _vm.rowResize,
       cellType: _vm.cellType,
       cellRender: _vm.cellRender,
       editRender: _vm.editRender,
@@ -3122,7 +3133,7 @@ function getElementMarginWidth(elem) {
 }
 function handleFieldOrColumn(_vm, fieldOrColumn) {
   if (fieldOrColumn) {
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? _vm.getColumnByField(fieldOrColumn) : fieldOrColumn;
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(fieldOrColumn) ? _vm.getColumnByField(`${fieldOrColumn}`) : fieldOrColumn;
   }
   return null;
 }
@@ -3207,6 +3218,7 @@ function getColReMinWidth(params) {
     column,
     cell
   } = params;
+  const internalData = $table;
   const {
     showHeaderOverflow: allColumnHeaderOverflow,
     resizableOpts
@@ -3221,6 +3233,9 @@ function getColReMinWidth(params) {
       return Math.max(1, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(customMinWidth));
     }
   }
+  const {
+    elemStore
+  } = internalData;
   const {
     showHeaderOverflow,
     minWidth: colMinWidth
@@ -3247,13 +3262,10 @@ function getColReMinWidth(params) {
   }
   // 如果设置最小宽
   if (colMinWidth) {
-    const {
-      refTableBody
-    } = $table.$refs;
-    const bodyElem = refTableBody ? refTableBody.$el : null;
-    if (bodyElem) {
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    if (bodyScrollElem) {
       if (isScale(colMinWidth)) {
-        const bodyWidth = bodyElem.clientWidth - 1;
+        const bodyWidth = bodyScrollElem.clientWidth - 1;
         const meanWidth = bodyWidth / 100;
         return Math.max(mWidth, Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(colMinWidth) * meanWidth));
       } else if (isPx(colMinWidth)) {
@@ -3299,14 +3311,39 @@ function getOffsetSize($xeTable) {
 }
 function calcTreeLine(params, prevRow) {
   const {
-    $table
+    $table,
+    row
   } = params;
+  const tableProps = $table;
   const tableReactData = $table;
+  const tableInternalData = $table;
+  const {
+    showOverflow
+  } = tableProps;
+  const {
+    scrollYLoad
+  } = tableReactData;
+  const {
+    fullAllDataRowIdData
+  } = tableInternalData;
+  const rowOpts = $table.computeRowOpts;
+  const cellOpts = $table.computeCellOpts;
+  const defaultRowHeight = $table.computeDefaultRowHeight;
+  const rowid = getRowid($table, row);
+  const rowRest = fullAllDataRowIdData[rowid];
+  const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
   let expandSize = 1;
   if (prevRow) {
     expandSize = countTreeExpand(prevRow, params);
   }
-  return tableReactData.rowHeight * expandSize - (prevRow ? 1 : 12 - getOffsetSize($table));
+  let cellHeight = currCellHeight;
+  const vnHeight = rowRest.height;
+  if (scrollYLoad) {
+    if (!showOverflow) {
+      cellHeight = vnHeight || currCellHeight;
+    }
+  }
+  return cellHeight * expandSize - (prevRow ? 1 : 12 - getOffsetSize($table));
 }
 function mergeBodyMethod(mergeList, _rowIndex, _columnIndex) {
   for (let mIndex = 0; mIndex < mergeList.length; mIndex++) {
@@ -3381,43 +3418,32 @@ function createColumn($xeTable, options, renderOptions) {
   return isColumnInfo(options) ? options : new ColumnInfo($xeTable, options, renderOptions);
 }
 function rowToVisible($xeTable, row) {
+  const tableProps = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
-  const tableProps = $xeTable;
   const {
     showOverflow
   } = tableProps;
-  const refTableBody = $xeTable.$refs.refTableBody;
   const {
-    columnStore,
     scrollYLoad
   } = reactData;
   const {
+    elemStore,
     afterFullData,
-    scrollYStore,
-    fullAllDataRowIdData
+    fullAllDataRowIdData,
+    isResizeCellHeight
   } = internalData;
-  const {
-    rowHeight
-  } = scrollYStore;
-  const {
-    leftList,
-    rightList
-  } = columnStore;
-  const bodyElem = refTableBody ? refTableBody.$el : null;
+  const rowOpts = $xeTable.computeRowOpts;
+  const cellOpts = $xeTable.computeCellOpts;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+  const leftFixedWidth = $xeTable.computeLeftFixedWidth;
+  const rightFixedWidth = $xeTable.computeRightFixedWidth;
+  const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
   const rowid = getRowid($xeTable, row);
-  let offsetFixedLeft = 0;
-  leftList.forEach(item => {
-    offsetFixedLeft += item.renderWidth;
-  });
-  let offsetFixedRight = 0;
-  rightList.forEach(item => {
-    offsetFixedRight += item.renderWidth;
-  });
-  if (bodyElem) {
-    const bodyHeight = bodyElem.clientHeight;
-    const bodyScrollTop = bodyElem.scrollTop;
-    const trElem = bodyElem.querySelector(`[rowid="${rowid}"]`);
+  if (bodyScrollElem) {
+    const bodyHeight = bodyScrollElem.clientHeight;
+    const bodyScrollTop = bodyScrollElem.scrollTop;
+    const trElem = bodyScrollElem.querySelector(`[rowid="${rowid}"]`);
     if (trElem) {
       const trOffsetParent = trElem.offsetParent;
       const trOffsetTop = trElem.offsetTop + (trOffsetParent ? trOffsetParent.offsetTop : 0);
@@ -3431,12 +3457,13 @@ function rowToVisible($xeTable, row) {
     } else {
       // 如果是虚拟渲染滚动
       if (scrollYLoad) {
-        if (showOverflow) {
-          return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * rowHeight);
+        const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
+        if (!isCustomCellHeight && showOverflow) {
+          return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * defaultRowHeight);
         }
         let scrollTop = 0;
         const rowRest = fullAllDataRowIdData[rowid];
-        const rHeight = rowRest ? rowRest.height || rowHeight : rowHeight;
+        const rHeight = rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
         for (let i = 0; i < afterFullData.length; i++) {
           const currRow = afterFullData[i];
           const currRowid = getRowid($xeTable, currRow);
@@ -3444,60 +3471,53 @@ function rowToVisible($xeTable, row) {
             break;
           }
           const rowRest = fullAllDataRowIdData[currRowid];
-          scrollTop += rowRest ? rowRest.height || rowHeight : rowHeight;
+          scrollTop += rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
         }
         if (scrollTop < bodyScrollTop) {
-          return $xeTable.scrollTo(null, scrollTop - offsetFixedLeft - 1);
+          return $xeTable.scrollTo(null, scrollTop - leftFixedWidth - 1);
         }
-        return $xeTable.scrollTo(null, scrollTop + rHeight - (bodyHeight - offsetFixedRight - 1));
+        return $xeTable.scrollTo(null, scrollTop + rHeight - (bodyHeight - rightFixedWidth - 1));
       }
     }
   }
   return Promise.resolve();
 }
 function colToVisible($xeTable, column, row) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
   const {
-    columnStore,
-    scrollXLoad,
-    visibleColumn
-  } = $xeTable;
-  const refTableBody = $xeTable.$refs.refTableBody;
+    scrollXLoad
+  } = reactData;
   const {
-    leftList,
-    rightList
-  } = columnStore;
-  const bodyElem = refTableBody ? refTableBody.$el : null;
+    elemStore,
+    visibleColumn
+  } = internalData;
+  const leftFixedWidth = $xeTable.computeLeftFixedWidth;
+  const rightFixedWidth = $xeTable.computeRightFixedWidth;
+  const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
   if (column.fixed) {
     return Promise.resolve();
   }
-  let offsetFixedLeft = 0;
-  leftList.forEach(item => {
-    offsetFixedLeft += item.renderWidth;
-  });
-  let offsetFixedRight = 0;
-  rightList.forEach(item => {
-    offsetFixedRight += item.renderWidth;
-  });
-  if (bodyElem) {
-    const bodyWidth = bodyElem.clientWidth;
-    const bodyScrollLeft = bodyElem.scrollLeft;
+  if (bodyScrollElem) {
+    const bodyWidth = bodyScrollElem.clientWidth;
+    const bodyScrollLeft = bodyScrollElem.scrollLeft;
     let tdElem = null;
     if (row) {
       const rowid = getRowid($xeTable, row);
-      tdElem = bodyElem.querySelector(`[rowid="${rowid}"] .${column.id}`);
+      tdElem = bodyScrollElem.querySelector(`[rowid="${rowid}"] .${column.id}`);
     }
     if (!tdElem) {
-      tdElem = bodyElem.querySelector(`.${column.id}`);
+      tdElem = bodyScrollElem.querySelector(`.${column.id}`);
     }
     if (tdElem) {
       const tdOffsetParent = tdElem.offsetParent;
       const tdOffsetLeft = tdElem.offsetLeft + (tdOffsetParent ? tdOffsetParent.offsetLeft : 0);
       const cellWidth = tdElem.clientWidth;
       // 检测是否在可视区中
-      if (tdOffsetLeft < bodyScrollLeft + offsetFixedLeft) {
-        return $xeTable.scrollTo(tdOffsetLeft - offsetFixedLeft - 1);
-      } else if (tdOffsetLeft + cellWidth - bodyScrollLeft > bodyWidth - offsetFixedRight) {
-        return $xeTable.scrollTo(tdOffsetLeft + cellWidth - (bodyWidth - offsetFixedRight - 1));
+      if (tdOffsetLeft < bodyScrollLeft + leftFixedWidth) {
+        return $xeTable.scrollTo(tdOffsetLeft - leftFixedWidth - 1);
+      } else if (tdOffsetLeft + cellWidth - bodyScrollLeft > bodyWidth - rightFixedWidth) {
+        return $xeTable.scrollTo(tdOffsetLeft + cellWidth - (bodyWidth - rightFixedWidth - 1));
       }
     } else {
       // 检测是否在虚拟渲染可视区中
@@ -3505,15 +3525,16 @@ function colToVisible($xeTable, column, row) {
         let scrollLeft = 0;
         const cellWidth = column.renderWidth;
         for (let i = 0; i < visibleColumn.length; i++) {
-          if (visibleColumn[i] === column) {
+          const currCol = visibleColumn[i];
+          if (currCol === column || currCol.id === column.id) {
             break;
           }
-          scrollLeft += visibleColumn[i].renderWidth;
+          scrollLeft += currCol.renderWidth;
         }
         if (scrollLeft < bodyScrollLeft) {
-          return $xeTable.scrollTo(scrollLeft - offsetFixedLeft - 1);
+          return $xeTable.scrollTo(scrollLeft - leftFixedWidth - 1);
         }
-        return $xeTable.scrollTo(scrollLeft + cellWidth - (bodyWidth - offsetFixedRight - 1));
+        return $xeTable.scrollTo(scrollLeft + cellWidth - (bodyWidth - rightFixedWidth - 1));
       }
     }
   }
@@ -3757,7 +3778,7 @@ function renderTitleContent(h, params, content) {
   const ons = {};
   if (showTitle || showTooltip || showAllTip) {
     ons.mouseenter = evnt => {
-      if (tableReactData._isResize) {
+      if (tableReactData.isDragResize) {
         return;
       }
       if (showTitle) {
@@ -3769,7 +3790,7 @@ function renderTitleContent(h, params, content) {
   }
   if (showTooltip || showAllTip) {
     ons.mouseleave = evnt => {
-      if (tableReactData._isResize) {
+      if (tableReactData.isDragResize) {
         return;
       }
       if (showTooltip || showAllTip) {
@@ -4017,9 +4038,7 @@ const Cell = {
     return Cell.renderTreeIcon(h, params, Cell.renderDefaultCell.call(this, h, params));
   },
   renderDefaultFooter(h, params) {
-    return [h('span', {
-      class: 'vxe-cell--item'
-    }, getFooterContent(h, params))];
+    return getFooterContent(h, params);
   },
   /**
    * 树节点
@@ -4874,6 +4893,8 @@ const columnProps = {
   treeNode: Boolean,
   // 设置为拖拽排序
   dragSort: Boolean,
+  // 设置为行高拖拽
+  rowResize: Boolean,
   // 是否可视
   visible: {
     type: Boolean,
@@ -5291,7 +5312,7 @@ function cacheColumnMap($xeTable) {
       }
       fullColumnFieldData[field] = rest;
     } else {
-      if (storage || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
+      if (storage && !type || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
         errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
       }
     }
@@ -5382,6 +5403,102 @@ const updateScrollYStatus = ($xeTable, fullData) => {
   reactData.scrollYLoad = scrollYLoad;
   return scrollYLoad;
 };
+function updateAfterListIndex($xeTable) {
+  const internalData = $xeTable;
+  const {
+    afterFullData,
+    fullDataRowIdData,
+    fullAllDataRowIdData
+  } = internalData;
+  const fullMaps = {};
+  afterFullData.forEach((row, index) => {
+    const rowid = getRowid($xeTable, row);
+    const rowRest = fullAllDataRowIdData[rowid];
+    const seq = index + 1;
+    if (rowRest) {
+      rowRest.seq = seq;
+      rowRest._index = index;
+    } else {
+      const rest = {
+        row,
+        rowid,
+        seq,
+        index: -1,
+        $index: -1,
+        _index: index,
+        treeIndex: -1,
+        items: [],
+        parent: null,
+        level: 0,
+        height: 0,
+        resizeHeight: 0,
+        oTop: 0
+      };
+      fullAllDataRowIdData[rowid] = rest;
+      fullDataRowIdData[rowid] = rest;
+    }
+    fullMaps[rowid] = row;
+  });
+  internalData.afterFullRowMaps = fullMaps;
+}
+/**
+ * 预编译
+ * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
+ */
+function updateAfterDataIndex($xeTable) {
+  const props = $xeTable;
+  const internalData = $xeTable;
+  const {
+    treeConfig
+  } = props;
+  const {
+    fullDataRowIdData,
+    fullAllDataRowIdData,
+    afterTreeFullData
+  } = internalData;
+  const treeOpts = $xeTable.computeTreeOpts;
+  const {
+    transform
+  } = treeOpts;
+  const childrenField = treeOpts.children || treeOpts.childrenField;
+  const fullMaps = {};
+  if (treeConfig) {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, (row, index, items, path) => {
+      const rowid = getRowid($xeTable, row);
+      const rowRest = fullAllDataRowIdData[rowid];
+      const seq = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
+      if (rowRest) {
+        rowRest.seq = seq;
+        rowRest.treeIndex = index;
+      } else {
+        const rest = {
+          row,
+          rowid,
+          seq,
+          index: -1,
+          $index: -1,
+          _index: -1,
+          treeIndex: -1,
+          items: [],
+          parent: null,
+          level: 0,
+          height: 0,
+          resizeHeight: 0,
+          oTop: 0
+        };
+        fullAllDataRowIdData[rowid] = rest;
+        fullDataRowIdData[rowid] = rest;
+      }
+      fullMaps[rowid] = row;
+    }, {
+      children: transform ? treeOpts.mapChildrenField : childrenField
+    });
+    internalData.afterFullRowMaps = fullMaps;
+    updateAfterListIndex($xeTable);
+  } else {
+    updateAfterListIndex($xeTable);
+  }
+}
 /**
  * 如果为虚拟树，将树结构拍平
  * @returns
@@ -5443,7 +5560,9 @@ function updateStyle($xeTable) {
     tableColumn,
     scrollXLoad,
     scrollYLoad,
+    overflowX,
     scrollbarWidth,
+    overflowY,
     scrollbarHeight,
     columnStore,
     editStore,
@@ -5467,6 +5586,8 @@ function updateStyle($xeTable) {
     return;
   }
   const containerList = ['main', 'left', 'right'];
+  const osbWidth = overflowY ? scrollbarWidth : 0;
+  const osbHeight = overflowX ? scrollbarHeight : 0;
   const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder;
   const cellOffsetWidth = $xeTable.computeCellOffsetWidth;
   const mouseOpts = $xeTable.computeMouseOpts;
@@ -5474,16 +5595,16 @@ function updateStyle($xeTable) {
   const bodyTableElem = getRefElem(elemStore['main-body-table']);
   if (emptyPlaceholderElem) {
     emptyPlaceholderElem.style.top = `${headerHeight}px`;
-    emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - scrollbarHeight}px` : '';
+    emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - osbHeight}px` : '';
   }
   let bodyHeight = 0;
   let bodyMaxHeight = 0;
-  const bodyMinHeight = customMinHeight - headerHeight - footerHeight - scrollbarHeight;
+  const bodyMinHeight = customMinHeight - headerHeight - footerHeight - osbHeight;
   if (customMaxHeight) {
-    bodyMaxHeight = Math.max(bodyMinHeight, customMaxHeight - headerHeight - footerHeight - scrollbarHeight);
+    bodyMaxHeight = Math.max(bodyMinHeight, customMaxHeight - headerHeight - footerHeight - osbHeight);
   }
   if (customHeight) {
-    bodyHeight = customHeight - headerHeight - footerHeight - scrollbarHeight;
+    bodyHeight = customHeight - headerHeight - footerHeight - osbHeight;
   }
   if (!bodyHeight) {
     if (bodyTableElem) {
@@ -5496,35 +5617,42 @@ function updateStyle($xeTable) {
     }
     bodyHeight = Math.max(bodyMinHeight, bodyHeight);
   }
+  const xLeftCornerEl = $xeTable.$refs.refScrollXLeftCornerElem;
+  const xRightCornerEl = $xeTable.$refs.refScrollXRightCornerElem;
+  const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
   const scrollXVirtualEl = $xeTable.$refs.refScrollXVirtualElem;
   if (scrollXVirtualEl) {
-    scrollXVirtualEl.style.height = `${scrollbarHeight}px`;
-    scrollXVirtualEl.style.visibility = scrollbarHeight ? 'visible' : 'hidden';
+    scrollXVirtualEl.style.height = `${osbHeight}px`;
+    scrollXVirtualEl.style.visibility = overflowX ? 'visible' : 'hidden';
   }
-  const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
-  if (xHandleEl) {
-    xHandleEl.style.width = `${el.clientWidth - scrollbarWidth}px`;
+  const xWrapperEl = $xeTable.$refs.refScrollXWrapperElem;
+  if (xWrapperEl) {
+    xWrapperEl.style.left = scrollbarXToTop ? `${osbWidth}px` : '';
+    xWrapperEl.style.width = `${el.clientWidth - osbWidth}px`;
+  }
+  if (xLeftCornerEl) {
+    xLeftCornerEl.style.width = scrollbarXToTop ? `${osbWidth}px` : '';
+    xLeftCornerEl.style.display = scrollbarXToTop ? osbWidth && osbHeight ? 'block' : '' : '';
   }
-  const xRightCornerEl = $xeTable.$refs.refScrollXRightCornerElem;
   if (xRightCornerEl) {
-    xRightCornerEl.style.width = `${scrollbarWidth}px`;
-    xRightCornerEl.style.display = scrollbarWidth && scrollbarHeight ? 'block' : '';
+    xRightCornerEl.style.width = scrollbarXToTop ? '' : `${osbWidth}px`;
+    xRightCornerEl.style.display = scrollbarXToTop ? '' : osbWidth && osbHeight ? 'block' : '';
   }
   const scrollYVirtualEl = $xeTable.$refs.refScrollYVirtualElem;
   if (scrollYVirtualEl) {
-    scrollYVirtualEl.style.width = `${scrollbarWidth}px`;
+    scrollYVirtualEl.style.width = `${osbWidth}px`;
     scrollYVirtualEl.style.height = `${bodyHeight + headerHeight + footerHeight}px`;
-    scrollYVirtualEl.style.visibility = scrollbarWidth ? 'visible' : 'hidden';
+    scrollYVirtualEl.style.visibility = overflowY ? 'visible' : 'hidden';
   }
   const yTopCornerEl = $xeTable.$refs.refScrollYTopCornerElem;
   if (yTopCornerEl) {
     yTopCornerEl.style.height = `${headerHeight}px`;
     yTopCornerEl.style.display = headerHeight ? 'block' : '';
   }
-  const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
-  if (yHandleEl) {
-    yHandleEl.style.height = `${bodyHeight}px`;
-    yHandleEl.style.top = `${headerHeight}px`;
+  const yWrapperEl = $xeTable.$refs.refScrollYWrapperElem;
+  if (yWrapperEl) {
+    yWrapperEl.style.height = `${bodyHeight}px`;
+    yWrapperEl.style.top = `${headerHeight}px`;
   }
   const yBottomCornerEl = $xeTable.$refs.refScrollYBottomCornerElem;
   if (yBottomCornerEl) {
@@ -5633,7 +5761,7 @@ function updateStyle($xeTable) {
           if (wrapperElem) {
             wrapperElem.style.top = `${headerHeight}px`;
           }
-          fixedWrapperElem.style.height = `${customHeight > 0 ? customHeight : tableHeight + headerHeight + footerHeight + scrollbarHeight}px`;
+          fixedWrapperElem.style.height = `${customHeight > 0 ? customHeight : tableHeight + headerHeight + footerHeight + osbHeight}px`;
           fixedWrapperElem.style.width = `${fixedColumn.reduce((previous, column) => previous + column.renderWidth, 0)}px`;
         }
         let tWidth = tableWidth;
@@ -5662,7 +5790,7 @@ function updateStyle($xeTable) {
         if (tableElem) {
           tableElem.style.width = tWidth ? `${tWidth}px` : '';
           // 兼容性处理
-          tableElem.style.paddingRight = scrollbarWidth && fixedType && (browse['-moz'] || browse.safari) ? `${scrollbarWidth}px` : '';
+          tableElem.style.paddingRight = osbWidth && fixedType && (browse['-moz'] || browse.safari) ? `${osbWidth}px` : '';
         }
         const emptyBlockElem = getRefElem(elemStore[`${name}-${layout}-emptyBlock`]);
         if (emptyBlockElem) {
@@ -5697,7 +5825,7 @@ function updateStyle($xeTable) {
           // 如果是固定列
           if (fixedWrapperElem) {
             if (wrapperElem) {
-              wrapperElem.style.top = `${customHeight > 0 ? customHeight - footerHeight - scrollbarHeight : tableHeight + headerHeight}px`;
+              wrapperElem.style.top = `${customHeight > 0 ? customHeight - footerHeight - osbHeight : tableHeight + headerHeight}px`;
             }
           }
         }
@@ -5768,62 +5896,69 @@ function updateStyle($xeTable) {
   return $xeTable.$nextTick();
 }
 function computeRowHeight($xeTable) {
+  const props = $xeTable;
+  const {
+    showOverflow
+  } = props;
   const tableHeader = $xeTable.$refs.refTableHeader;
   const tableBody = $xeTable.$refs.refTableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   let rowHeight = 0;
-  if (tableBodyElem) {
-    const tableHeaderElem = tableHeader ? tableHeader.$el : null;
-    let firstTrElem;
-    firstTrElem = tableBodyElem.querySelector('tr');
-    if (!firstTrElem && tableHeaderElem) {
-      firstTrElem = tableHeaderElem.querySelector('tr');
+  if (showOverflow) {
+    if (tableBodyElem) {
+      const tableHeaderElem = tableHeader ? tableHeader.$el : null;
+      let firstTrElem;
+      firstTrElem = tableBodyElem.querySelector('tr');
+      if (!firstTrElem && tableHeaderElem) {
+        firstTrElem = tableHeaderElem.querySelector('tr');
+      }
+      if (firstTrElem) {
+        rowHeight = firstTrElem.clientHeight;
+      }
     }
-    if (firstTrElem) {
-      rowHeight = firstTrElem.clientHeight;
+    if (!rowHeight) {
+      rowHeight = defaultRowHeight;
     }
-  }
-  if (!rowHeight) {
+  } else {
     rowHeight = defaultRowHeight;
   }
   // 最低支持 18px 行高
   return Math.max(18, rowHeight);
 }
-function handleVirtualYVisible($xeTable) {
+function handleVirtualYVisible($xeTable, currScrollTop) {
   const props = $xeTable;
-  const reactData = $xeTable;
   const internalData = $xeTable;
   const {
     showOverflow
   } = props;
-  const {
-    rowHeight
-  } = reactData;
   const {
     elemStore,
+    isResizeCellHeight,
     afterFullData,
     fullAllDataRowIdData
   } = internalData;
+  const rowOpts = $xeTable.computeRowOpts;
+  const cellOpts = $xeTable.computeCellOpts;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
   if (bodyScrollElem) {
-    const {
-      scrollTop,
-      clientHeight
-    } = bodyScrollElem;
+    const clientHeight = bodyScrollElem.clientHeight;
+    const scrollTop = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(currScrollTop) ? currScrollTop : bodyScrollElem.scrollTop;
     const endHeight = scrollTop + clientHeight;
     let toVisibleIndex = -1;
     let offsetTop = 0;
     let visibleSize = 0;
-    if (showOverflow) {
-      toVisibleIndex = Math.floor(scrollTop / rowHeight);
-      visibleSize = Math.ceil(clientHeight / rowHeight) + 1;
+    const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
+    if (!isCustomCellHeight && showOverflow) {
+      toVisibleIndex = Math.floor(scrollTop / defaultRowHeight);
+      visibleSize = Math.ceil(clientHeight / defaultRowHeight) + 1;
     } else {
       for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
         const row = afterFullData[rIndex];
         const rowid = getRowid($xeTable, row);
         const rowRest = fullAllDataRowIdData[rowid];
-        offsetTop += rowRest ? rowRest.height || rowHeight : rowHeight;
+        offsetTop += rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
         if (toVisibleIndex === -1 && scrollTop < offsetTop) {
           toVisibleIndex = rIndex;
         }
@@ -6111,7 +6246,7 @@ function autoCellWidth($xeTable) {
   }
   const tableHeight = bodyElem.offsetHeight;
   const overflowY = yHandleEl.scrollHeight > yHandleEl.clientHeight;
-  reactData.scrollbarWidth = overflowY ? Math.max(scrollbarOpts.width || 0, yHandleEl.offsetWidth - yHandleEl.clientWidth) : 0;
+  reactData.scrollbarWidth = Math.max(scrollbarOpts.width || 0, yHandleEl.offsetWidth - yHandleEl.clientWidth);
   reactData.overflowY = overflowY;
   internalData.tableWidth = tableWidth;
   internalData.tableHeight = tableHeight;
@@ -6120,7 +6255,7 @@ function autoCellWidth($xeTable) {
   const headerHeight = headerTableElem ? headerTableElem.clientHeight : 0;
   const overflowX = tableWidth > bodyWidth;
   const footerHeight = footerTableElem ? footerTableElem.clientHeight : 0;
-  reactData.scrollbarHeight = overflowX ? Math.max(scrollbarOpts.height || 0, xHandleEl.offsetHeight - xHandleEl.clientHeight) : 0;
+  reactData.scrollbarHeight = Math.max(scrollbarOpts.height || 0, xHandleEl.offsetHeight - xHandleEl.clientHeight);
   internalData.headerHeight = headerHeight;
   internalData.footerHeight = footerHeight;
   reactData.overflowX = overflowX;
@@ -6130,20 +6265,22 @@ function autoCellWidth($xeTable) {
     $xeTable.checkScrolling();
   }
 }
-// const updateCellOffset = ($xeTable: VxeTableConstructor) => {
-//   const internalData = $xeTable as unknown as TableInternalData
-//   const { chTimeout, chRunTime } = internalData
-//   if (chTimeout) {
-//     clearTimeout(chTimeout)
-//   }
-//   if (!chRunTime || chRunTime + 10 < Date.now()) {
-//     internalData.chRunTime = Date.now()
-//   }
-//   internalData.chTimeout = setTimeout(() => {
-//     internalData.chRunTime = undefined
-//     internalData.chTimeout = undefined
-//   }, 80)
-// }
+const calcCellAutoHeight = (rowRest, wrapperEl) => {
+  const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
+  let topBottomPadding = 0;
+  const firstCellEl = cellElemList[0];
+  if (firstCellEl && firstCellEl.parentElement) {
+    const cellStyle = getComputedStyle(firstCellEl.parentElement);
+    topBottomPadding = Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingTop) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingBottom));
+  }
+  let colHeight = rowRest.height - topBottomPadding;
+  for (let i = 0; i < cellElemList.length; i++) {
+    const cellElem = cellElemList[i];
+    const cellHeight = cellElem ? cellElem.clientHeight : 0;
+    colHeight = Math.max(colHeight, Math.ceil(cellHeight));
+  }
+  return colHeight + topBottomPadding;
+};
 const calcCellHeight = $xeTable => {
   const props = $xeTable;
   const reactData = $xeTable;
@@ -6153,45 +6290,25 @@ const calcCellHeight = $xeTable => {
   } = props;
   const {
     tableData,
+    scrollYLoad,
     scrollXLoad
   } = reactData;
   const {
     fullAllDataRowIdData
   } = internalData;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const el = $xeTable.$refs.refElem;
-  if (!showOverflow && el) {
-    let paddingTop = 0;
-    let paddingBottom = 0;
-    let calcPadding = false;
+  if (!showOverflow && scrollYLoad && el) {
     tableData.forEach(row => {
       const rowid = getRowid($xeTable, row);
       const rowRest = fullAllDataRowIdData[rowid];
-      const cellList = el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]>.vxe-body--column>.vxe-cell`);
-      if (rowRest && cellList.length) {
-        let height = 0;
-        for (let i = 0; i < cellList.length; i++) {
-          const cellElem = cellList[i];
-          const tdEl = cellElem.parentElement;
-          if (!tdEl || !tdEl.clientWidth) {
-            break;
-          }
-          if (!calcPadding) {
-            paddingTop = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(tdEl).paddingTop);
-            paddingBottom = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(tdEl).paddingBottom);
-            calcPadding = true;
-          }
-          let cellHeight = paddingTop + paddingBottom;
-          if (cellElem) {
-            cellHeight += cellElem.clientHeight;
-          }
-          height = Math.max(height, cellHeight);
-        }
-        rowRest.height = scrollXLoad ? Math.max(rowRest.height, height) : height;
+      if (rowRest) {
+        const height = calcCellAutoHeight(rowRest, el);
+        rowRest.height = Math.max(defaultRowHeight, scrollXLoad ? Math.max(rowRest.height, height) : height);
       }
     });
-    reactData.isCalcCellHeight++;
+    reactData.calcCellHeightFlag++;
   }
-  // updateCellOffset()
 };
 function getOrderField(_vm, column) {
   const {
@@ -6218,6 +6335,18 @@ function getOrderField(_vm, column) {
     return cellValue;
   };
 }
+function handleTargetEnterEvent($xeTable, isClear) {
+  const internalData = $xeTable;
+  const $tooltip = $xeTable.$refs.refTooltip;
+  clearTimeout(internalData.tooltipTimeout);
+  if (isClear) {
+    $xeTable.closeTooltip();
+  } else {
+    if ($tooltip && $tooltip.setActived) {
+      $tooltip.setActived(true);
+    }
+  }
+}
 function clearDragStatus($xeTable) {
   const reactData = $xeTable;
   const {
@@ -6328,29 +6457,35 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
     return;
   }
   const {
+    overflowX,
     scrollbarWidth,
+    overflowY,
     scrollbarHeight
   } = reactData;
   const {
     prevDragToChild
   } = internalData;
   const wrapperRect = el.getBoundingClientRect();
+  const osbWidth = overflowY ? scrollbarWidth : 0;
+  const osbHeight = overflowX ? scrollbarHeight : 0;
   const tableWidth = el.clientWidth;
   const tableHeight = el.clientHeight;
   if (trEl) {
     const rdLineEl = $xeTable.$refs.refDragRowLineElem;
     if (rdLineEl) {
       if (showLine) {
+        const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
         const trRect = trEl.getBoundingClientRect();
         let trHeight = trEl.clientHeight;
         const offsetTop = Math.max(1, trRect.y - wrapperRect.y);
-        if (offsetTop + trHeight > tableHeight - scrollbarHeight) {
-          trHeight = tableHeight - offsetTop - scrollbarHeight;
+        if (offsetTop + trHeight > tableHeight - osbHeight) {
+          trHeight = tableHeight - offsetTop - osbHeight;
         }
         rdLineEl.style.display = 'block';
+        rdLineEl.style.left = `${scrollbarYToLeft ? osbWidth : 0}px`;
         rdLineEl.style.top = `${offsetTop}px`;
         rdLineEl.style.height = `${trHeight}px`;
-        rdLineEl.style.width = `${tableWidth - scrollbarWidth}px`;
+        rdLineEl.style.width = `${tableWidth - osbWidth}px`;
         rdLineEl.setAttribute('drag-pos', dragPos);
         rdLineEl.setAttribute('drag-to-child', prevDragToChild ? 'y' : 'n');
       } else {
@@ -6361,6 +6496,7 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
     const cdLineEl = $xeTable.$refs.refDragColLineElem;
     if (cdLineEl) {
       if (showLine) {
+        const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
         const leftContainerElem = $xeTable.$refs.refLeftContainer;
         const leftContainerWidth = leftContainerElem ? leftContainerElem.clientWidth : 0;
         const rightContainerElem = $xeTable.$refs.refRightContainer;
@@ -6374,7 +6510,7 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
           thWidth -= startX - offsetLeft;
           offsetLeft = startX;
         }
-        const endX = tableWidth - rightContainerWidth - (rightContainerWidth ? 0 : scrollbarWidth);
+        const endX = tableWidth - rightContainerWidth - (rightContainerWidth ? 0 : osbWidth);
         if (offsetLeft + thWidth > endX) {
           thWidth = endX - offsetLeft;
         }
@@ -6385,7 +6521,7 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
         if (prevDragToChild) {
           cdLineEl.style.height = `${thRect.height}px`;
         } else {
-          cdLineEl.style.height = `${tableHeight - offsetTop - scrollbarHeight}px`;
+          cdLineEl.style.height = `${tableHeight - offsetTop - (scrollbarXToTop ? 0 : osbHeight)}px`;
         }
         cdLineEl.setAttribute('drag-pos', dragPos);
         cdLineEl.setAttribute('drag-to-child', prevDragToChild ? 'y' : 'n');
@@ -6416,6 +6552,49 @@ function hideDropTip($xeTable) {
     cdLineEl.style.display = '';
   }
 }
+/**
+ * 处理显示 tooltip
+ * @param {Event} evnt 事件
+ * @param {Row} row 行对象
+ */
+function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
+  const reactData = $xeTable;
+  if (!overflowElem) {
+    return $xeTable.$nextTick();
+  }
+  params.cell = tdEl;
+  const {
+    tooltipStore
+  } = reactData;
+  const tooltipOpts = $xeTable.computeTooltipOpts;
+  const {
+    column,
+    row
+  } = params;
+  const {
+    showAll,
+    contentMethod
+  } = tooltipOpts;
+  const customContent = contentMethod ? contentMethod(params) : null;
+  const useCustom = contentMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent);
+  const content = useCustom ? customContent : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toString(column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
+  const isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
+  if (content && (showAll || useCustom || isCellOverflow)) {
+    Object.assign(tooltipStore, {
+      row,
+      column,
+      visible: true,
+      currOpts: {}
+    });
+    $xeTable.$nextTick(() => {
+      const $tooltip = $xeTable.$refs.refTooltip;
+      if ($tooltip && $tooltip.open) {
+        $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, formatText(content));
+      }
+    });
+  }
+  return $xeTable.$nextTick();
+}
 function handleScrollToRowColumn($xeTable, fieldOrColumn, row) {
   const internalData = $xeTable;
   const {
@@ -6440,16 +6619,16 @@ function computeScrollLoad($xeTable) {
       scrollXStore,
       scrollYStore
     } = internalData;
-    const sYOpts = $xeTable.computeSYOpts;
-    const sXOpts = $xeTable.computeSXOpts;
+    const virtualYOpts = $xeTable.computeVirtualYOpts;
+    const virtualXOpts = $xeTable.computeVirtualXOpts;
     // 计算 X 逻辑
     if (scrollXLoad) {
       const {
         toVisibleIndex: toXVisibleIndex,
         visibleSize: visibleXSize
       } = handleVirtualXVisible($xeTable);
-      const offsetXSize = Math.max(0, sXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sXOpts.oSize) : 0);
-      scrollXStore.preloadSize = 4;
+      const offsetXSize = Math.max(0, virtualXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(virtualXOpts.oSize) : 0);
+      scrollXStore.preloadSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(virtualXOpts.preSize);
       scrollXStore.offsetSize = offsetXSize;
       scrollXStore.visibleSize = visibleXSize;
       scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
@@ -6461,7 +6640,6 @@ function computeScrollLoad($xeTable) {
     } else {
       $xeTable.updateScrollXSpace();
     }
-    calcCellHeight($xeTable);
     // 计算 Y 逻辑
     const rowHeight = computeRowHeight($xeTable);
     scrollYStore.rowHeight = rowHeight;
@@ -6471,8 +6649,8 @@ function computeScrollLoad($xeTable) {
       visibleSize: visibleYSize
     } = handleVirtualYVisible($xeTable);
     if (scrollYLoad) {
-      const offsetYSize = Math.max(0, sYOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sYOpts.oSize) : 0);
-      scrollYStore.preloadSize = 2;
+      const offsetYSize = Math.max(0, virtualYOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(virtualYOpts.oSize) : 0);
+      scrollYStore.preloadSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(virtualYOpts.preSize);
       scrollYStore.offsetSize = offsetYSize;
       scrollYStore.visibleSize = visibleYSize;
       scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
@@ -6498,12 +6676,14 @@ function handleRecalculateLayout($xeTable, reFull) {
   }
   calcCellWidth($xeTable);
   autoCellWidth($xeTable);
+  updateStyle($xeTable);
   return computeScrollLoad($xeTable).then(() => {
     if (reFull === true) {
       // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
       calcCellHeight($xeTable);
       calcCellWidth($xeTable);
       autoCellWidth($xeTable);
+      updateStyle($xeTable);
       return computeScrollLoad($xeTable);
     }
   });
@@ -6782,7 +6962,7 @@ function handleColumn($xeTable, collectColumn) {
 /**
  * 纵向 Y 可视渲染处理
  */
-function loadScrollYData($xeTable) {
+function loadScrollYData($xeTable, scrollTop) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -6805,7 +6985,7 @@ function loadScrollYData($xeTable) {
   const {
     toVisibleIndex,
     visibleSize
-  } = handleVirtualYVisible($xeTable);
+  } = handleVirtualYVisible($xeTable, scrollTop);
   const offsetItem = {
     startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize - preloadSize),
     endIndex: toVisibleIndex + visibleSize + autoOffsetYSize + preloadSize
@@ -6825,6 +7005,54 @@ function loadScrollYData($xeTable) {
     }
   }
 }
+function lazyScrollXData($xeTable) {
+  const internalData = $xeTable;
+  const {
+    lxTimeout,
+    lxRunTime,
+    scrollXStore
+  } = internalData;
+  const {
+    visibleSize
+  } = scrollXStore;
+  const fpsTime = Math.max(5, Math.min(10, Math.floor(visibleSize / 3)));
+  if (lxTimeout) {
+    clearTimeout(lxTimeout);
+  }
+  if (!lxRunTime || lxRunTime + fpsTime < Date.now()) {
+    internalData.lxRunTime = Date.now();
+    loadScrollXData($xeTable);
+  }
+  internalData.lxTimeout = setTimeout(() => {
+    internalData.lxTimeout = undefined;
+    internalData.lxRunTime = undefined;
+    loadScrollXData($xeTable);
+  }, fpsTime);
+}
+function lazyScrollYData($xeTable) {
+  const internalData = $xeTable;
+  const {
+    lyTimeout,
+    lyRunTime,
+    scrollYStore
+  } = internalData;
+  const {
+    visibleSize
+  } = scrollYStore;
+  const fpsTime = Math.floor(Math.max(4, Math.min(10, visibleSize / 3)));
+  if (lyTimeout) {
+    clearTimeout(lyTimeout);
+  }
+  if (!lyRunTime || lyRunTime + fpsTime < Date.now()) {
+    internalData.lyRunTime = Date.now();
+    loadScrollYData($xeTable);
+  }
+  internalData.lyTimeout = setTimeout(() => {
+    internalData.lyTimeout = undefined;
+    internalData.lyRunTime = undefined;
+    loadScrollYData($xeTable);
+  }, fpsTime);
+}
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -6841,27 +7069,63 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   internalData.lcsTimeout = setTimeout(() => {
     internalData.lcsRunTime = Date.now();
     internalData.lcsTimeout = undefined;
+    internalData.intoRunScroll = false;
     internalData.inVirtualScroll = false;
     internalData.inWheelScroll = false;
     internalData.inHeaderScroll = false;
     internalData.inBodyScroll = false;
     internalData.inFooterScroll = false;
     internalData.scrollRenderType = '';
+    calcCellHeight($xeTable);
     if (isRollX && scrollXLoad) {
-      $xeTable.updateScrollXData().then(() => {
-        calcCellHeight($xeTable);
-        loadScrollXData($xeTable);
-      });
+      $xeTable.updateScrollXData();
     }
     if (isRollY && scrollYLoad) {
       $xeTable.updateScrollYData().then(() => {
         calcCellHeight($xeTable);
-        loadScrollYData($xeTable);
+        $xeTable.updateScrollYSpace();
       });
     }
     $xeTable.updateCellAreas();
   }, 200);
 }
+const getWheelSpeed = lastScrollTime => {
+  let multiple = 1;
+  const currTime = Date.now();
+  if (lastScrollTime + 25 > currTime) {
+    multiple = 1.18;
+  } else if (lastScrollTime + 30 > currTime) {
+    multiple = 1.15;
+  } else if (lastScrollTime + 40 > currTime) {
+    multiple = 1.12;
+  } else if (lastScrollTime + 55 > currTime) {
+    multiple = 1.09;
+  } else if (lastScrollTime + 75 > currTime) {
+    multiple = 1.06;
+  } else if (lastScrollTime + 100 > currTime) {
+    multiple = 1.03;
+  }
+  return multiple;
+};
+const wheelScrollTo = (diffNum, cb) => {
+  const duration = Math.abs(diffNum);
+  const startTime = performance.now();
+  let countTop = 0;
+  const step = timestamp => {
+    let progress = (timestamp - startTime) / duration;
+    if (progress > 1) {
+      progress = 1;
+    }
+    const easedProgress = Math.pow(progress, 2);
+    const offsetTop = Math.floor(diffNum * easedProgress) - countTop;
+    countTop += offsetTop;
+    cb(offsetTop);
+    if (progress < 1) {
+      requestAnimationFrame(step);
+    }
+  };
+  requestAnimationFrame(step);
+};
 function updateHeight($xeTable) {
   const internalData = $xeTable;
   internalData.customHeight = calcTableHeight($xeTable, 'height');
@@ -6869,59 +7133,62 @@ function updateHeight($xeTable) {
   internalData.customMaxHeight = calcTableHeight($xeTable, 'maxHeight');
 }
 function calcColumnAutoWidth(column, wrapperEl) {
-  const cellElList = wrapperEl.querySelectorAll(`.vxe-header--column.${column.id}>.vxe-cell,.vxe-body--column.${column.id}>.vxe-cell,.vxe-footer--column.${column.id}>.vxe-cell`);
-  const firstCellEl = cellElList[0];
-  let paddingSize = 0;
-  if (firstCellEl) {
-    const cellStyle = getComputedStyle(firstCellEl);
-    paddingSize = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight)) + 2;
-  }
-  let colWidth = column.renderAutoWidth - paddingSize;
-  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(cellElList, itemEl => {
-    const cellEl = itemEl;
-    const thElem = cellEl.parentElement;
-    let titleWidth = 0;
-    if (`${thElem.tagName}`.toLowerCase() === 'th') {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(cellEl.children, btnEl => {
-        titleWidth += btnEl.offsetWidth + 1;
-      });
-    } else {
-      const labelEl = cellEl.firstElementChild;
-      if (labelEl) {
-        titleWidth = labelEl.offsetWidth;
-      }
-    }
-    if (titleWidth) {
-      colWidth = Math.max(colWidth, Math.ceil(titleWidth) + 4);
-    }
-  });
-  return colWidth + paddingSize;
+  const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[colid="${column.id}"]`);
+  let leftRightPadding = 0;
+  const firstCellEl = cellElemList[0];
+  if (firstCellEl && firstCellEl.parentElement) {
+    const cellStyle = getComputedStyle(firstCellEl.parentElement);
+    leftRightPadding = Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight));
+  }
+  let colWidth = column.renderAutoWidth - leftRightPadding;
+  for (let i = 0; i < cellElemList.length; i++) {
+    const celEl = cellElemList[i];
+    colWidth = Math.max(colWidth, celEl ? Math.ceil(celEl.scrollWidth) + 4 : 0);
+  }
+  return colWidth + leftRightPadding;
 }
 function calcCellWidth($xeTable) {
-  const reactData = $xeTable;
   const internalData = $xeTable;
   const autoWidthColumnList = $xeTable.computeAutoWidthColumnList;
-  reactData.isCalcColumn = true;
-  return $xeTable.$nextTick().then(() => {
-    const {
-      fullColumnIdData
-    } = internalData;
-    const el = $xeTable.$refs.refElem;
-    if (el) {
-      autoWidthColumnList.forEach(column => {
-        const colid = column.id;
-        const colRest = fullColumnIdData[colid];
-        const colWidth = calcColumnAutoWidth(column, el);
-        if (colRest) {
-          colRest.width = Math.max(colWidth, colRest.width);
-        }
-        column.renderAutoWidth = colWidth;
-      });
-      $xeTable.analyColumnWidth();
-    }
-    reactData.isCalcColumn = false;
-  });
+  const {
+    fullColumnIdData
+  } = internalData;
+  const el = $xeTable.$refs.refElem;
+  if (el) {
+    el.setAttribute('data-calc-col', 'Y');
+    autoWidthColumnList.forEach(column => {
+      const colid = column.id;
+      const colRest = fullColumnIdData[colid];
+      const colWidth = calcColumnAutoWidth(column, el);
+      if (colRest) {
+        colRest.width = Math.max(colWidth, colRest.width);
+      }
+      column.renderAutoWidth = colWidth;
+    });
+    $xeTable.analyColumnWidth();
+    el.removeAttribute('data-calc-col');
+  }
 }
+const handleUpdateColResize = ($xeTable, evnt, params) => {
+  $xeTable.analyColumnWidth();
+  $xeTable.recalculate(true).then(() => {
+    $xeTable.saveCustomStore('update:width');
+    $xeTable.updateCellAreas();
+    $xeTable.dispatchEvent('column-resizable-change', params, evnt);
+    // 已废弃 resizable-change
+    $xeTable.dispatchEvent('resizable-change', params, evnt);
+    setTimeout(() => $xeTable.recalculate(true), 300);
+  });
+};
+const handleUpdateRowResize = ($xeTable, evnt, params) => {
+  const reactData = $xeTable;
+  reactData.resizeHeightFlag++;
+  $xeTable.recalculate(true).then(() => {
+    $xeTable.updateCellAreas();
+    $xeTable.dispatchEvent('row-resizable-change', params, evnt);
+    setTimeout(() => $xeTable.recalculate(true), 300);
+  });
+};
 const Methods = {
   callSlot(slotFunc, params, h, vNodes) {
     if (slotFunc) {
@@ -6986,7 +7253,7 @@ const Methods = {
     warnLog('vxe.error.delFunc', ['syncData', 'getData']);
     return this.$nextTick().then(() => {
       this.tableData = [];
-      return this.$nextTick().then(() => this.loadTableData(this.tableFullData));
+      return this.$nextTick().then(() => this.loadTableData(this.tableFullData, true));
     });
   },
   /**
@@ -7048,8 +7315,9 @@ const Methods = {
    * 加载表格数据
    * @param {Array} datas 数据
    */
-  loadTableData(datas) {
+  loadTableData(datas, isReset) {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
       keepSource,
       showOverflow,
@@ -7117,9 +7385,12 @@ const Methods = {
     this.tableFullData = fullData;
     this.tableFullTreeData = treeData;
     // 缓存数据
-    this.cacheRowMap(true);
+    this.cacheRowMap(isReset, true);
     // 原始数据
     this.tableSynchData = datas;
+    if (isReset) {
+      internalData.isResizeCellHeight = false;
+    }
     // 克隆原数据，用于显示编辑状态，与编辑值做对比
     if (keepSource) {
       this.cacheSourceMap(fullData);
@@ -7176,6 +7447,7 @@ const Methods = {
           if (sYOpts.scrollToTopOnChange) {
             targetScrollTop = 0;
           }
+          calcCellHeight($xeTable);
           // 是否变更虚拟滚动
           if (oldScrollYLoad === sYLoad) {
             restoreScrollLocation(this, targetScrollLeft, targetScrollTop).then(() => {
@@ -7200,7 +7472,7 @@ const Methods = {
     const {
       initStatus
     } = this;
-    return this.loadTableData(datas).then(() => {
+    return this.loadTableData(datas, false).then(() => {
       this.inited = true;
       this.initStatus = true;
       if (!initStatus) {
@@ -7217,7 +7489,7 @@ const Methods = {
     return this.clearAll().then(() => {
       this.inited = true;
       this.initStatus = true;
-      return this.loadTableData(datas);
+      return this.loadTableData(datas, true);
     }).then(() => {
       this.handleLoadDefaults();
       return this.recalculate();
@@ -7300,9 +7572,8 @@ const Methods = {
   },
   /**
    * 更新数据行的 Map
-   * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
-  cacheRowMap(isSource) {
+  cacheRowMap(isReset, isSource) {
     const {
       treeConfig,
       treeOpts,
@@ -7328,7 +7599,7 @@ const Methods = {
         row[childrenField] = null;
       }
       let cacheItem = fullAllDataRowIdData[rowid];
-      if (!cacheItem) {
+      if (isReset || !cacheItem) {
         cacheItem = {
           row,
           rowid,
@@ -7336,10 +7607,12 @@ const Methods = {
           index: -1,
           _index: -1,
           $index: -1,
+          treeIndex: index,
           items,
           parent: parentRow,
           level,
           height: 0,
+          resizeHeight: 0,
           oTop: 0
         };
       }
@@ -7440,10 +7713,12 @@ const Methods = {
           index,
           _index: -1,
           $index: -1,
+          treeIndex: -1,
           items,
           parent: parentRow,
           level: parentLevel + nodes.length,
           height: 0,
+          resizeHeight: 0,
           oTop: 0
         };
         fullDataRowIdData[rowid] = rest;
@@ -7455,7 +7730,7 @@ const Methods = {
       if (transform) {
         row[mapChildrenField] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(rows, false);
       }
-      this.updateAfterDataIndex();
+      updateAfterDataIndex($xeTable);
       return rows;
     });
   },
@@ -7836,20 +8111,38 @@ const Methods = {
     return this.$nextTick();
   },
   getCellElement(row, fieldOrColumn) {
-    const column = handleFieldOrColumn(this, fieldOrColumn);
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      elemStore
+    } = internalData;
+    const column = handleFieldOrColumn($xeTable, fieldOrColumn);
     if (!column) {
       return null;
     }
-    const {
-      $refs
-    } = this;
-    const rowid = getRowid(this, row);
-    let bodyElem = null;
+    const rowid = getRowid($xeTable, row);
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
+    const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
+    let bodyElem;
     if (column) {
-      bodyElem = $refs[`${column.fixed || 'table'}Body`] || $refs.refTableBody;
-    }
-    if (bodyElem && bodyElem.$el) {
-      return bodyElem.$el.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);
+      if (column.fixed) {
+        if (column.fixed === 'left') {
+          if (leftScrollElem) {
+            bodyElem = leftScrollElem;
+          }
+        } else {
+          if (rightScrollElem) {
+            bodyElem = rightScrollElem;
+          }
+        }
+      }
+      if (!bodyElem) {
+        bodyElem = bodyScrollElem;
+      }
+      if (bodyElem) {
+        return bodyElem.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);
+      }
     }
     return null;
   },
@@ -8088,6 +8381,7 @@ const Methods = {
    * 如果存在筛选条件，继续处理
    */
   updateAfterFullData() {
+    const $xeTable = this;
     const {
       tableFullColumn,
       tableFullData,
@@ -8292,7 +8586,7 @@ const Methods = {
     }
     this.afterFullData = tableData;
     this.afterTreeFullData = tableTree;
-    this.updateAfterDataIndex();
+    updateAfterDataIndex($xeTable);
   },
   /**
    * 预编译
@@ -8300,78 +8594,7 @@ const Methods = {
    */
   updateAfterDataIndex() {
     const $xeTable = this;
-    const props = $xeTable;
-    const internalData = $xeTable;
-    const {
-      treeConfig
-    } = props;
-    const {
-      afterFullData,
-      fullDataRowIdData,
-      fullAllDataRowIdData,
-      afterTreeFullData
-    } = internalData;
-    const treeOpts = $xeTable.computeTreeOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
-    const fullMaps = {};
-    if (treeConfig) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, (row, index, items, path) => {
-        const rowid = getRowid($xeTable, row);
-        const rowRest = fullAllDataRowIdData[rowid];
-        const seq = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
-        if (rowRest) {
-          rowRest.seq = seq;
-          rowRest._index = index;
-        } else {
-          const rest = {
-            row,
-            rowid,
-            seq,
-            index: -1,
-            $index: -1,
-            _index: index,
-            items: [],
-            parent: null,
-            level: 0,
-            height: 0,
-            oTop: 0
-          };
-          fullAllDataRowIdData[rowid] = rest;
-          fullDataRowIdData[rowid] = rest;
-        }
-        fullMaps[rowid] = row;
-      }, {
-        children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField
-      });
-    } else {
-      afterFullData.forEach((row, index) => {
-        const rowid = getRowid($xeTable, row);
-        const rowRest = fullAllDataRowIdData[rowid];
-        const seq = index + 1;
-        if (rowRest) {
-          rowRest.seq = seq;
-          rowRest._index = index;
-        } else {
-          const rest = {
-            row,
-            rowid,
-            seq,
-            index: -1,
-            $index: -1,
-            _index: index,
-            items: [],
-            parent: null,
-            level: 0,
-            height: 0,
-            oTop: 0
-          };
-          fullAllDataRowIdData[rowid] = rest;
-          fullDataRowIdData[rowid] = rest;
-        }
-        fullMaps[rowid] = row;
-      });
-    }
-    this.afterFullRowMaps = fullMaps;
+    updateAfterDataIndex($xeTable);
   },
   /**
    * 只对 tree-config 有效，获取行的子级
@@ -8446,7 +8669,11 @@ const Methods = {
    * @param {String/Number} rowid 行主键
    */
   getRowById(cellValue) {
-    const fullDataRowIdData = this.fullDataRowIdData;
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullDataRowIdData
+    } = internalData;
     const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cellValue) ? '' : encodeURIComponent(cellValue);
     return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
   },
@@ -8454,14 +8681,9 @@ const Methods = {
    * 根据行获取行的唯一主键
    * @param {Row} row 行对象
    */
-  getRowid(cellValue) {
+  getRowid(row) {
     const $xeTable = this;
-    const internalData = $xeTable;
-    const {
-      fullDataRowIdData
-    } = internalData;
-    const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cellValue) ? '' : encodeURIComponent(cellValue || '');
-    return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
+    return getRowid($xeTable, row);
   },
   /**
    * 获取处理后的表格数据
@@ -8665,29 +8887,41 @@ const Methods = {
   },
   setColumnWidth(fieldOrColumn, width) {
     const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      elemStore
+    } = internalData;
     let status = false;
     const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
-    cols.forEach(item => {
-      const column = handleFieldOrColumn($xeTable, item);
-      if (column) {
-        const colWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(width);
-        let rdWidth = colWidth;
-        if (isScale(width)) {
-          const refTableBody = $xeTable.$refs.refTableBody;
-          const bodyElem = refTableBody ? refTableBody.$el : null;
-          const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0;
-          rdWidth = Math.floor(colWidth * bodyWidth);
-        }
-        column.resizeWidth = rdWidth;
-        if (!status) {
-          status = true;
+    let cWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(width);
+    if (isScale(width)) {
+      const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+      const bodyWidth = bodyScrollElem ? bodyScrollElem.clientWidth - 1 : 0;
+      cWidth = Math.floor(cWidth * bodyWidth);
+    }
+    if (cWidth) {
+      cols.forEach(item => {
+        const column = handleFieldOrColumn($xeTable, item);
+        if (column) {
+          column.resizeWidth = cWidth;
+          if (!status) {
+            status = true;
+          }
         }
+      });
+      if (status) {
+        return $xeTable.refreshColumn().then(() => {
+          return {
+            status
+          };
+        });
       }
-    });
-    if (status) {
-      return $xeTable.refreshColumn();
     }
-    return $xeTable.$nextTick();
+    return $xeTable.$nextTick().then(() => {
+      return {
+        status
+      };
+    });
   },
   getColumnWidth(fieldOrColumn) {
     const column = handleFieldOrColumn(this, fieldOrColumn);
@@ -9014,7 +9248,159 @@ const Methods = {
       remainList
     });
   },
-  handleResizeDblclickEvent(evnt, params) {
+  handleColResizeMousedownEvent(evnt, fixedType, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    evnt.stopPropagation();
+    evnt.preventDefault();
+    const {
+      column
+    } = params;
+    const {
+      overflowX,
+      scrollbarHeight
+    } = reactData;
+    const {
+      elemStore,
+      visibleColumn
+    } = internalData;
+    const resizableOpts = $xeTable.computeResizableOpts;
+    const osbHeight = overflowX ? scrollbarHeight : 0;
+    const tableEl = $xeTable.$refs.refElem;
+    const leftContainerElem = $xeTable.$refs.refLeftContainer;
+    const rightContainerElem = $xeTable.$refs.refRightContainer;
+    const resizeBarElem = $xeTable.$refs.refColResizeBar;
+    if (!resizeBarElem) {
+      return;
+    }
+    const resizeTipElem = resizeBarElem.firstElementChild;
+    const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
+    const {
+      clientX: dragClientX
+    } = evnt;
+    const wrapperElem = $xeTable.$refs.refElem;
+    const dragBtnElem = evnt.target;
+    let resizeColumn = column;
+    if (column.children && column.children.length) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(column.children, childColumn => {
+        resizeColumn = childColumn;
+      });
+    }
+    const cell = dragBtnElem.parentNode;
+    const cellParams = Object.assign(params, {
+      cell
+    });
+    let dragLeft = 0;
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    if (!bodyScrollElem) {
+      return;
+    }
+    const pos = getOffsetPos(dragBtnElem, wrapperElem);
+    const dragBtnWidth = dragBtnElem.clientWidth;
+    const dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
+    const minInterval = getColReMinWidth(cellParams) - dragBtnOffsetWidth; // 列之间的最小间距
+    let dragMinLeft = pos.left - cell.clientWidth + dragBtnWidth + minInterval;
+    let dragPosLeft = pos.left + dragBtnOffsetWidth;
+    const isLeftFixed = fixedType === 'left';
+    const isRightFixed = fixedType === 'right';
+    // 计算左右侧固定列偏移量
+    let fixedOffsetWidth = 0;
+    if (isLeftFixed || isRightFixed) {
+      const siblingProp = isLeftFixed ? 'nextElementSibling' : 'previousElementSibling';
+      let tempCellElem = cell[siblingProp];
+      while (tempCellElem) {
+        if (hasClass(tempCellElem, 'fixed--hidden')) {
+          break;
+        } else if (!hasClass(tempCellElem, 'col--group')) {
+          fixedOffsetWidth += tempCellElem.offsetWidth;
+        }
+        tempCellElem = tempCellElem[siblingProp];
+      }
+      if (isRightFixed && rightContainerElem) {
+        dragPosLeft = rightContainerElem.offsetLeft + fixedOffsetWidth;
+      }
+    }
+    // 处理拖动事件
+    const updateEvent = evnt => {
+      evnt.stopPropagation();
+      evnt.preventDefault();
+      const tableHeight = tableEl.clientHeight;
+      const offsetX = evnt.clientX - dragClientX;
+      let left = dragPosLeft + offsetX;
+      const scrollLeft = fixedType ? 0 : bodyScrollElem.scrollLeft;
+      if (isLeftFixed) {
+        // 左固定列（不允许超过右侧固定列、不允许超过右边距）
+        left = Math.min(left, (rightContainerElem ? rightContainerElem.offsetLeft : bodyScrollElem.clientWidth) - fixedOffsetWidth - minInterval);
+      } else if (isRightFixed) {
+        // 右侧固定列（不允许超过左侧固定列、不允许超过左边距）
+        dragMinLeft = (leftContainerElem ? leftContainerElem.clientWidth : 0) + fixedOffsetWidth + minInterval;
+        left = Math.min(left, dragPosLeft + cell.clientWidth - minInterval);
+      } else {
+        dragMinLeft = Math.max(bodyScrollElem.scrollLeft, dragMinLeft);
+        // left = Math.min(left, bodyScrollElem.clientWidth + bodyScrollElem.scrollLeft - 40)
+      }
+      dragLeft = Math.max(left, dragMinLeft);
+      const resizeBarLeft = Math.max(1, dragLeft - scrollLeft);
+      resizeBarElem.style.left = `${resizeBarLeft}px`;
+      resizeBarElem.style.top = `${scrollbarXToTop ? osbHeight : 0}px`;
+      resizeBarElem.style.height = `${scrollbarXToTop ? tableHeight - osbHeight : tableHeight}px`;
+      if (resizableOpts.showDragTip && resizeTipElem) {
+        resizeTipElem.textContent = methods_getI18n('vxe.table.resizeColTip', [resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)]);
+        const tableWidth = tableEl.clientWidth;
+        const wrapperRect = wrapperElem.getBoundingClientRect();
+        const resizeBarWidth = resizeBarElem.clientWidth;
+        const resizeTipWidth = resizeTipElem.clientWidth;
+        const resizeTipHeight = resizeTipElem.clientHeight;
+        let resizeTipLeft = -resizeTipWidth;
+        if (resizeBarLeft < resizeTipWidth + resizeBarWidth) {
+          resizeTipLeft = 0;
+        } else if (resizeBarLeft > tableWidth) {
+          resizeTipLeft += tableWidth - resizeBarLeft;
+        }
+        resizeTipElem.style.left = `${resizeTipLeft}px`;
+        resizeTipElem.style.top = `${Math.min(tableHeight - resizeTipHeight, Math.max(0, evnt.clientY - wrapperRect.y - resizeTipHeight / 2))}px`;
+      }
+    };
+    reactData.isDragResize = true;
+    addClass(tableEl, 'col-drag--resize');
+    resizeBarElem.style.display = 'block';
+    document.onmousemove = updateEvent;
+    document.onmouseup = function (evnt) {
+      document.onmousemove = null;
+      document.onmouseup = null;
+      resizeBarElem.style.display = 'none';
+      reactData.isDragResize = false;
+      internalData._lastResizeTime = Date.now();
+      const resizeWidth = resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+      const resizeParams = {
+        ...params,
+        resizeWidth,
+        resizeColumn
+      };
+      if (resizableOpts.dragMode === 'fixed') {
+        visibleColumn.forEach(item => {
+          if (item.id !== resizeColumn.id) {
+            if (!item.resizeWidth) {
+              item.resizeWidth = item.renderWidth;
+            }
+          }
+        });
+      }
+      if ($xeTable.handleColResizeCellAreaEvent) {
+        $xeTable.handleColResizeCellAreaEvent(evnt, resizeParams);
+      } else {
+        resizeColumn.resizeWidth = resizeWidth;
+        handleUpdateColResize($xeTable, evnt, resizeParams);
+      }
+      removeClass(tableEl, 'col-drag--resize');
+    };
+    updateEvent(evnt);
+    if ($xeTable.closeMenu) {
+      $xeTable.closeMenu();
+    }
+  },
+  handleColResizeDblclickEvent(evnt, params) {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -9030,32 +9416,300 @@ const Methods = {
       const {
         column
       } = params;
-      const colid = column.id;
+      let resizeColumn = column;
+      if (column.children && column.children.length) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(column.children, childColumn => {
+          resizeColumn = childColumn;
+        });
+      }
+      const colid = resizeColumn.id;
       const colRest = fullColumnIdData[colid];
       const dragBtnElem = evnt.target;
       const cell = dragBtnElem.parentNode;
       const cellParams = Object.assign(params, {
         cell
       });
-      const colMinWidth = getColReMinWidth(cellParams);
-      let resizeWidth = calcColumnAutoWidth(column, el);
-      if (colRest) {
-        resizeWidth = Math.max(resizeWidth, colRest.width);
+      const colMinWidth = getColReMinWidth(cellParams);
+      el.setAttribute('data-calc-col', 'Y');
+      let resizeWidth = calcColumnAutoWidth(resizeColumn, el);
+      el.removeAttribute('data-calc-col');
+      if (colRest) {
+        resizeWidth = Math.max(resizeWidth, colRest.width);
+      }
+      resizeWidth = Math.max(colMinWidth, resizeWidth);
+      const resizeParams = {
+        ...params,
+        resizeWidth,
+        resizeColumn
+      };
+      reactData.isDragResize = false;
+      internalData._lastResizeTime = Date.now();
+      if ($xeTable.handleColResizeDblclickCellAreaEvent) {
+        $xeTable.handleColResizeDblclickCellAreaEvent(evnt, resizeParams);
+      } else {
+        resizeColumn.resizeWidth = resizeWidth;
+        handleUpdateColResize($xeTable, evnt, resizeParams);
+      }
+    }
+  },
+  handleRowResizeMousedownEvent(evnt, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    evnt.stopPropagation();
+    evnt.preventDefault();
+    const {
+      row
+    } = params;
+    const {
+      overflowX,
+      scrollbarWidth,
+      overflowY,
+      scrollbarHeight
+    } = reactData;
+    const {
+      elemStore,
+      fullAllDataRowIdData
+    } = internalData;
+    const osbWidth = overflowY ? scrollbarWidth : 0;
+    const osbHeight = overflowX ? scrollbarHeight : 0;
+    const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
+    const resizableOpts = $xeTable.computeResizableOpts;
+    const rowOpts = $xeTable.computeRowOpts;
+    const cellOpts = $xeTable.computeCellOpts;
+    const tableEl = $xeTable.$refs.refElem;
+    const resizeBarElem = $xeTable.$refs.refRowResizeBar;
+    if (!resizeBarElem) {
+      return;
+    }
+    const {
+      clientY: dragClientY
+    } = evnt;
+    const resizeTipElem = resizeBarElem.firstElementChild;
+    const dragBtnElem = evnt.currentTarget;
+    const tdEl = dragBtnElem.parentNode;
+    const trEl = tdEl.parentNode;
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    if (!bodyScrollElem) {
+      return;
+    }
+    const rowid = getRowid($xeTable, row);
+    const rowRest = fullAllDataRowIdData[rowid];
+    if (!rowRest) {
+      return;
+    }
+    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+    const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+    const tableRect = tableEl.getBoundingClientRect();
+    const trRect = trEl.getBoundingClientRect();
+    const targetOffsetY = dragClientY - trRect.y - trEl.clientHeight;
+    let resizeHeight = currCellHeight;
+    const cellEl = tdEl.querySelector('.vxe-cell');
+    let cellMinHeight = 0;
+    if (cellEl) {
+      const cellStyle = getComputedStyle(cellEl);
+      cellMinHeight = Math.max(1, Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingTop) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingBottom)));
+    }
+    const minTop = trRect.y - tableRect.y + cellMinHeight;
+    // 处理拖动事件
+    const updateEvent = evnt => {
+      evnt.stopPropagation();
+      evnt.preventDefault();
+      const tableWidth = tableEl.clientWidth - osbWidth;
+      const tableHeight = tableEl.clientHeight - osbHeight;
+      let dragTop = evnt.clientY - tableRect.y - targetOffsetY;
+      if (dragTop < minTop) {
+        dragTop = minTop;
+      } else {
+        resizeHeight = Math.max(cellMinHeight, currCellHeight + evnt.clientY - dragClientY);
+      }
+      resizeBarElem.style.left = `${scrollbarYToLeft ? osbWidth : 0}px`;
+      resizeBarElem.style.top = `${dragTop}px`;
+      resizeBarElem.style.width = `${tableWidth}px`;
+      if (resizableOpts.showDragTip && resizeTipElem) {
+        resizeTipElem.textContent = methods_getI18n('vxe.table.resizeRowTip', [resizeHeight]);
+        const resizeTipWidth = resizeTipElem.clientWidth;
+        const resizeTipHeight = resizeTipElem.clientHeight;
+        let resizeBarLeft = Math.max(2, evnt.clientX - tableRect.x);
+        let resizeBarTop = 0;
+        if (resizeBarLeft + resizeTipWidth >= tableWidth - 2) {
+          resizeBarLeft = tableWidth - resizeTipWidth - 2;
+        }
+        if (dragTop + resizeTipHeight >= tableHeight) {
+          resizeBarTop = tableHeight - (dragTop + resizeTipHeight);
+        }
+        resizeTipElem.style.left = `${resizeBarLeft}px`;
+        resizeTipElem.style.top = `${resizeBarTop}px`;
+      }
+    };
+    reactData.isDragResize = true;
+    addClass(tableEl, 'row-drag--resize');
+    resizeBarElem.style.display = 'block';
+    document.onmousemove = updateEvent;
+    document.onmouseup = function (evnt) {
+      document.onmousemove = null;
+      document.onmouseup = null;
+      resizeBarElem.style.display = 'none';
+      reactData.isDragResize = false;
+      internalData._lastResizeTime = Date.now();
+      if (resizeHeight !== currCellHeight) {
+        const resizeParams = {
+          ...params,
+          resizeHeight,
+          resizeRow: row
+        };
+        internalData.isResizeCellHeight = true;
+        if ($xeTable.handleRowResizeCellAreaEvent) {
+          $xeTable.handleRowResizeCellAreaEvent(evnt, resizeParams);
+        } else {
+          rowRest.resizeHeight = resizeHeight;
+          handleUpdateRowResize($xeTable, evnt, resizeParams);
+        }
+      }
+      removeClass(tableEl, 'row-drag--resize');
+    };
+    updateEvent(evnt);
+  },
+  handleRowResizeDblclickEvent(evnt, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const resizableOpts = $xeTable.computeResizableOpts;
+    const {
+      isDblclickAutoHeight
+    } = resizableOpts;
+    const el = $xeTable.$refs.refElem;
+    if (isDblclickAutoHeight && el) {
+      const {
+        fullAllDataRowIdData
+      } = internalData;
+      const {
+        row
+      } = params;
+      const rowid = getRowid($xeTable, row);
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (!rowRest) {
+        return;
+      }
+      const resizeHeight = calcCellAutoHeight(rowRest, el);
+      const resizeParams = {
+        ...params,
+        resizeHeight,
+        resizeRow: row
+      };
+      reactData.isDragResize = false;
+      internalData._lastResizeTime = Date.now();
+      if ($xeTable.handleRowResizeDblclickCellAreaEvent) {
+        $xeTable.handleRowResizeDblclickCellAreaEvent(evnt, resizeParams);
+      } else {
+        rowRest.resizeHeight = resizeHeight;
+        handleUpdateRowResize($xeTable, evnt, resizeParams);
+      }
+    }
+  },
+  setRowHeightConf(heightConf) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    let status = false;
+    if (heightConf) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(heightConf, (height, rowid) => {
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          const rHeight = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(height);
+          if (rHeight) {
+            rowRest.resizeHeight = rHeight;
+            if (!status) {
+              status = true;
+            }
+          }
+        }
+      });
+      if (status) {
+        internalData.isResizeCellHeight = true;
+        reactData.resizeHeightFlag++;
+      }
+    }
+    return $xeTable.$nextTick().then(() => {
+      return {
+        status
+      };
+    });
+  },
+  getRowHeightConf(isFull) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData,
+      afterFullData
+    } = internalData;
+    const rowOpts = $xeTable.computeRowOpts;
+    const cellOpts = $xeTable.computeCellOpts;
+    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+    const rest = {};
+    afterFullData.forEach(row => {
+      const rowid = getRowid($xeTable, row);
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (rowRest) {
+        const resizeHeight = rowRest.resizeHeight;
+        if (resizeHeight || isFull) {
+          const currCellHeight = resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+          rest[rowid] = currCellHeight;
+        }
+      }
+    });
+    return rest;
+  },
+  setRowHeight(rowOrId, height) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    let status = false;
+    const rows = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rowOrId) ? rowOrId : [rowOrId];
+    let rHeight = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(height);
+    if (isScale(height)) {
+      const tableBody = $xeTable.$refs.refTableBody;
+      const bodyElem = tableBody ? tableBody.$el : null;
+      const bodyHeight = bodyElem ? bodyElem.clientHeight - 1 : 0;
+      rHeight = Math.floor(rHeight * bodyHeight);
+    }
+    if (rHeight) {
+      rows.forEach(row => {
+        const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(row) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row) ? row : getRowid($xeTable, row);
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          rowRest.resizeHeight = rHeight;
+          if (!status) {
+            status = true;
+          }
+        }
+      });
+      if (status) {
+        internalData.isResizeCellHeight = true;
+        reactData.resizeHeightFlag++;
       }
-      column.resizeWidth = Math.max(colMinWidth, resizeWidth);
-      reactData._isResize = false;
-      internalData._lastResizeTime = Date.now();
-      $xeTable.analyColumnWidth();
-      $xeTable.recalculate(true).then(() => {
-        $xeTable.saveCustomStore('update:visible');
-        $xeTable.updateCellAreas();
-        $xeTable.dispatchEvent('resizable-change', {
-          ...params,
-          resizeWidth
-        }, evnt);
-        setTimeout(() => $xeTable.recalculate(true), 300);
-      });
     }
+    return $xeTable.$nextTick();
+  },
+  getRowHeight(rowOrId) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    const rowOpts = $xeTable.computeRowOpts;
+    const cellOpts = $xeTable.computeCellOpts;
+    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+    const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowOrId) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
+    const rowRest = fullAllDataRowIdData[rowid];
+    const currCellHeight = rowRest ? rowRest.resizeHeight : cellOpts.height || rowOpts.height || defaultRowHeight;
+    return currCellHeight;
   },
   /**
    * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
@@ -9491,10 +10145,10 @@ const Methods = {
           }
         } else if (isContextMenu) {
           // 如果按下上下文键
-          this._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
+          internalData._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
           clearTimeout(internalData.keyCtxTimeout);
           internalData.keyCtxTimeout = setTimeout(() => {
-            this._keyCtx = false;
+            internalData._keyCtx = false;
           }, 1000);
         } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
           const {
@@ -9775,17 +10429,6 @@ const Methods = {
     this.updateCellAreas();
     this.recalculate(true);
   },
-  handleTargetEnterEvent(isClear) {
-    const $tooltip = this.$refs.tooltip;
-    clearTimeout(this.tooltipTimeout);
-    if (isClear) {
-      this.closeTooltip();
-    } else {
-      if ($tooltip) {
-        $tooltip.setActived(true);
-      }
-    }
-  },
   handleTargetLeaveEvent() {
     const tooltipOpts = this.tooltipOpts;
     let $tooltip = this.$refs.tooltip;
@@ -9804,24 +10447,25 @@ const Methods = {
     }
   },
   triggerHeaderTitleEvent(evnt, iconParams, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const tipContent = iconParams.content || iconParams.message;
     if (tipContent) {
       const {
-        $refs,
         tooltipStore
-      } = this;
+      } = reactData;
       const {
         column
       } = params;
       const content = getFuncText(tipContent);
-      this.handleTargetEnterEvent(true);
+      handleTargetEnterEvent($xeTable, true);
       tooltipStore.row = null;
       tooltipStore.column = column;
       tooltipStore.visible = true;
       tooltipStore.currOpts = iconParams;
-      this.$nextTick(() => {
-        const $tooltip = $refs.tooltip;
-        if ($tooltip) {
+      $xeTable.$nextTick(() => {
+        const $tooltip = $xeTable.$refs.refTooltip;
+        if ($tooltip && $tooltip.open) {
           $tooltip.open(evnt.currentTarget, content);
         }
       });
@@ -9831,28 +10475,48 @@ const Methods = {
    * 触发表头 tooltip 事件
    */
   triggerHeaderTooltipEvent(evnt, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       tooltipStore
-    } = this;
+    } = reactData;
     const {
       column
     } = params;
+    handleTargetEnterEvent($xeTable, true);
     const titleElem = evnt.currentTarget;
-    this.handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row);
+    if (!titleElem) {
+      return;
+    }
+    const cellEl = titleElem.parentElement;
+    if (!cellEl) {
+      return;
+    }
+    const thEl = cellEl.parentElement;
+    if (!thEl) {
+      return;
+    }
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      this.handleTooltip(evnt, titleElem, titleElem, null, params);
+      handleTooltip($xeTable, evnt, thEl, cellEl, null, params);
     }
   },
   /**
    * 触发单元格 tooltip 事件
    */
   triggerBodyTooltipEvent(evnt, params) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const {
+      editConfig
+    } = props;
+    const {
+      editStore
+    } = reactData;
     const {
-      editConfig,
-      editOpts,
-      editStore,
       tooltipStore
-    } = this;
+    } = reactData;
+    const editOpts = $xeTable.computeEditOpts;
     const {
       actived
     } = editStore;
@@ -9860,8 +10524,8 @@ const Methods = {
       row,
       column
     } = params;
-    const cell = evnt.currentTarget;
-    this.handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row !== row);
+    const tdEl = evnt.currentTarget;
+    handleTargetEnterEvent($xeTable, tooltipStore.column !== column || tooltipStore.row !== row);
     // 单元格处于编辑状态时不触发提示框
     if (column.editRender && isEnableConf(editConfig)) {
       // 如果是行编辑模式
@@ -9874,80 +10538,26 @@ const Methods = {
       }
     }
     if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-      let overflowElem;
-      let tipElem;
-      if (column.treeNode) {
-        overflowElem = cell.querySelector('.vxe-tree-cell');
-        if (column.type === 'html') {
-          tipElem = cell.querySelector('.vxe-cell--html');
-        }
-      } else {
-        tipElem = cell.querySelector(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label');
-      }
-      this.handleTooltip(evnt, cell, overflowElem || cell.children[0], tipElem, params);
+      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), null, params);
     }
   },
   /**
    * 触发表尾 tooltip 事件
    */
   triggerFooterTooltipEvent(evnt, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       column
     } = params;
     const {
       tooltipStore
-    } = this;
+    } = reactData;
     const cell = evnt.currentTarget;
-    this.handleTargetEnterEvent(true);
+    handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      this.handleTooltip(evnt, cell, cell.querySelector('.vxe-cell--item') || cell.children[0], null, params);
-    }
-  },
-  /**
-   * 处理显示 tooltip
-   * @param {Event} evnt 事件
-   * @param {ColumnInfo} column 列配置
-   * @param {Row} row 行对象
-   */
-  handleTooltip(evnt, cell, overflowElem, tipElem, params) {
-    const $xeTable = this;
-    if (!overflowElem) {
-      return $xeTable.$nextTick();
-    }
-    params.cell = cell;
-    const {
-      $refs,
-      tooltipOpts,
-      tooltipStore
-    } = this;
-    const {
-      column,
-      row
-    } = params;
-    const {
-      showAll,
-      enabled,
-      contentMethod
-    } = tooltipOpts;
-    const customContent = contentMethod ? contentMethod(params) : null;
-    const useCustom = contentMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent);
-    const content = useCustom ? customContent : (column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
-    const isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
-    if (content && (showAll || enabled || useCustom || isCellOverflow)) {
-      Object.assign(tooltipStore, {
-        row,
-        column,
-        visible: true,
-        currOpts: {}
-      });
-      this.$nextTick(() => {
-        const $tooltip = $refs.tooltip;
-        if ($tooltip) {
-          $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, formatText(content));
-        }
-      });
+      handleTooltip($xeTable, evnt, cell, cell.querySelector('.vxe-cell--wrapper') || cell.children[0], null, params);
     }
-    return this.$nextTick();
   },
   openTooltip(target, content) {
     const {
@@ -10681,7 +11291,7 @@ const Methods = {
       }
       vLen++;
     });
-    const isSelected = rootList.length > 0 && sLen >= vLen;
+    const isSelected = vLen > 0 ? sLen >= vLen : sLen >= rootList.length;
     const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
     reactData.isAllSelected = isSelected;
     reactData.isIndeterminate = halfSelect;
@@ -11753,10 +12363,10 @@ const Methods = {
           }
           reactData.isDragRowMove = true;
           $xeTable.handleTableData(treeConfig && transform);
-          $xeTable.cacheRowMap();
+          $xeTable.cacheRowMap(false);
           updateScrollYStatus($xeTable);
           if (!(treeConfig && transform)) {
-            $xeTable.updateAfterDataIndex();
+            updateAfterDataIndex($xeTable);
           }
           $xeTable.checkSelectionStatus();
           if (reactData.scrollYLoad) {
@@ -11806,18 +12416,16 @@ const Methods = {
       prevDragRow,
       prevDragPos
     } = internalData;
-    if (treeConfig && prevDragToChild) {
+    if (treeConfig && lazy && prevDragToChild) {
       // 懒加载
-      if (lazy) {
-        const newRowid = getRowid($xeTable, prevDragRow);
-        const rowRest = fullAllDataRowIdData[newRowid];
-        if (prevDragRow[hasChildField]) {
-          if (rowRest && rowRest.treeLoaded) {
-            $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
-          }
-        } else {
+      const newRowid = getRowid($xeTable, prevDragRow);
+      const rowRest = fullAllDataRowIdData[newRowid];
+      if (prevDragRow[hasChildField]) {
+        if (rowRest && rowRest.treeLoaded) {
           $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
         }
+      } else {
+        $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
       }
     } else {
       $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
@@ -13123,7 +13731,7 @@ const Methods = {
               return this.$nextTick().then(() => {
                 if (transform) {
                   this.handleTableData();
-                  this.updateAfterDataIndex();
+                  updateAfterDataIndex($xeTable);
                   return this.$nextTick();
                 }
               });
@@ -13267,7 +13875,7 @@ const Methods = {
     return this.handleBaseTreeExpand(rows, expanded).then(() => {
       handleVirtualTreeToList($xeTable);
       this.handleTableData();
-      this.updateAfterDataIndex();
+      updateAfterDataIndex($xeTable);
     }).then(() => {
       return this.recalculate();
     }).then(() => {
@@ -13369,17 +13977,22 @@ const Methods = {
    * 获取表格的滚动状态
    */
   getScroll() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      $refs,
       scrollXLoad,
       scrollYLoad
-    } = this;
-    const bodyElem = $refs.refTableBody.$el;
+    } = reactData;
+    const {
+      elemStore
+    } = internalData;
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
     return {
       virtualX: scrollXLoad,
       virtualY: scrollYLoad,
-      scrollTop: bodyElem.scrollTop,
-      scrollLeft: bodyElem.scrollLeft
+      scrollTop: bodyScrollElem ? bodyScrollElem.scrollTop : 0,
+      scrollLeft: bodyScrollElem ? bodyScrollElem.scrollLeft : 0
     };
   },
   handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
@@ -13488,60 +14101,6 @@ const Methods = {
     }
     $xeTable.dispatchEvent('scroll', evntParams, evnt);
   },
-  lazyScrollXData() {
-    const $xeTable = this;
-    const internalData = $xeTable;
-    const {
-      lxTimeout,
-      lxRunTime,
-      scrollXStore
-    } = internalData;
-    const {
-      visibleSize
-    } = scrollXStore;
-    const fpsTime = Math.max(5, Math.min(80, Math.floor(visibleSize * 3)));
-    if (lxTimeout) {
-      clearTimeout(lxTimeout);
-    }
-    if (!lxRunTime || lxRunTime + fpsTime < Date.now()) {
-      internalData.lxRunTime = Date.now();
-      loadScrollXData($xeTable);
-    }
-    internalData.lxTimeout = setTimeout(() => {
-      internalData.lxTimeout = undefined;
-      internalData.lxRunTime = undefined;
-      loadScrollXData($xeTable);
-    }, fpsTime);
-  },
-  lazyScrollYData() {
-    const $xeTable = this;
-    const props = $xeTable;
-    const internalData = $xeTable;
-    const {
-      showOverflow
-    } = props;
-    const {
-      lyTimeout,
-      lyRunTime,
-      scrollYStore
-    } = internalData;
-    const {
-      visibleSize
-    } = scrollYStore;
-    const fpsTime = showOverflow ? 5 : Math.max(5, Math.min(80, Math.floor(visibleSize / 2)));
-    if (lyTimeout) {
-      clearTimeout(lyTimeout);
-    }
-    if (!lyRunTime || lyRunTime + fpsTime < Date.now()) {
-      internalData.lyRunTime = Date.now();
-      loadScrollYData($xeTable);
-    }
-    internalData.lyTimeout = setTimeout(() => {
-      internalData.lyTimeout = undefined;
-      internalData.lyRunTime = undefined;
-      loadScrollYData($xeTable);
-    }, fpsTime);
-  },
   /**
    * 横向 X 可视渲染事件处理
    */
@@ -13551,7 +14110,7 @@ const Methods = {
     if (sXOpts.immediate) {
       loadScrollXData($xeTable);
     } else {
-      $xeTable.lazyScrollXData();
+      lazyScrollXData($xeTable);
     }
   },
   /**
@@ -13563,7 +14122,7 @@ const Methods = {
     if (sYOpts.immediate) {
       loadScrollYData($xeTable);
     } else {
-      $xeTable.lazyScrollYData();
+      lazyScrollYData($xeTable);
     }
   },
   triggerBodyScrollEvent(evnt, fixedType) {
@@ -13571,6 +14130,7 @@ const Methods = {
     const internalData = $xeTable;
     const {
       elemStore,
+      intoRunScroll,
       lastScrollTop,
       lastScrollLeft,
       inWheelScroll,
@@ -13590,6 +14150,9 @@ const Methods = {
     if (inWheelScroll || inVirtualScroll || inHeaderScroll || inFooterScroll) {
       return;
     }
+    if (intoRunScroll) {
+      return;
+    }
     if (!bodyScrollElem) {
       return;
     }
@@ -13648,6 +14211,7 @@ const Methods = {
     const internalData = $xeTable;
     const {
       elemStore,
+      intoRunScroll,
       inWheelScroll,
       inVirtualScroll,
       inBodyScroll,
@@ -13658,16 +14222,10 @@ const Methods = {
     const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
     const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
     const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
-    if (inWheelScroll) {
-      return;
-    }
-    if (inVirtualScroll) {
+    if (inWheelScroll || inVirtualScroll || inBodyScroll || inFooterScroll) {
       return;
     }
-    if (inBodyScroll) {
-      return;
-    }
-    if (inFooterScroll) {
+    if (intoRunScroll) {
       return;
     }
     if (!headerScrollElem) {
@@ -13698,6 +14256,7 @@ const Methods = {
     const internalData = $xeTable;
     const {
       elemStore,
+      intoRunScroll,
       inWheelScroll,
       inVirtualScroll,
       inHeaderScroll,
@@ -13708,16 +14267,10 @@ const Methods = {
     const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
     const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
     const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
-    if (inWheelScroll) {
+    if (inWheelScroll || inVirtualScroll || inHeaderScroll || inBodyScroll) {
       return;
     }
-    if (inVirtualScroll) {
-      return;
-    }
-    if (inHeaderScroll) {
-      return;
-    }
-    if (inBodyScroll) {
+    if (intoRunScroll) {
       return;
     }
     if (!footerScrollElem) {
@@ -13775,26 +14328,13 @@ const Methods = {
     if (!bodyScrollElem) {
       return;
     }
-    let multiple = 1;
-    if (reactData.lastScrollTime + 25 > Date.now()) {
-      multiple = 1.18;
-    } else if (reactData.lastScrollTime + 30 > Date.now()) {
-      multiple = 1.15;
-    } else if (reactData.lastScrollTime + 40 > Date.now()) {
-      multiple = 1.12;
-    } else if (reactData.lastScrollTime + 55 > Date.now()) {
-      multiple = 1.09;
-    } else if (reactData.lastScrollTime + 75 > Date.now()) {
-      multiple = 1.06;
-    } else if (reactData.lastScrollTime + 100 > Date.now()) {
-      multiple = 1.03;
-    }
-    const deltaTop = deltaY * multiple;
-    const deltaLeft = deltaX * multiple;
+    const wheelSpeed = getWheelSpeed(reactData.lastScrollTime);
+    const deltaTop = deltaY * wheelSpeed;
+    const deltaLeft = deltaX * wheelSpeed;
     const isTopWheel = deltaTop < 0;
-    const currScrollTop = yHandleEl.scrollTop;
+    const currScrollTop = bodyScrollElem.scrollTop;
     // 如果滚动位置已经是顶部或底部，则不需要触发
-    if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= yHandleEl.scrollHeight - yHandleEl.clientHeight) {
+    if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= bodyScrollElem.scrollHeight - bodyScrollElem.clientHeight) {
       return;
     }
     const scrollTop = bodyScrollElem.scrollTop + deltaTop;
@@ -13807,19 +14347,32 @@ const Methods = {
       if (rowOpts.isHover || highlightHoverRow) {
         $xeTable.clearHoverRow();
       }
-      internalData.inWheelScroll = true;
-      setScrollTop(yHandleEl, scrollTop);
-      setScrollTop(bodyScrollElem, scrollTop);
-      setScrollTop(leftScrollElem, scrollTop);
-      setScrollTop(rightScrollElem, scrollTop);
-      $xeTable.triggerScrollYEvent(evnt);
-      $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
-        type: 'footer',
-        fixed: ''
+      wheelScrollTo(scrollTop - bodyScrollElem.scrollTop, offsetTop => {
+        const currTopNum = bodyScrollElem.scrollTop + offsetTop;
+        internalData.inWheelScroll = true;
+        setScrollTop(yHandleEl, currTopNum);
+        setScrollTop(bodyScrollElem, currTopNum);
+        setScrollTop(leftScrollElem, currTopNum);
+        setScrollTop(rightScrollElem, currTopNum);
+        $xeTable.triggerScrollYEvent(evnt);
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, scrollLeft, {
+          type: 'table',
+          fixed: ''
+        });
       });
-    }
-  },
-  scrollXEvent(evnt) {
+      // internalData.inWheelScroll = true
+      // setScrollTop(yHandleEl, scrollTop)
+      // setScrollTop(bodyScrollElem, scrollTop)
+      // setScrollTop(leftScrollElem, scrollTop)
+      // setScrollTop(rightScrollElem, scrollTop)
+      // loadScrollYData($xeTable, scrollTop)
+      // $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
+      //   type: 'footer',
+      //   fixed: ''
+      // })
+    }
+  },
+  triggerVirtualScrollXEvent(evnt) {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
@@ -13861,7 +14414,7 @@ const Methods = {
       fixed: ''
     });
   },
-  scrollYEvent(evnt) {
+  triggerVirtualScrollYEvent(evnt) {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
@@ -13910,9 +14463,7 @@ const Methods = {
       showOverflow
     } = props;
     handleTableColumn($xeTable);
-    // calcCellHeight()
     return $xeTable.$nextTick().then(() => {
-      // calcCellHeight()
       handleTableColumn($xeTable);
       $xeTable.updateScrollXSpace();
       if (!showOverflow) {
@@ -13979,9 +14530,7 @@ const Methods = {
   updateScrollYData() {
     const $xeTable = this;
     $xeTable.handleTableData();
-    // calcCellHeight()
     return $xeTable.$nextTick().then(() => {
-      // calcCellHeight()
       $xeTable.handleTableData();
       $xeTable.updateScrollYSpace();
     });
@@ -13996,42 +14545,42 @@ const Methods = {
       showOverflow
     } = props;
     const {
-      scrollYLoad,
-      rowHeight
+      scrollYLoad
     } = reactData;
     const {
       scrollYStore,
       elemStore,
+      isResizeCellHeight,
       afterFullData,
       fullAllDataRowIdData
     } = internalData;
     const {
       startIndex
     } = scrollYStore;
+    const rowOpts = $xeTable.computeRowOpts;
+    const cellOpts = $xeTable.computeCellOpts;
+    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const bodyTableElem = getRefElem(elemStore['main-body-table']);
     const containerList = ['main', 'left', 'right'];
     let topSpaceHeight = 0;
     let ySpaceHeight = 0;
     if (scrollYLoad) {
-      if (showOverflow) {
-        ySpaceHeight = afterFullData.length * rowHeight;
-        topSpaceHeight = Math.max(0, startIndex * rowHeight);
+      const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
+      if (!isCustomCellHeight && showOverflow) {
+        ySpaceHeight = afterFullData.length * defaultRowHeight;
+        topSpaceHeight = Math.max(0, startIndex * defaultRowHeight);
       } else {
         for (let i = 0; i < afterFullData.length; i++) {
           const row = afterFullData[i];
           const rowid = getRowid($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid];
-          if (rowRest) {
-            ySpaceHeight += rowRest.height || rowHeight;
-          }
+          ySpaceHeight += rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
         }
         for (let i = 0; i < startIndex; i++) {
           const row = afterFullData[i];
           const rowid = getRowid($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid];
-          if (rowRest) {
-            topSpaceHeight += rowRest.height || rowHeight;
-          }
+          topSpaceHeight += rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
         }
       }
     } else {
@@ -14056,7 +14605,7 @@ const Methods = {
     if (scrollYSpaceEl) {
       scrollYSpaceEl.style.height = ySpaceHeight ? `${ySpaceHeight}px` : '';
     }
-    $xeTable.$nextTick(() => {
+    return $xeTable.$nextTick().then(() => {
       updateStyle($xeTable);
     });
   },
@@ -14520,11 +15069,11 @@ const isVMScrollProcess = $xeTable => {
   } = tableProps;
   const {
     lastScrollTime,
-    _isResize
+    isDragResize
   } = tableReactData;
-  return !!(_isResize || lastScrollTime && Date.now() < lastScrollTime + delayHover);
+  return !!(isDragResize || lastScrollTime && Date.now() < lastScrollTime + delayHover);
 };
-function renderLine(h, _vm, params) {
+function renderLine(h, _vm, params, cellHeight) {
   const $xeTable = _vm.$parent;
   const tableProps = $xeTable;
   const tableInternalData = $xeTable;
@@ -14555,16 +15104,18 @@ function renderLine(h, _vm, params) {
   let prevRow = null;
   if (rest) {
     rLevel = rest.level;
-    prevRow = rest.items[rest._index - 1];
+    prevRow = rest.items[rest.treeIndex - 1];
   }
   const isFirstRow = $xeTable.eqRow(afterFullData[0], row);
   if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [h('div', {
+      key: 'tl',
       class: 'vxe-tree--line-wrapper'
     }, [h('div', {
       class: 'vxe-tree--line',
       style: {
         height: `${isFirstRow ? 1 : calcTreeLine(params, prevRow)}px`,
+        bottom: `-${Math.floor(cellHeight / 2)}px`,
         left: `${rLevel * treeOpts.indent + (rLevel ? 2 - getOffsetSize($xeTable) : 0) + 16}px`
       }
     })])];
@@ -14593,7 +15144,8 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     mouseConfig,
     editConfig,
     editRules,
-    tooltipConfig
+    tooltipConfig,
+    padding: allPadding
   } = tableProps;
   const {
     tableData,
@@ -14601,7 +15153,8 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     currentColumn,
     scrollXLoad,
     scrollYLoad,
-    isCalcCellHeight,
+    calcCellHeightFlag,
+    resizeHeightFlag,
     mergeList,
     editStore,
     isAllOverflow,
@@ -14620,6 +15173,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const rowOpts = $xeTable.computeRowOpts;
   const rowDragOpts = $xeTable.computeRowDragOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+  const currCellHeight = cellOpts.height || rowOpts.height || defaultRowHeight;
   const {
     disabledMethod: dragDisabledMethod,
     isCrossDrag,
@@ -14639,6 +15193,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     showOverflow,
     className,
     treeNode,
+    rowResize,
     slots
   } = column;
   const {
@@ -14647,9 +15202,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const {
     actived
   } = editStore;
-  const {
-    height: customRHeight
-  } = rowOpts;
+  const rowRest = fullAllDataRowIdData[rowid];
   const colid = column.id;
   const renderOpts = editRender || cellRender;
   const compConf = renderOpts ? body_renderer.get(renderOpts.name) : null;
@@ -14659,23 +15212,24 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const columnIndex = $xeTable.getColumnIndex(column);
   const _columnIndex = $xeTable.getVTColumnIndex(column);
   const isEdit = isEnableConf(editRender);
+  const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
   let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
+  const isPadding = allPadding === null ? cellOpts.padding : allPadding;
   const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? allColumnOverflow : showOverflow;
   const showEllipsis = cellOverflow === 'ellipsis';
   const showTitle = cellOverflow === 'title';
   const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
   // 如果表格加上 showOverflow 则不再支持列单独设置
-  const hasEllipsis = allColumnOverflow || showTitle || showTooltip || showEllipsis;
+  const hasEllipsis = allColumnOverflow || showTitle || showTooltip || showEllipsis || resizeHeight > 0;
   let isDirty;
   const tdOns = {};
-  const rest = fullAllDataRowIdData[rowid];
   const cellAlign = align || (compConf ? compConf.tableCellAlign : '') || allAlign;
   const errorValidItem = validErrorMaps[`${rowid}:${colid}`];
   const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? height || tableData.length > 1 : validOpts.message === 'inline');
-  const attrs = {
+  const tdAttrs = {
     colid
   };
-  const params = {
+  const cellParams = {
     $table: $xeTable,
     $grid: $xeTable.xegrid,
     isEdit: false,
@@ -14703,7 +15257,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     isRowDragCell = rowDragOpts.trigger === 'row' || column.dragSort && rowDragOpts.trigger === 'cell';
   }
   if (isRowDragCell) {
-    isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
+    isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(cellParams));
   }
   // hover 进入事件
   if (showTitle || showTooltip || showAllTip || tooltipConfig) {
@@ -14715,11 +15269,11 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
         updateCellTitle(evnt.currentTarget, column);
       } else if (showTooltip || showAllTip) {
         // 如果配置了显示 tooltip
-        $xeTable.triggerBodyTooltipEvent(evnt, params);
+        $xeTable.triggerBodyTooltipEvent(evnt, cellParams);
       }
       $xeTable.dispatchEvent('cell-mouseenter', Object.assign({
         cell: evnt.currentTarget
-      }, params), evnt);
+      }, cellParams), evnt);
     };
   }
   // hover 退出事件
@@ -14733,13 +15287,13 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
       }
       $xeTable.dispatchEvent('cell-mouseleave', Object.assign({
         cell: evnt.currentTarget
-      }, params), evnt);
+      }, cellParams), evnt);
     };
   }
   // 按下事件处理
   if (isRowDragCell || checkboxOpts.range || mouseConfig) {
     tdOns.mousedown = evnt => {
-      $xeTable.triggerCellMousedownEvent(evnt, params);
+      $xeTable.triggerCellMousedownEvent(evnt, cellParams);
     };
   }
   // 拖拽列事件
@@ -14748,11 +15302,11 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   }
   // 点击事件处理
   tdOns.click = evnt => {
-    $xeTable.triggerCellClickEvent(evnt, params);
+    $xeTable.triggerCellClickEvent(evnt, cellParams);
   };
   // 双击事件处理
   tdOns.dblclick = evnt => {
-    $xeTable.triggerCellDblclickEvent(evnt, params);
+    $xeTable.triggerCellDblclickEvent(evnt, cellParams);
   };
   // 合并行或列
   if (mergeList.length) {
@@ -14766,10 +15320,10 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
         return null;
       }
       if (rowspan > 1) {
-        attrs.rowspan = rowspan;
+        tdAttrs.rowspan = rowspan;
       }
       if (colspan > 1) {
-        attrs.colspan = colspan;
+        tdAttrs.colspan = colspan;
       }
     }
   } else if (spanMethod) {
@@ -14777,20 +15331,20 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     const {
       rowspan = 1,
       colspan = 1
-    } = spanMethod(params) || {};
+    } = spanMethod(cellParams) || {};
     if (!rowspan || !colspan) {
       return null;
     }
     if (rowspan > 1) {
-      attrs.rowspan = rowspan;
+      tdAttrs.rowspan = rowspan;
     }
     if (colspan > 1) {
-      attrs.colspan = colspan;
+      tdAttrs.colspan = colspan;
     }
   }
   // 如果被合并不可隐藏
   if (fixedHiddenColumn && mergeList) {
-    if (attrs.colspan > 1 || attrs.rowspan > 1) {
+    if (tdAttrs.colspan > 1 || tdAttrs.rowspan > 1) {
       fixedHiddenColumn = false;
     }
   }
@@ -14798,42 +15352,73 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
     isDirty = $xeTable.isUpdateByRow(row, column.field);
   }
+  const isVNAutoHeight = scrollYLoad && !hasEllipsis;
+  let cellHeight = currCellHeight;
+  const vnHeight = calcCellHeightFlag ? rowRest.height : 0;
+  if (resizeHeight) {
+    cellHeight = resizeHeight;
+  } else {
+    if (scrollYLoad) {
+      if (!hasEllipsis) {
+        cellHeight = vnHeight || currCellHeight;
+      }
+    }
+  }
+  const isLastColumn = $columnIndex === columns.length - 1;
+  const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
+  let isVNPreEmptyStatus = false;
+  if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+    isVNPreEmptyStatus = true;
+  } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+    isVNPreEmptyStatus = true;
+  }
+  const tcStyle = {};
+  if (hasEllipsis) {
+    tcStyle.height = `${cellHeight}px`;
+  } else {
+    tcStyle.minHeight = `${cellHeight}px`;
+  }
   const tdVNs = [];
   if (fixedHiddenColumn && (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
     tdVNs.push(h('div', {
+      key: 'tc',
       class: ['vxe-cell', {
         'c--title': showTitle,
         'c--tooltip': showTooltip,
         'c--ellipsis': showEllipsis
       }],
-      style: {
-        maxHeight: hasEllipsis && (customRHeight || defaultRowHeight) ? `${customRHeight || defaultRowHeight}px` : ''
-      }
+      style: tcStyle
     }));
   } else {
     // 渲染单元格
-    tdVNs.push(...renderLine(h, _vm, params), h('div', {
+    tdVNs.push(...renderLine(h, _vm, cellParams, cellHeight), h('div', {
+      key: 'tc',
       class: ['vxe-cell', {
         'c--title': showTitle,
         'c--tooltip': showTooltip,
         'c--ellipsis': showEllipsis
       }],
-      style: {
-        maxHeight: hasEllipsis && (customRHeight || defaultRowHeight) ? `${customRHeight || defaultRowHeight}px` : ''
-      },
+      style: tcStyle,
       attrs: {
         title: showTitle ? $xeTable.getCellLabel(row, column) : null
       }
-    }, column.renderCell(h, params)));
+    }, isVNPreEmptyStatus ? [] : [h('div', {
+      attrs: {
+        colid,
+        rowid
+      },
+      class: 'vxe-cell--wrapper'
+    }, column.renderCell(h, cellParams))]));
     if (showValidTip && errorValidItem) {
       const errRule = errorValidItem.rule;
       const validSlot = slots ? slots.valid : null;
       const validParams = {
-        ...params,
+        ...cellParams,
         ...errorValidItem,
         rule: errorValidItem
       };
       tdVNs.push(h('div', {
+        key: 'tcv',
         class: ['vxe-cell--valid-error-tip', getClass(validOpts.className, errorValidItem)],
         style: errRule && errRule.maxWidth ? {
           width: `${errRule.maxWidth}px`
@@ -14845,56 +15430,49 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
       }, errorValidItem.content)]])]));
     }
   }
-  let cellHeight = '';
-  const vnHeight = isCalcCellHeight ? rest.height : 0;
-  if (hasEllipsis) {
-    if (customRHeight) {
-      cellHeight = `${customRHeight}px`;
-    } else if (!isAllOverflow) {
-      cellHeight = `${vnHeight || defaultRowHeight || 18}px`;
-    }
-  } else {
-    cellHeight = `${vnHeight || defaultRowHeight || 18}px`;
-  }
   if (mouseConfig && mouseOpts.area && selectCellToRow) {
     if (!$columnIndex && selectCellToRow === true || selectCellToRow === column.field) {
       tdVNs.push(h('div', {
+        key: 'tca',
         class: 'vxe-cell--area-status'
       }));
     }
   }
-  const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
-  let isPreLoadStatus = false;
-  if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex || _rowIndex > scrollYStore.visibleEndIndex)) {
-    isPreLoadStatus = true;
-  } else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex || _columnIndex > scrollXStore.visibleEndIndex)) {
-    isPreLoadStatus = true;
+  if (rowResize && rowOpts.resizable) {
+    tdVNs.push(h('div', {
+      key: 'tcr',
+      class: 'vxe-cell--row-resizable',
+      on: {
+        mousedown: evnt => $xeTable.handleRowResizeMousedownEvent(evnt, cellParams),
+        dblclick: evnt => $xeTable.handleRowResizeDblclickEvent(evnt, cellParams)
+      }
+    }));
   }
   return h('td', {
     class: ['vxe-body--column', column.id, {
       [`col--${cellAlign}`]: cellAlign,
       [`col--vertical-${verticalAlign}`]: verticalAlign,
       [`col--${type}`]: type,
-      'col--last': $columnIndex === columns.length - 1,
+      'col--last': isLastColumn,
       'col--tree-node': treeNode,
       'col--edit': isEdit,
       'col--ellipsis': hasEllipsis,
+      'col--auto-height': isVNAutoHeight,
       'fixed--width': !isAutoCellWidth,
       'fixed--hidden': fixedHiddenColumn,
+      'is--padding': isPadding,
       'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
       'is--drag-disabled': isDisabledDrag,
       'col--dirty': isDirty,
       'col--active': editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row'),
       'col--valid-error': !!errorValidItem,
       'col--current': currentColumn === column
-    }, getClass(compCellClassName, params), getClass(className, params), getClass(allCellClassName, params)],
+    }, getClass(compCellClassName, cellParams), getClass(className, cellParams), getClass(allCellClassName, cellParams)],
     key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? column.id : $columnIndex,
-    attrs,
-    style: Object.assign({
-      height: cellHeight
-    }, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cellStyle) ? cellStyle(params) : cellStyle),
+    attrs: tdAttrs,
+    style: Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(compCellStyle) ? compCellStyle(cellParams) : compCellStyle, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cellStyle) ? cellStyle(cellParams) : cellStyle),
     on: tdOns
-  }, isPreLoadStatus || isOptimizeMode && fixedHiddenColumn ? [] : tdVNs);
+  }, isOptimizeMode && fixedHiddenColumn ? [] : tdVNs);
 }
 function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
   const $xeTable = _vm.$parent;
@@ -15282,7 +15860,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         $xeTable.triggerBodyScrollEvent(evnt, fixedType);
       }
     };
-    if (scrollYLoad || leftFixedWidth || rightFixedWidth) {
+    if (leftFixedWidth || rightFixedWidth) {
       ons.wheel = $xeTable.triggerBodyWheelEvent;
     }
     return h('div', {
@@ -15375,9 +15953,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
 
 
 
-
 const {
-  getI18n: header_getI18n,
   renderer: header_renderer,
   renderEmptyElement: header_renderEmptyElement
 } = core_.VxeUI;
@@ -15414,6 +15990,10 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
   } = tableInternalData;
   const columnOpts = $xeTable.computeColumnOpts;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
+  const cellOpts = $xeTable.computeCellOpts;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+  const headerCellOpts = $xeTable.computeHeaderCellOpts;
+  const currCellHeight = headerCellOpts.height || cellOpts.height || defaultRowHeight;
   const {
     disabledMethod: dragDisabledMethod,
     isCrossDrag,
@@ -15436,6 +16016,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const compConf = renderOpts ? header_renderer.get(renderOpts.name) : null;
     const isColGroup = column.children && column.children.length;
     const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
+    const isPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
     const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showHeaderOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
     const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
     let showEllipsis = headOverflow === 'ellipsis';
@@ -15450,7 +16031,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     }
     const columnIndex = $xeTable.getColumnIndex(column);
     const _columnIndex = $xeTable.getVTColumnIndex(column);
-    const params = {
+    const cellParams = {
       $table: $xeTable,
       $grid: $xeGrid,
       $rowIndex,
@@ -15470,8 +16051,8 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
       rowspan: column.rowSpan > 1 ? column.rowSpan : null
     };
     const thOns = {
-      click: evnt => $xeTable.triggerHeaderCellClickEvent(evnt, params),
-      dblclick: evnt => $xeTable.triggerHeaderCellDblclickEvent(evnt, params)
+      click: evnt => $xeTable.triggerHeaderCellClickEvent(evnt, cellParams),
+      dblclick: evnt => $xeTable.triggerHeaderCellDblclickEvent(evnt, cellParams)
     };
     // 虚拟滚动不支持动态高度
     if (scrollXLoad && !hasEllipsis) {
@@ -15480,11 +16061,11 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const isColDragCell = columnOpts.drag && columnDragOpts.trigger === 'cell';
     let isDisabledDrag = false;
     if (isColDragCell) {
-      isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
+      isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(cellParams));
     }
     // 按下事件处理
     if (mouseConfig || isColDragCell) {
-      thOns.mousedown = evnt => $xeTable.triggerHeaderCellMousedownEvent(evnt, params);
+      thOns.mousedown = evnt => $xeTable.triggerHeaderCellMousedownEvent(evnt, cellParams);
     }
     // 拖拽列事件
     if (columnOpts.drag) {
@@ -15495,30 +16076,39 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
         thOns.mouseup = $xeTable.handleHeaderCellDragMouseupEvent;
       }
     }
+    const isLastColumn = $columnIndex === cols.length - 1;
+    const showResizable = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
-    let isPreLoadStatus = false;
-    if (scrollXLoad && !isGroup && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex || _columnIndex > scrollXStore.visibleEndIndex)) {
-      isPreLoadStatus = true;
+    let isVNPreEmptyStatus = false;
+    if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      isVNPreEmptyStatus = true;
+    }
+    const tcStyle = {};
+    if (hasEllipsis) {
+      tcStyle.height = `${currCellHeight}px`;
+    } else {
+      tcStyle.minHeight = `${currCellHeight}px`;
     }
     return h('th', {
       class: ['vxe-header--column', colid, {
         [`col--${headAlign}`]: headAlign,
         [`col--${type}`]: type,
-        'col--last': $columnIndex === cols.length - 1,
+        'col--last': isLastColumn,
         'col--fixed': column.fixed,
         'col--group': isColGroup,
         'col--ellipsis': hasEllipsis,
         'fixed--width': !isAutoCellWidth,
         'fixed--hidden': fixedHiddenColumn,
+        'is--padding': isPadding,
         'is--sortable': column.sortable,
         'col--filter': !!filters,
         'is--filter-active': hasFilter,
         'is--drag-active': !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
         'is--drag-disabled': isDisabledDrag,
         'col--current': currentColumn === column
-      }, getClass(headerClassName, params), getClass(headerCellClassName, params)],
+      }, getClass(headerClassName, cellParams), getClass(headerCellClassName, cellParams)],
       attrs: thAttrs,
-      style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle : undefined,
+      style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle) ? headerCellStyle(cellParams) : headerCellStyle : undefined,
       on: thOns,
       key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
     }, [h('div', {
@@ -15526,20 +16116,26 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
         'c--title': showTitle,
         'c--tooltip': showTooltip,
         'c--ellipsis': showEllipsis
-      }]
-    }, isPreLoadStatus || isOptimizeMode && fixedHiddenColumn ? [] : column.renderHeader(h, params)),
+      }],
+      style: tcStyle
+    }, isVNPreEmptyStatus || isOptimizeMode && fixedHiddenColumn ? [] : [h('div', {
+      attrs: {
+        colid
+      },
+      class: 'vxe-cell--wrapper'
+    }, column.renderHeader(h, cellParams))]),
     /**
     * 列宽拖动
     */
-    !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? h('div', {
-      class: ['vxe-resizable', {
+    !fixedHiddenColumn && showResizable ? h('div', {
+      class: ['vxe-cell--col-resizable', {
         'is--line': !border || border === 'none'
       }],
       on: {
-        mousedown: evnt => _vm.resizeMousedownEvent(evnt, params),
-        dblclick: evnt => $xeTable.handleResizeDblclickEvent(evnt, params)
+        mousedown: evnt => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
+        dblclick: evnt => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
       }
-    }) : null]);
+    }) : header_renderEmptyElement($xeTable)]);
   });
 };
 function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
@@ -15777,152 +16373,18 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     }, renderHeads(h, this, isGroup, isOptimizeMode, renderHeaderList))]),
     /**
      * 其他
-     */
-    h('div', {
-      ref: 'refHeaderBorderRepair',
-      class: 'vxe-table--header-border-line'
-    })])]);
-  },
-  methods: {
-    uploadColumn() {
-      const {
-        $parent: $xetable
-      } = this;
-      this.headerColumn = $xetable.isGroup ? convertHeaderColumnToRows(this.tableGroupColumn) : [];
-    },
-    resizeMousedownEvent(evnt, params) {
-      const $xeTable = this.$parent;
-      const tableInternalData = $xeTable;
-      const {
-        column
-      } = params;
-      const {
-        $parent: $xetable,
-        fixedType
-      } = this;
-      const {
-        visibleColumn
-      } = tableInternalData;
-      const {
-        refTableBody,
-        refLeftContainer,
-        refRightContainer
-      } = $xetable.$refs;
-      const tableEl = $xeTable.$el;
-      const resizeBarElem = $xetable.$refs.refCellResizeBar;
-      const resizeTipElem = $xetable.$refs.refCellResizeTip;
-      const wrapperElem = this.$el;
-      const {
-        clientX: dragClientX
-      } = evnt;
-      const dragBtnElem = evnt.target;
-      const cell = dragBtnElem.parentNode;
-      const cellParams = Object.assign(params, {
-        cell
-      });
-      const resizableOpts = $xeTable.computeResizableOpts;
-      let dragLeft = 0;
-      const tableBodyElem = refTableBody.$el;
-      const pos = getOffsetPos(dragBtnElem, tableEl);
-      const dragBtnWidth = dragBtnElem.clientWidth;
-      const dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
-      const minInterval = getColReMinWidth(cellParams) - dragBtnOffsetWidth; // 列之间的最小间距
-      let dragMinLeft = pos.left - cell.clientWidth + dragBtnWidth + minInterval;
-      let dragPosLeft = pos.left + dragBtnOffsetWidth;
-      const domMousemove = document.onmousemove;
-      const domMouseup = document.onmouseup;
-      const isLeftFixed = fixedType === 'left';
-      const isRightFixed = fixedType === 'right';
-      // 计算左右侧固定列偏移量
-      let fixedOffsetWidth = 0;
-      if (isLeftFixed || isRightFixed) {
-        const siblingProp = isLeftFixed ? 'nextElementSibling' : 'previousElementSibling';
-        let tempCellElem = cell[siblingProp];
-        while (tempCellElem) {
-          if (hasClass(tempCellElem, 'fixed--hidden')) {
-            break;
-          } else if (!hasClass(tempCellElem, 'col--group')) {
-            fixedOffsetWidth += tempCellElem.offsetWidth;
-          }
-          tempCellElem = tempCellElem[siblingProp];
-        }
-        if (isRightFixed && refRightContainer) {
-          dragPosLeft = refRightContainer.offsetLeft + fixedOffsetWidth;
-        }
-      }
-      // 处理拖动事件
-      const updateEvent = function (evnt) {
-        evnt.stopPropagation();
-        evnt.preventDefault();
-        const offsetX = evnt.clientX - dragClientX;
-        let left = dragPosLeft + offsetX;
-        const scrollLeft = fixedType ? 0 : tableBodyElem.scrollLeft;
-        if (isLeftFixed) {
-          // 左固定列（不允许超过右侧固定列、不允许超过右边距）
-          left = Math.min(left, (refRightContainer ? refRightContainer.offsetLeft : tableBodyElem.clientWidth) - fixedOffsetWidth - minInterval);
-        } else if (isRightFixed) {
-          // 右侧固定列（不允许超过左侧固定列、不允许超过左边距）
-          dragMinLeft = (refLeftContainer ? refLeftContainer.clientWidth : 0) + fixedOffsetWidth + minInterval;
-          left = Math.min(left, dragPosLeft + cell.clientWidth - minInterval);
-        } else {
-          dragMinLeft = Math.max(tableBodyElem.scrollLeft, dragMinLeft);
-          // left = Math.min(left, tableBodyElem.clientWidth + tableBodyElem.scrollLeft - 40)
-        }
-        dragLeft = Math.max(left, dragMinLeft);
-        const resizeBarLeft = dragLeft - scrollLeft;
-        resizeBarElem.style.left = `${resizeBarLeft}px`;
-        if (resizableOpts.showDragTip && resizeTipElem) {
-          const tableWidth = tableEl.clientWidth;
-          const wrapperRect = wrapperElem.getBoundingClientRect();
-          const resizeBarWidth = resizeBarElem.clientWidth;
-          const resizeTipWidth = resizeTipElem.clientWidth;
-          const resizeTipHeight = resizeTipElem.clientHeight;
-          let resizeTipLeft = -resizeTipWidth;
-          if (resizeBarLeft < resizeTipWidth + resizeBarWidth) {
-            resizeTipLeft = resizeTipWidth + resizeBarWidth - resizeBarLeft;
-          } else if (resizeBarLeft > tableWidth) {
-            resizeTipLeft += tableWidth - resizeBarLeft;
-          }
-          resizeTipElem.style.left = `${resizeTipLeft}px`;
-          resizeTipElem.style.top = `${Math.min(tableEl.clientHeight - resizeTipHeight, Math.max(0, evnt.clientY - wrapperRect.y - resizeTipHeight / 2))}px`;
-          resizeTipElem.textContent = header_getI18n('vxe.table.resizeColTip', [column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)]);
-        }
-      };
-      $xetable._isResize = true;
-      addClass($xetable.$el, 'drag--resize');
-      resizeBarElem.style.display = 'block';
-      document.onmousemove = updateEvent;
-      document.onmouseup = function (evnt) {
-        document.onmousemove = domMousemove;
-        document.onmouseup = domMouseup;
-        const resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
-        column.resizeWidth = resizeWidth;
-        if (resizableOpts.dragMode === 'fixed') {
-          visibleColumn.forEach(item => {
-            if (item.id !== column.id) {
-              if (!item.resizeWidth) {
-                item.resizeWidth = item.renderWidth;
-              }
-            }
-          });
-        }
-        resizeBarElem.style.display = 'none';
-        $xetable._isResize = false;
-        $xetable._lastResizeTime = Date.now();
-        $xetable.analyColumnWidth();
-        $xetable.recalculate(true).then(() => {
-          $xetable.saveCustomStore('update:visible');
-          $xetable.updateCellAreas();
-          $xetable.emitEvent('resizable-change', {
-            ...params,
-            resizeWidth
-          }, evnt);
-          setTimeout(() => $xetable.recalculate(true), 300);
-        });
-        removeClass($xetable.$el, 'drag--resize');
-      };
-      updateEvent(evnt);
-      $xetable.closeMenu();
+     */
+    h('div', {
+      ref: 'refHeaderBorderRepair',
+      class: 'vxe-table--header-border-line'
+    })])]);
+  },
+  methods: {
+    uploadColumn() {
+      const {
+        $parent: $xetable
+      } = this;
+      this.headerColumn = $xetable.isGroup ? convertHeaderColumnToRows(this.tableGroupColumn) : [];
     }
   }
 });
@@ -15990,6 +16452,10 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
   } = tableInternalData;
   const tooltipOpts = $xeTable.computeTooltipOpts;
   const columnOpts = $xeTable.computeColumnOpts;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+  const cellOpts = $xeTable.computeCellOpts;
+  const footerCellOpts = $xeTable.computeFooterCellOpts;
+  const currCellHeight = footerCellOpts.height || cellOpts.height || defaultRowHeight;
   return tableColumn.map((column, $columnIndex) => {
     const {
       type,
@@ -16000,11 +16466,13 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
       editRender,
       cellRender
     } = column;
+    const colid = column.id;
     const renderOpts = editRender || cellRender;
     const compConf = renderOpts ? footer_renderer.get(renderOpts.name) : null;
     const showAllTip = tooltipOpts.showAll;
     const isColGroup = column.children && column.children.length;
     const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
+    const isPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
     const footOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
     const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
     let showEllipsis = footOverflow === 'ellipsis';
@@ -16099,18 +16567,26 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
         attrs.colspan = colspan;
       }
     }
+    const isLastColumn = $columnIndex === tableColumn.length - 1;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
-    let isPreLoadStatus = false;
-    if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex || _columnIndex > scrollXStore.visibleEndIndex)) {
-      isPreLoadStatus = true;
+    let isVNPreEmptyStatus = false;
+    if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+      isVNPreEmptyStatus = true;
+    }
+    const tcStyle = {};
+    if (hasEllipsis) {
+      tcStyle.height = `${currCellHeight}px`;
+    } else {
+      tcStyle.minHeight = `${currCellHeight}px`;
     }
     return h('td', {
       class: ['vxe-footer--column', column.id, {
         [`col--${footAlign}`]: footAlign,
         [`col--${type}`]: type,
-        'col--last': $columnIndex === tableColumn.length - 1,
+        'col--last': isLastColumn,
         'fixed--width': !isAutoCellWidth,
         'fixed--hidden': fixedHiddenColumn,
+        'is--padding': isPadding,
         'col--ellipsis': hasEllipsis,
         'col--current': currentColumn === column
       }, getClass(footerClassName, cellParams), getClass(footerCellClassName, cellParams)],
@@ -16123,8 +16599,14 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
         'c--title': showTitle,
         'c--tooltip': showTooltip,
         'c--ellipsis': showEllipsis
-      }]
-    }, isPreLoadStatus ? [] : column.renderFooter(h, cellParams))]);
+      }],
+      style: tcStyle
+    }, isVNPreEmptyStatus ? [] : [h('div', {
+      attrs: {
+        colid
+      },
+      class: 'vxe-cell--wrapper'
+    }, column.renderFooter(h, cellParams))])]);
   });
 }
 function footer_renderHeads(h, _vm, renderColumnList) {
@@ -16381,10 +16863,10 @@ const {
     type: [Boolean, String],
     default: () => props_getConfig().table.border
   },
-  // 单元格是否有边距
+  // 已废弃，被 cell-config.padding 替换
   padding: {
     type: Boolean,
-    default: () => props_getConfig().table.padding
+    default: null
   },
   // 是否圆角边框
   round: {
@@ -16530,6 +17012,10 @@ const {
   columnConfig: Object,
   // 单元格配置信息
   cellConfig: Object,
+  // 表头单元格配置信息
+  headerCellConfig: Object,
+  // 表尾单元格配置信息
+  footerCellConfig: Object,
   // 行配置信息
   rowConfig: Object,
   // 已废弃，被 rowDragConfig 替换
@@ -19322,6 +19808,8 @@ const {
      * 快捷菜单事件处理
      */
     handleGlobalContextmenuEvent(evnt) {
+      const $xeTable = this;
+      const internalData = $xeTable;
       const {
         $refs,
         tId,
@@ -19342,7 +19830,7 @@ const {
           evnt.preventDefault();
           return;
         }
-        if (this._keyCtx) {
+        if (internalData._keyCtx) {
           const type = 'body';
           const params = {
             type,
@@ -19655,10 +20143,12 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         index: -1,
         _index: -1,
         $index: -1,
+        treeIndex: -1,
         items: parentChilds,
         parent: parentRow,
         level: parentLevel + 1,
         height: 0,
+        resizeHeight: 0,
         oTop: 0
       };
       fullDataRowIdData[rowid] = rest;
@@ -19678,10 +20168,12 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         index: -1,
         _index: -1,
         $index: -1,
+        treeIndex: -1,
         items: tableFullTreeData,
         parent: null,
         level: 0,
         height: 0,
+        resizeHeight: 0,
         oTop: 0
       };
       fullDataRowIdData[rowid] = rest;
@@ -19735,10 +20227,12 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           index: -1,
           _index: -1,
           $index: -1,
+          treeIndex: -1,
           items: afterFullData,
           parent: null,
           level: 0,
           height: 0,
+          resizeHeight: 0,
           oTop: 0
         };
         fullDataRowIdData[rowid] = rest;
@@ -19771,10 +20265,12 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             index: -1,
             _index: -1,
             $index: -1,
+            treeIndex: -1,
             items: afterFullData,
             parent: null,
             level: 0,
             height: 0,
+            resizeHeight: 0,
             oTop: 0
           };
           fullDataRowIdData[rowid] = rest;
@@ -19830,10 +20326,12 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
               index: -1,
               _index: -1,
               $index: -1,
+              treeIndex: -1,
               items: parentMapChilds,
               parent: parentRow,
               level: parentLevel + 1,
               height: 0,
+              resizeHeight: 0,
               oTop: 0
             };
             fullDataRowIdData[rowid] = rest;
@@ -19908,7 +20406,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     const rowid = getRowid($xeTable, newRow);
     insertMaps[rowid] = newRow;
   });
-  $xeTable.cacheRowMap();
+  $xeTable.cacheRowMap(false);
   $xeTable.updateScrollYStatus();
   $xeTable.handleTableData(treeConfig && transform);
   if (!(treeConfig && transform)) {
@@ -20120,7 +20618,7 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
         }
       });
       $xeTable.updateFooter();
-      $xeTable.cacheRowMap();
+      $xeTable.cacheRowMap(false);
       $xeTable.handleTableData(treeConfig && transform);
       if (!(treeConfig && transform)) {
         $xeTable.updateAfterDataIndex();
@@ -21894,6 +22392,43 @@ function readLocalFile(options = {}) {
     fileInput.click();
   });
 }
+function handleFilterColumns(exportOpts, column, columns) {
+  return columns.some(item => {
+    if (isColumnInfo(item)) {
+      return column.id === item.id;
+    } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(item)) {
+      return column.field === item;
+    } else {
+      const colid = item.id || item.colId;
+      const type = item.type;
+      const field = item.field;
+      if (colid) {
+        return column.id === colid;
+      } else if (field && type) {
+        return column.field === field && column.type === type;
+      } else if (field) {
+        return column.field === field;
+      } else if (type) {
+        return column.type === type;
+      }
+    }
+    return false;
+  });
+}
+function handleFilterFields(exportOpts, column, includeFields, excludeFields) {
+  if (excludeFields) {
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(excludeFields, column.field)) {
+      return false;
+    }
+  }
+  if (includeFields) {
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(includeFields, column.field)) {
+      return true;
+    }
+    return false;
+  }
+  return exportOpts.original ? column.field : defaultFilterExportColumn(column);
+}
 function handleExportAndPrint($xeTable, options, isPrint) {
   const props = $xeTable;
   const reactData = $xeTable;
@@ -21938,7 +22473,9 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   const checkMethod = customOpts.checkMethod;
   const exportColumns = collectColumn.slice(0);
   const {
-    columns
+    columns,
+    excludeFields,
+    includeFields
   } = defOpts;
   // 处理类型
   const typeList = types.map(value => {
@@ -21962,33 +22499,19 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   // 默认选中
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(exportColumns, (column, index, items, path, parent) => {
     const isColGroup = column.children && column.children.length;
-    if (isColGroup || defaultFilterExportColumn(column)) {
-      column.checked = columns ? columns.some(item => {
-        if (isColumnInfo(item)) {
-          return column.id === item.id;
-        } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(item)) {
-          return column.field === item;
-        } else {
-          const colid = item.id || item.colId;
-          const type = item.type;
-          const field = item.field;
-          if (colid) {
-            return column.id === colid;
-          } else if (field && type) {
-            return column.field === field && column.type === type;
-          } else if (field) {
-            return column.field === field;
-          } else if (type) {
-            return column.type === type;
-          }
-        }
-        return false;
-      }) : column.visible;
-      column.halfChecked = false;
-      column.disabled = parent && parent.disabled || (checkMethod ? !checkMethod({
-        column
-      }) : false);
+    let isChecked = false;
+    if (columns && columns.length) {
+      isChecked = handleFilterColumns(defOpts, column, columns);
+    } else if (excludeFields || includeFields) {
+      isChecked = handleFilterFields(defOpts, column, includeFields, excludeFields);
+    } else {
+      isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
     }
+    column.checked = isChecked;
+    column.halfChecked = false;
+    column.disabled = parent && parent.disabled || (checkMethod ? !checkMethod({
+      column
+    }) : false);
   });
   // 更新条件
   Object.assign(exportStore, {
@@ -22610,6 +23133,7 @@ const convertToRows = originColumns => {
 
 
 
+
 function getTargetOffset(target, container) {
   let offsetTop = 0;
   let offsetLeft = 0;
@@ -22635,37 +23159,72 @@ function getTargetOffset(target, container) {
   };
 }
 function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offsetClientTop, moveRange) {
+  const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
+  const {
+    showOverflow
+  } = props;
+  const {
+    fullAllDataRowIdData,
+    isResizeCellHeight
+  } = internalData;
+  const rowOpts = $xeTable.computeRowOpts;
+  const cellOpts = $xeTable.computeCellOpts;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+  const {
+    row
+  } = params;
   let countHeight = 0;
   let rangeRows = [];
   let moveSize = 0;
   const isDown = moveRange > 0;
   const {
-    scrollYLoad,
-    rowHeight
+    scrollYLoad
   } = reactData;
   const {
     afterFullData
   } = internalData;
+  if (isDown) {
+    moveSize = offsetClientTop + moveRange;
+  } else {
+    moveSize = trRect.height - offsetClientTop + Math.abs(moveRange);
+  }
   if (scrollYLoad) {
-    if (isDown) {
-      moveSize = offsetClientTop + moveRange;
-    } else {
-      moveSize = trRect.height - offsetClientTop + Math.abs(moveRange);
-    }
-    const _rowIndex = $xeTable.getVTRowIndex(params.row);
-    if (isDown) {
-      rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / rowHeight));
+    const _rowIndex = $xeTable.getVTRowIndex(row);
+    const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
+    if (!isCustomCellHeight && showOverflow) {
+      if (isDown) {
+        rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / defaultRowHeight));
+      } else {
+        rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / defaultRowHeight), _rowIndex + 1);
+      }
     } else {
-      rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / rowHeight), _rowIndex + 1);
+      if (isDown) {
+        for (let i = _rowIndex; i < afterFullData.length; i++) {
+          const item = afterFullData[i];
+          const rowid = $xeTable.getRowid(item);
+          const rowRest = fullAllDataRowIdData[rowid] || {};
+          countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+          rangeRows.push(item);
+          if (countHeight > moveSize) {
+            return rangeRows;
+          }
+        }
+      } else {
+        for (let len = _rowIndex; len >= 0; len--) {
+          const item = afterFullData[len];
+          const rowid = $xeTable.getRowid(item);
+          const rowRest = fullAllDataRowIdData[rowid] || {};
+          countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+          rangeRows.push(item);
+          if (countHeight > moveSize) {
+            return rangeRows;
+          }
+        }
+      }
     }
   } else {
-    if (isDown) {
-      moveSize = evnt.clientY - trRect.y;
-    } else {
-      moveSize = trRect.y - evnt.clientY + trRect.height;
-    }
     const siblingProp = isDown ? 'next' : 'previous';
     while (targetTrElem && countHeight < moveSize) {
       const rowNodeRest = $xeTable.getRowNode(targetTrElem);
@@ -22843,21 +23402,31 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
     },
     handleCheckboxRangeEvent(evnt, params) {
       const $xeTable = this;
+      const internalData = $xeTable;
+      const {
+        elemStore
+      } = internalData;
+      const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+      const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
+      const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
       const {
         column,
         cell
       } = params;
       if (column.type === 'checkbox') {
-        const {
-          $el,
-          elemStore
-        } = this;
+        let bodyWrapperElem = bodyScrollElem;
+        if (leftScrollElem && column.fixed === 'left') {
+          bodyWrapperElem = leftScrollElem;
+        } else if (rightScrollElem && column.fixed === 'right') {
+          bodyWrapperElem = rightScrollElem;
+        }
+        if (!bodyWrapperElem) {
+          return;
+        }
+        const el = $xeTable.$refs.refElem;
         const disX = evnt.clientX;
         const disY = evnt.clientY;
-        const bodyWrapperElem = elemStore[`${column.fixed || 'main'}-body-wrapper`] || elemStore['main-body-wrapper'];
         const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range');
-        const domMousemove = document.onmousemove;
-        const domMouseup = document.onmouseup;
         const trElem = cell.parentNode;
         const selectRecords = this.getCheckboxRecords();
         let lastRangeRows = [];
@@ -22968,7 +23537,7 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
             }
           }, 50);
         };
-        addClass($el, 'drag--range');
+        addClass(el, 'drag--range');
         document.onmousemove = evnt => {
           evnt.preventDefault();
           evnt.stopPropagation();
@@ -22998,10 +23567,10 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
         };
         document.onmouseup = evnt => {
           stopMouseScroll();
-          removeClass($el, 'drag--range');
+          removeClass(el, 'drag--range');
           checkboxRangeElem.removeAttribute('style');
-          document.onmousemove = domMousemove;
-          document.onmouseup = domMouseup;
+          document.onmousemove = null;
+          document.onmouseup = null;
           triggerEvent('end', evnt);
         };
         triggerEvent('start', evnt);
@@ -24121,7 +24690,7 @@ const table_renderDragTip = (h, $xeTable) => {
   }
   return table_renderEmptyElement($xeTable);
 };
-function handleUupdateResize(_vm) {
+function handleUpdateResize(_vm) {
   const {
     $el
   } = _vm;
@@ -24129,6 +24698,120 @@ function handleUupdateResize(_vm) {
     _vm.recalculate();
   }
 }
+function renderScrollX(h, $xeTable) {
+  return h('div', {
+    key: 'vsx',
+    ref: 'refScrollXVirtualElem',
+    class: 'vxe-table--scroll-x-virtual'
+  }, [h('div', {
+    ref: 'refScrollXLeftCornerElem',
+    class: 'vxe-table--scroll-x-left-corner'
+  }), h('div', {
+    ref: 'refScrollXWrapperElem',
+    class: 'vxe-table--scroll-x-wrapper'
+  }, [h('div', {
+    ref: 'refScrollXHandleElem',
+    class: 'vxe-table--scroll-x-handle',
+    on: {
+      scroll: $xeTable.triggerVirtualScrollXEvent
+    }
+  }, [h('div', {
+    ref: 'refScrollXSpaceElem',
+    class: 'vxe-table--scroll-x-space'
+  })])]), h('div', {
+    ref: 'refScrollXRightCornerElem',
+    class: 'vxe-table--scroll-x-right-corner'
+  })]);
+}
+function renderScrollY(h, $xeTable) {
+  return h('div', {
+    ref: 'refScrollYVirtualElem',
+    class: 'vxe-table--scroll-y-virtual'
+  }, [h('div', {
+    ref: 'refScrollYTopCornerElem',
+    class: 'vxe-table--scroll-y-top-corner'
+  }), h('div', {
+    ref: 'refScrollYWrapperElem',
+    class: 'vxe-table--scroll-y-wrapper'
+  }, [h('div', {
+    ref: 'refScrollYHandleElem',
+    class: 'vxe-table--scroll-y-handle',
+    on: {
+      scroll: $xeTable.triggerVirtualScrollYEvent
+    }
+  }, [h('div', {
+    ref: 'refScrollYSpaceElem',
+    class: 'vxe-table--scroll-y-space'
+  })])]), h('div', {
+    ref: 'refScrollYBottomCornerElem',
+    class: 'vxe-table--scroll-y-bottom-corner'
+  })]);
+}
+function renderViewport(h, $xeTable) {
+  const props = $xeTable;
+  const reactData = $xeTable;
+  const {
+    showHeader,
+    showFooter
+  } = props;
+  const {
+    overflowX,
+    tableData,
+    tableColumn,
+    tableGroupColumn,
+    footerTableData,
+    columnStore
+  } = reactData;
+  const {
+    leftList,
+    rightList
+  } = columnStore;
+  return h('div', {
+    ref: 'refTableViewportElem',
+    class: 'vxe-table--viewport-wrapper'
+  }, [h('div', {
+    class: 'vxe-table--main-wrapper'
+  }, [
+  /**
+     * 表头
+     */
+  showHeader ? h(header, {
+    ref: 'refTableHeader',
+    props: {
+      tableData,
+      tableColumn,
+      tableGroupColumn
+    }
+  }) : table_renderEmptyElement($xeTable),
+  /**
+     * 表体
+     */
+  h(body, {
+    ref: 'refTableBody',
+    props: {
+      tableData,
+      tableColumn
+    }
+  }),
+  /**
+     * 表尾
+     */
+  showFooter ? h(footer, {
+    ref: 'refTableFooter',
+    props: {
+      footerTableData,
+      tableColumn
+    }
+  }) : table_renderEmptyElement($xeTable)]), h('div', {
+    class: 'vxe-table--fixed-wrapper'
+  }, [leftList && leftList.length && overflowX ? renderFixed(h, $xeTable, 'left') : table_renderEmptyElement($xeTable), rightList && rightList.length && overflowX ? renderFixed(h, $xeTable, 'right') : table_renderEmptyElement($xeTable)])]);
+}
+function renderBody(h, $xeTable) {
+  const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
+  return h('div', {
+    class: 'vxe-table--layout-wrapper'
+  }, scrollbarYToLeft ? [renderScrollY(h, $xeTable), renderViewport(h, $xeTable)] : [renderViewport(h, $xeTable), renderScrollY(h, $xeTable)]);
+}
 /* harmony default export */ var table = ({
   name: 'VxeTable',
   mixins: [table_globalMixins.sizeMixin, mixin, menu_mixin, edit_mixin, export_mixin, keyboard_mixin, validator_mixin, custom_mixin],
@@ -24155,8 +24838,7 @@ function handleUupdateResize(_vm) {
     const xID = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId();
     return {
       xID,
-      tId: `${external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId()}`,
-      isCalcColumn: false,
+      tId: xID,
       // 低性能的静态列
       staticColumns: [],
       // 渲染的列分组
@@ -24367,15 +25049,19 @@ function handleUupdateResize(_vm) {
         isFooter: false
       },
       scrollVMLoading: false,
-      isCalcCellHeight: 0,
+      calcCellHeightFlag: 0,
+      resizeHeightFlag: 0,
       isCustomStatus: false,
       isDragRowMove: false,
       dragRow: null,
       isDragColMove: false,
       dragCol: null,
       dragTipText: '',
-      _isResize: false,
-      isLoading: false
+      isDragResize: false,
+      isLoading: false,
+      reScrollFlag: 0,
+      reLayoutFlag: 0,
+      footFlag: 0
     };
   },
   computed: {
@@ -24443,6 +25129,16 @@ function handleUupdateResize(_vm) {
       const props = $xeTable;
       return Object.assign({}, table_getConfig().table.scrollbarConfig, props.scrollbarConfig);
     },
+    computeScrollbarXToTop() {
+      const $xeTable = this;
+      const scrollbarOpts = $xeTable.computeScrollbarOpts;
+      return !!(scrollbarOpts.x && scrollbarOpts.x.position === 'top');
+    },
+    computeScrollbarYToLeft() {
+      const $xeTable = this;
+      const scrollbarOpts = $xeTable.computeScrollbarOpts;
+      return !!(scrollbarOpts.y && scrollbarOpts.y.position === 'left');
+    },
     computeScrollYThreshold() {
       const $xeTable = this;
       const sYOpts = $xeTable.computeSYOpts;
@@ -24469,7 +25165,7 @@ function handleUupdateResize(_vm) {
       const $xeTable = this;
       const vSize = $xeTable.computeSize;
       const rowHeightMaps = $xeTable.computeRowHeightMaps;
-      return rowHeightMaps[vSize || 'default'];
+      return rowHeightMaps[vSize || 'default'] || 18;
     },
     columnOpts() {
       return this.computeColumnOpts;
@@ -24478,7 +25174,19 @@ function handleUupdateResize(_vm) {
       return Object.assign({}, table_getConfig().table.columnConfig, this.columnConfig);
     },
     computeCellOpts() {
-      return Object.assign({}, table_getConfig().table.cellConfig, this.cellConfig);
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.cellConfig, props.cellConfig);
+    },
+    computeHeaderCellOpts() {
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.headerCellConfig, props.headerCellConfig);
+    },
+    computeFooterCellOpts() {
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.footerCellConfig, props.footerCellConfig);
     },
     rowOpts() {
       return this.computeRowOpts;
@@ -24535,6 +25243,20 @@ function handleUupdateResize(_vm) {
         ...this.tooltipOpts
       };
     },
+    computeTableTipConfig() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        tooltipStore
+      } = reactData;
+      const tooltipOpts = $xeTable.computeTooltipOpts;
+      return Object.assign({}, tooltipOpts, tooltipStore.currOpts);
+    },
+    computeValidTipConfig() {
+      const $xeTable = this;
+      const tooltipOpts = $xeTable.computeTooltipOpts;
+      return Object.assign({}, tooltipOpts);
+    },
     validTipOpts() {
       return Object.assign({
         isArrow: false
@@ -24591,23 +25313,55 @@ function handleUupdateResize(_vm) {
       return Object.assign({}, table_getConfig().table.fnrConfig, this.fnrConfig);
     },
     headerCtxMenu() {
-      const headerOpts = this.ctxMenuOpts.header;
+      return this.computeHeaderMenu;
+    },
+    computeHeaderMenu() {
+      const $xeTable = this;
+      const menuOpts = $xeTable.computeMenuOpts;
+      const headerOpts = menuOpts.header;
       return headerOpts && headerOpts.options ? headerOpts.options : [];
     },
     bodyCtxMenu() {
-      const bodyOpts = this.ctxMenuOpts.body;
+      return this.computeBodyMenu;
+    },
+    computeBodyMenu() {
+      const $xeTable = this;
+      const menuOpts = $xeTable.computeMenuOpts;
+      const bodyOpts = menuOpts.body;
       return bodyOpts && bodyOpts.options ? bodyOpts.options : [];
     },
     footerCtxMenu() {
-      const footerOpts = this.ctxMenuOpts.footer;
+      return this.computeFooterMenu;
+    },
+    computeFooterMenu() {
+      const $xeTable = this;
+      const menuOpts = $xeTable.computeMenuOpts;
+      const footerOpts = menuOpts.footer;
       return footerOpts && footerOpts.options ? footerOpts.options : [];
     },
     isCtxMenu() {
-      return !!((this.contextMenu || this.menuConfig) && isEnableConf(this.ctxMenuOpts) && (this.headerCtxMenu.length || this.bodyCtxMenu.length || this.footerCtxMenu.length));
+      return this.computeIsMenu;
+    },
+    computeIsMenu() {
+      const $xeTable = this;
+      const props = $xeTable;
+      const menuOpts = $xeTable.computeMenuOpts;
+      const headerMenu = $xeTable.computeHeaderMenu;
+      const bodyMenu = $xeTable.computeBodyMenu;
+      const footerMenu = $xeTable.computeFooterMenu;
+      return !!((props.contextMenu || props.menuConfig) && isEnableConf(menuOpts) && (headerMenu.length || bodyMenu.length || footerMenu.length));
     },
     ctxMenuList() {
+      return this.computeMenuList;
+    },
+    computeMenuList() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        ctxMenuStore
+      } = reactData;
       const rest = [];
-      this.ctxMenuStore.list.forEach(list => {
+      ctxMenuStore.list.forEach(list => {
         list.forEach(item => {
           rest.push(item);
         });
@@ -24820,7 +25574,7 @@ function handleUupdateResize(_vm) {
       if (value && value.length >= 50000) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
-      this.loadTableData(value || []).then(() => {
+      this.loadTableData(value || [], false).then(() => {
         this.inited = true;
         this.initStatus = true;
         if (!initStatus) {
@@ -24848,33 +25602,50 @@ function handleUupdateResize(_vm) {
     reColumnFlag() {
       this.$nextTick().then(() => this.refreshColumn());
     },
+    computeSize() {
+      this.reScrollFlag++;
+    },
     showHeader() {
-      this.$nextTick(() => {
-        this.recalculate(true).then(() => this.refreshScroll());
-      });
+      this.reScrollFlag++;
     },
     showFooter() {
-      this.$nextTick(() => {
-        this.recalculate(true).then(() => this.refreshScroll());
+      this.reScrollFlag++;
+    },
+    reScrollFlag() {
+      const $xeTable = this;
+      $xeTable.$nextTick(() => {
+        $xeTable.recalculate(true).then(() => $xeTable.refreshScroll());
       });
     },
     height() {
-      this.$nextTick(() => this.recalculate(true));
+      this.reLayoutFlag++;
     },
     maxHeight() {
-      this.$nextTick(() => this.recalculate(true));
+      this.reLayoutFlag++;
     },
-    computeSize() {
-      this.$nextTick(() => {
-        this.recalculate(true).then(() => this.refreshScroll());
-      });
+    computeScrollbarXToTop() {
+      this.reLayoutFlag++;
+    },
+    computeScrollbarYToLeft() {
+      this.reLayoutFlag++;
+    },
+    reLayoutFlag() {
+      const $xeTable = this;
+      $xeTable.$nextTick(() => $xeTable.recalculate(true));
+    },
+    footerData() {
+      this.footFlag++;
+    },
+    footFlag() {
+      const $xeTable = this;
+      $xeTable.updateFooter();
     },
     syncResize(value) {
       if (value) {
-        handleUupdateResize(this);
+        handleUpdateResize(this);
         this.$nextTick(() => {
-          handleUupdateResize(this);
-          setTimeout(() => handleUupdateResize(this));
+          handleUpdateResize(this);
+          setTimeout(() => handleUpdateResize(this));
         });
       }
     },
@@ -24986,11 +25757,14 @@ function handleUupdateResize(_vm) {
       if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
         warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
       }
+      if (treeConfig && !treeOpts.transform && this.stripe) {
+        warnLog('vxe.error.noTree', ['stripe']);
+      }
       if (this.showFooter && !(this.footerMethod || this.footerData)) {
         warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
       }
-      if (treeConfig && !treeOpts.transform && this.stripe) {
-        warnLog('vxe.error.noTree', ['stripe']);
+      if (rowOpts.height) {
+        warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
       }
       if (this.tooltipOpts.enabled) {
         warnLog('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll']);
@@ -25137,7 +25911,7 @@ function handleUupdateResize(_vm) {
       endIndex: 1,
       visibleSize: 0
     });
-    this.loadTableData(data).then(() => {
+    this.loadTableData(data, true).then(() => {
       if (data && data.length) {
         this.inited = true;
         this.initStatus = true;
@@ -25260,29 +26034,24 @@ function handleUupdateResize(_vm) {
       editRules
     } = props;
     const {
-      isCalcColumn,
       isGroup,
       overflowX,
       overflowY,
       scrollXLoad,
       scrollYLoad,
-      scrollbarHeight,
       tableData,
-      tableColumn,
-      tableGroupColumn,
-      footerTableData,
       initStore,
       columnStore,
       filterStore,
-      customStore,
-      tooltipStore
+      customStore
     } = reactData;
     const {
       leftList,
       rightList
     } = columnStore;
     const loadingSlot = slots.loading;
-    const tooltipOpts = $xeTable.computeTooltipOpts;
+    const tableTipConfig = $xeTable.computeTableTipConfig;
+    const validTipConfig = $xeTable.computeValidTipConfig;
     const validOpts = $xeTable.computeValidOpts;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const treeOpts = $xeTable.computeTreeOpts;
@@ -25298,9 +26067,11 @@ function handleUupdateResize(_vm) {
     const resizableOpts = $xeTable.computeResizableOpts;
     const isArea = mouseConfig && mouseOpts.area;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
+    const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
+    const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
     return h('div', {
       ref: 'refElem',
-      class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, {
+      class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`, `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`, {
         [`size--${vSize}`]: vSize,
         [`valid-msg--${validOpts.msgMode}`]: !!editRules,
         'vxe-editable': !!editConfig,
@@ -25313,7 +26084,6 @@ function handleUupdateResize(_vm) {
         'row--highlight': rowOpts.isHover || highlightHoverRow,
         'column--highlight': columnOpts.isHover || highlightHoverColumn,
         'checkbox--range': checkboxOpts.range,
-        'column--calc': isCalcColumn,
         'col--drag-cell': columnOpts.drag && columnDragOpts.trigger === 'cell',
         'is--header': showHeader,
         'is--footer': showFooter,
@@ -25322,7 +26092,6 @@ function handleUupdateResize(_vm) {
         'is--fixed-left': leftList.length,
         'is--fixed-right': rightList.length,
         'is--animat': !!props.animat,
-        'is--padding': props.padding,
         'is--round': props.round,
         'is--stripe': !treeConfig && stripe,
         'is--loading': currLoading,
@@ -25348,82 +26117,7 @@ function handleUupdateResize(_vm) {
     }, this.$slots.default), h('div', {
       key: 'tw',
       class: 'vxe-table--render-wrapper'
-    }, [h('div', {
-      ref: 'refTableViewportElem',
-      class: 'vxe-table--viewport-wrapper'
-    }, [h('div', {
-      class: 'vxe-table--main-wrapper'
-    }, [
-    /**
-     * 表头
-     */
-    showHeader ? h(header, {
-      ref: 'refTableHeader',
-      props: {
-        tableData,
-        tableColumn,
-        tableGroupColumn,
-        size: vSize
-      }
-    }) : table_renderEmptyElement($xeTable),
-    /**
-    * 表体
-    */
-    h(body, {
-      ref: 'refTableBody',
-      props: {
-        tableData,
-        tableColumn,
-        size: vSize
-      }
-    }),
-    /**
-    * 表尾
-    */
-    showFooter ? h(footer, {
-      ref: 'refTableFooter',
-      props: {
-        footerTableData,
-        tableColumn,
-        size: vSize
-      }
-    }) : table_renderEmptyElement($xeTable)]), h('div', {
-      class: 'vxe-table--fixed-wrapper'
-    }, [leftList && leftList.length && overflowX ? renderFixed(h, this, 'left') : table_renderEmptyElement($xeTable), rightList && rightList.length && overflowX ? renderFixed(h, this, 'right') : table_renderEmptyElement($xeTable)])]), h('div', {
-      ref: 'refScrollYVirtualElem',
-      class: 'vxe-table--scroll-y-virtual'
-    }, [h('div', {
-      ref: 'refScrollYTopCornerElem',
-      class: 'vxe-table--scroll-y-top-corner'
-    }), h('div', {
-      ref: 'refScrollYHandleElem',
-      class: 'vxe-table--scroll-y-handle',
-      on: {
-        scroll: this.scrollYEvent
-      }
-    }, [h('div', {
-      ref: 'refScrollYSpaceElem',
-      class: 'vxe-table--scroll-y-space'
-    })]), h('div', {
-      ref: 'refScrollYBottomCornerElem',
-      class: 'vxe-table--scroll-y-bottom-corner'
-    })])]), h('div', {
-      key: 'vx',
-      ref: 'refScrollXVirtualElem',
-      class: 'vxe-table--scroll-x-virtual'
-    }, [h('div', {
-      ref: 'refScrollXHandleElem',
-      class: 'vxe-table--scroll-x-handle',
-      on: {
-        scroll: this.scrollXEvent
-      }
-    }, [h('div', {
-      ref: 'refScrollXSpaceElem',
-      class: 'vxe-table--scroll-x-space'
-    })]), h('div', {
-      ref: 'refScrollXRightCornerElem',
-      class: 'vxe-table--scroll-x-right-corner'
-    })]),
+    }, scrollbarXToTop ? [renderScrollX(h, $xeTable), renderBody(h, $xeTable)] : [renderBody(h, $xeTable), renderScrollX(h, $xeTable)]),
     /**
      * 空数据
      */
@@ -25445,14 +26139,21 @@ function handleUupdateResize(_vm) {
      * 列宽线
      */
     h('div', {
-      key: 'cl',
-      ref: 'refCellResizeBar',
-      class: 'vxe-table--resizable-bar',
-      style: overflowX ? {
-        'padding-bottom': `${scrollbarHeight}px`
-      } : undefined
+      key: 'tcl',
+      ref: 'refColResizeBar',
+      class: 'vxe-table--resizable-col-bar'
+    }, resizableOpts.showDragTip ? [h('div', {
+      ref: 'refColResizeTip',
+      class: 'vxe-table--resizable-number-tip'
+    })] : []),
+    /**
+     * 行高线
+     */
+    h('div', {
+      key: 'trl',
+      ref: 'refRowResizeBar',
+      class: 'vxe-table--resizable-row-bar'
     }, resizableOpts.showDragTip ? [h('div', {
-      ref: 'refCellResizeTip',
       class: 'vxe-table--resizable-number-tip'
     })] : []),
     /**
@@ -25554,7 +26255,12 @@ function handleUupdateResize(_vm) {
     VxeUITooltipComponent ? h(VxeUITooltipComponent, {
       key: 'btp',
       ref: 'tooltip',
-      props: Object.assign({}, tooltipOpts, tooltipStore.currOpts)
+      props: {
+        theme: tableTipConfig.theme,
+        enterable: tableTipConfig.enterable,
+        enterDelay: tableTipConfig.enterDelay,
+        leaveDelay: tableTipConfig.leaveDelay
+      }
     }) : table_renderEmptyElement($xeTable),
     /**
      * 校验提示
@@ -25565,9 +26271,12 @@ function handleUupdateResize(_vm) {
       class: [{
         'old-cell-valid': editRules && table_getConfig().cellVaildMode === 'obsolete'
       }, 'vxe-table--valid-error'],
-      props: validOpts.message === 'tooltip' || tableData.length === 1 ? Object.assign({
-        isArrow: false
-      }, tooltipOpts) : {}
+      props: {
+        theme: validTipConfig.theme,
+        enterable: validTipConfig.enterable,
+        enterDelay: validTipConfig.enterDelay,
+        leaveDelay: validTipConfig.leaveDelay
+      }
     }) : table_renderEmptyElement($xeTable)])]);
   },
   methods: methods
@@ -29222,7 +29931,8 @@ const Toolbar = VxeToolbar;
       customRestore: '恢复默认',
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
-      resizeColTip: '{0} 像素'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',