vxe-table 4.10.6-beta.8 → 4.10.6

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.6-beta.8";
+const version = "4.10.6";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3149,7 +3149,6 @@ core_.VxeUI.setConfig({
     animat: true,
     delayHover: 250,
     autoResize: true,
-    padding: true,
     minHeight: 144,
     // keepSource: false,
     // showOverflow: null,
@@ -3173,7 +3172,10 @@ core_.VxeUI.setConfig({
     },
     resizableConfig: {
       dragMode: 'auto',
-      showDragTip: true
+      showDragTip: true,
+      isSyncAutoHeight: true,
+      isSyncAutoWidth: true,
+      minHeight: 18
     },
     radioConfig: {
       // trigger: 'default'
@@ -3207,6 +3209,15 @@ core_.VxeUI.setConfig({
     columnConfig: {
       maxFixedSize: 4
     },
+    cellConfig: {
+      padding: true
+    },
+    headerCellConfig: {
+      height: 'unset'
+    },
+    footerCellConfig: {
+      height: 'unset'
+    },
     // menuConfig: {
     //   visibleMethod () {}
     // },
@@ -3240,6 +3251,8 @@ core_.VxeUI.setConfig({
       // orders: ['asc', 'desc', null],
       // sortMethod: null,
       showIcon: true,
+      allowClear: true,
+      allowBtn: true,
       iconLayout: 'vertical'
     },
     filterConfig: {
@@ -3311,18 +3324,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: {
@@ -3568,7 +3583,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.6-beta.8"}`;
+const log_version = `table v${"4.10.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3657,6 +3672,8 @@ class ColumnInfo {
       footerClassName: _vm.footerClassName,
       formatter: formatter,
       footerFormatter: _vm.footerFormatter,
+      padding: _vm.padding,
+      verticalAlign: _vm.verticalAlign,
       sortable: _vm.sortable,
       sortBy: _vm.sortBy,
       sortType: _vm.sortType,
@@ -3668,6 +3685,7 @@ class ColumnInfo {
       filterRender: _vm.filterRender,
       treeNode: _vm.treeNode,
       dragSort: _vm.dragSort,
+      rowResize: _vm.rowResize,
       cellType: _vm.cellType,
       cellRender: _vm.cellRender,
       editRender: _vm.editRender,
@@ -4046,7 +4064,7 @@ function getRowid($xeTable, row) {
 }
 const handleFieldOrColumn = ($xeTable, fieldOrColumn) => {
   if (fieldOrColumn) {
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? $xeTable.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) ? $xeTable.getColumnByField(`${fieldOrColumn}`) : fieldOrColumn;
   }
   return null;
 };
@@ -4110,6 +4128,12 @@ function getRefElem(refEl) {
   }
   return null;
 }
+function getCellHeight(height) {
+  if (height === 'unset') {
+    return 0;
+  }
+  return height || 0;
+}
 /**
  * 列宽拖动最大宽度
  * @param params
@@ -4146,9 +4170,8 @@ function getColReMinWidth(params) {
     column,
     cell
   } = params;
-  const {
-    props: tableProps
-  } = $table;
+  const tableProps = $table.props;
+  const internalData = $table.internalData;
   const {
     computeResizableOpts
   } = $table.getComputeMaps();
@@ -4163,6 +4186,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: allColumnHeaderOverflow
   } = tableProps;
@@ -4192,14 +4218,10 @@ function getColReMinWidth(params) {
   }
   // 如果设置最小宽
   if (colMinWidth) {
-    const {
-      refTableBody
-    } = $table.getRefMaps();
-    const tableBody = refTableBody.value;
-    const bodyElem = tableBody ? tableBody.$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)) {
@@ -4322,14 +4344,44 @@ const getOffsetSize = $xeTable => {
 };
 function calcTreeLine(params, prevRow) {
   const {
-    $table
+    $table,
+    row
   } = params;
+  const tableProps = $table.props;
   const tableReactData = $table.reactData;
+  const tableInternalData = $table.internalData;
+  const {
+    showOverflow
+  } = tableProps;
+  const {
+    scrollYLoad
+  } = tableReactData;
+  const {
+    fullAllDataRowIdData
+  } = tableInternalData;
+  const {
+    computeRowOpts,
+    computeCellOpts,
+    computeDefaultRowHeight
+  } = $table.getComputeMaps();
+  const rowOpts = computeRowOpts.value;
+  const cellOpts = computeCellOpts.value;
+  const defaultRowHeight = computeDefaultRowHeight.value;
+  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++) {
@@ -4391,45 +4443,39 @@ function clearTableAllStatus($xeTable) {
   return clearTableDefaultStatus($xeTable);
 }
 function rowToVisible($xeTable, row) {
-  const {
-    reactData,
-    internalData
-  } = $xeTable;
   const tableProps = $xeTable.props;
+  const reactData = $xeTable.reactData;
+  const internalData = $xeTable.internalData;
+  const {
+    computeLeftFixedWidth,
+    computeRightFixedWidth,
+    computeRowOpts,
+    computeCellOpts,
+    computeDefaultRowHeight
+  } = $xeTable.getComputeMaps();
   const {
     showOverflow
   } = tableProps;
   const {
-    refTableBody
-  } = $xeTable.getRefMaps();
-  const {
-    columnStore,
-    scrollYLoad,
-    rowHeight
+    scrollYLoad
   } = reactData;
   const {
+    elemStore,
     afterFullData,
-    fullAllDataRowIdData
+    fullAllDataRowIdData,
+    isResizeCellHeight
   } = internalData;
-  const tableBody = refTableBody.value;
-  const {
-    leftList,
-    rightList
-  } = columnStore;
-  const bodyElem = tableBody ? tableBody.$el : null;
+  const rowOpts = computeRowOpts.value;
+  const cellOpts = computeCellOpts.value;
+  const defaultRowHeight = computeDefaultRowHeight.value;
+  const leftFixedWidth = computeLeftFixedWidth.value;
+  const rightFixedWidth = computeRightFixedWidth.value;
+  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);
@@ -4443,82 +4489,71 @@ 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 rowRest = fullAllDataRowIdData[rowid] || {};
+        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);
           if (currRow === row || currRowid === rowid) {
             break;
           }
-          const rowRest = fullAllDataRowIdData[currRowid];
-          scrollTop += rowRest ? rowRest.height || rowHeight : rowHeight;
+          const currRowRest = fullAllDataRowIdData[currRowid] || {};
+          scrollTop += currRowRest.resizeHeight || currRowRest.height || cellOpts.height || rowOpts.height || 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.reactData;
+  const internalData = $xeTable.internalData;
   const {
-    reactData,
-    internalData
-  } = $xeTable;
-  const {
-    refTableBody
-  } = $xeTable.getRefMaps();
+    computeLeftFixedWidth,
+    computeRightFixedWidth
+  } = $xeTable.getComputeMaps();
   const {
-    columnStore,
     scrollXLoad
   } = reactData;
   const {
+    elemStore,
     visibleColumn
   } = internalData;
-  const {
-    leftList,
-    rightList
-  } = columnStore;
-  const tableBody = refTableBody.value;
-  const bodyElem = tableBody ? tableBody.$el : null;
+  const leftFixedWidth = computeLeftFixedWidth.value;
+  const rightFixedWidth = computeRightFixedWidth.value;
+  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 {
       // 检测是否在虚拟渲染可视区中
@@ -4533,9 +4568,9 @@ function colToVisible($xeTable, column, row) {
           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));
       }
     }
   }
@@ -4802,7 +4837,7 @@ function renderTitleContent(params, content) {
   const ons = {};
   if (showTitle || showTooltip || showAllTip) {
     ons.onMouseenter = evnt => {
-      if (tableReactData._isResize) {
+      if (tableReactData.isDragResize) {
         return;
       }
       if (showTitle) {
@@ -4814,7 +4849,7 @@ function renderTitleContent(params, content) {
   }
   if (showTooltip || showAllTip) {
     ons.onMouseleave = evnt => {
-      if (tableReactData._isResize) {
+      if (tableReactData.isDragResize) {
         return;
       }
       if (showTooltip || showAllTip) {
@@ -4831,18 +4866,6 @@ function renderTitleContent(params, content) {
     ...ons
   }, getSlotVNs(content))];
 }
-function formatFooterLabel(footerFormatter, params) {
-  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerFormatter)) {
-    return `${footerFormatter(params)}`;
-  }
-  const isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerFormatter);
-  const gFormatOpts = isArr ? cell_formats.get(footerFormatter[0]) : cell_formats.get(footerFormatter);
-  const footerFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
-  if (footerFormatMethod) {
-    return `${isArr ? footerFormatMethod(params, ...footerFormatter.slice(1)) : footerFormatMethod(params)}`;
-  }
-  return '';
-}
 function getFooterContent(params) {
   const {
     $table,
@@ -4862,35 +4885,38 @@ function getFooterContent(params) {
   if (footerSlot) {
     return $table.callSlot(footerSlot, params);
   }
+  let itemValue = '';
+  // 兼容老模式
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(items)) {
+    itemValue = items[_columnIndex];
+  } else {
+    itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+  }
+  const footParams = Object.assign(params, {
+    itemValue
+  });
+  if (footerFormatter) {
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerFormatter)) {
+      return `${footerFormatter(footParams)}`;
+    }
+    const isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerFormatter);
+    const gFormatOpts = isArr ? cell_formats.get(footerFormatter[0]) : cell_formats.get(footerFormatter);
+    const footerFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
+    if (footerFormatMethod) {
+      return `${isArr ? footerFormatMethod(footParams, ...footerFormatter.slice(1)) : footerFormatMethod(footParams)}`;
+    }
+    return '';
+  }
   if (renderOpts) {
     const compConf = cell_renderer.get(renderOpts.name);
     if (compConf) {
       const rtFooter = compConf.renderTableFooter || compConf.renderFooter;
       if (rtFooter) {
-        return getSlotVNs(rtFooter(renderOpts, params));
+        return getSlotVNs(rtFooter(renderOpts, footParams));
       }
     }
   }
-  let itemValue = '';
-  // 兼容老模式
-  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(items)) {
-    itemValue = items[_columnIndex];
-    return [footerFormatter ? formatFooterLabel(footerFormatter, {
-      itemValue,
-      column,
-      row,
-      items,
-      _columnIndex
-    }) : formatText(itemValue, 1)];
-  }
-  itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
-  return [footerFormatter ? formatFooterLabel(footerFormatter, {
-    itemValue,
-    column,
-    row,
-    items,
-    _columnIndex
-  }) : formatText(itemValue, 1)];
+  return [formatText(itemValue, 1)];
 }
 function getDefaultCellLabel(params) {
   const {
@@ -5073,9 +5099,7 @@ const Cell = {
     return Cell.renderTreeIcon(params, Cell.renderDefaultCell(params));
   },
   renderDefaultFooter(params) {
-    return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-      class: 'vxe-cell--item'
-    }, getFooterContent(params))];
+    return getFooterContent(params);
   },
   /**
    * 树节点
@@ -5664,6 +5688,7 @@ const Cell = {
     const sortOpts = computeSortOpts.value;
     const {
       showIcon,
+      allowBtn,
       iconLayout,
       iconAsc,
       iconDesc,
@@ -5680,19 +5705,19 @@ const Cell = {
           'sort--active': order === 'asc'
         }],
         title: cell_getI18n('vxe.table.sortAsc'),
-        onClick(evnt) {
+        onClick: allowBtn ? evnt => {
           evnt.stopPropagation();
           $table.triggerSortEvent(evnt, column, 'asc');
-        }
+        } : undefined
       }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
         class: ['vxe-sort--desc-btn', iconDesc || cell_getIcon().TABLE_SORT_DESC, {
           'sort--active': order === 'desc'
         }],
         title: cell_getI18n('vxe.table.sortDesc'),
-        onClick(evnt) {
+        onClick: allowBtn ? evnt => {
           evnt.stopPropagation();
           $table.triggerSortEvent(evnt, column, 'desc');
-        }
+        } : undefined
       })])];
     }
     return [];
@@ -5918,6 +5943,16 @@ const columnProps = {
   formatter: [Function, Array, String],
   // 格式化表尾显示内容
   footerFormatter: [Function, Array, String],
+  // 是否显示间距
+  padding: {
+    type: Boolean,
+    default: null
+  },
+  // 垂直对齐方式
+  verticalAlign: {
+    type: String,
+    default: null
+  },
   // 是否允许排序
   sortable: Boolean,
   // 自定义排序的属性
@@ -5944,8 +5979,10 @@ const columnProps = {
   filterRender: Object,
   // 设置为树节点
   treeNode: Boolean,
-  // 指定为树节点
+  // 设置为拖拽排序
   dragSort: Boolean,
+  // 设置为行高拖拽
+  rowResize: Boolean,
   // 是否可视
   visible: {
     type: Boolean,
@@ -6161,7 +6198,8 @@ const renderType = 'body';
       computeRowDragOpts,
       computeColumnDragOpts,
       computeLeftFixedWidth,
-      computeRightFixedWidth
+      computeRightFixedWidth,
+      computeResizableOpts
     } = $xeTable.getComputeMaps();
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refBodyScroll = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -6178,11 +6216,11 @@ const renderType = 'body';
       } = tableProps;
       const {
         lastScrollTime,
-        _isResize
+        isDragResize
       } = tableReactData;
-      return !!(_isResize || lastScrollTime && Date.now() < lastScrollTime + delayHover);
+      return !!(isDragResize || lastScrollTime && Date.now() < lastScrollTime + delayHover);
     };
-    const renderLine = params => {
+    const renderLine = (params, cellHeight) => {
       const {
         row,
         column
@@ -6215,11 +6253,13 @@ const renderType = 'body';
       const isFirstRow = $xeTable.eqRow(afterFullData[0], row);
       if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
         return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          key: 'tl',
           class: 'vxe-tree--line-wrapper'
         }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.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`
           }
         })])];
@@ -6235,8 +6275,9 @@ const renderType = 'body';
       } = tableInternalData;
       const {
         columnKey,
+        resizable: allResizable,
+        border,
         height,
-        showOverflow: allColumnOverflow,
         cellClassName: allCellClassName,
         cellStyle,
         align: allAlign,
@@ -6244,7 +6285,8 @@ const renderType = 'body';
         mouseConfig,
         editConfig,
         editRules,
-        tooltipConfig
+        tooltipConfig,
+        padding: allPadding
       } = tableProps;
       const {
         tableData,
@@ -6252,7 +6294,8 @@ const renderType = 'body';
         currentColumn,
         scrollXLoad,
         scrollYLoad,
-        isCalcCellHeight,
+        calcCellHeightFlag,
+        resizeHeightFlag,
         mergeList,
         editStore,
         isAllOverflow,
@@ -6268,9 +6311,16 @@ const renderType = 'body';
       const checkboxOpts = computeCheckboxOpts.value;
       const editOpts = computeEditOpts.value;
       const tooltipOpts = computeTooltipOpts.value;
+      const resizableOpts = computeResizableOpts.value;
+      const {
+        isAllColumnDrag,
+        isAllRowDrag
+      } = resizableOpts;
       const rowOpts = computeRowOpts.value;
       const rowDragOpts = computeRowDragOpts.value;
       const defaultRowHeight = computeDefaultRowHeight.value;
+      const customCellHeight = cellOpts.height || rowOpts.height;
+      const currCellHeight = customCellHeight || defaultRowHeight;
       const {
         disabledMethod: dragDisabledMethod,
         isCrossDrag,
@@ -6290,17 +6340,18 @@ const renderType = 'body';
         showOverflow,
         className,
         treeNode,
+        rowResize,
+        padding,
+        verticalAlign,
         slots
       } = column;
       const {
-        verticalAlign
+        verticalAlign: allVerticalAlign
       } = cellOpts;
       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;
@@ -6310,23 +6361,27 @@ const renderType = 'body';
       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 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 isCellPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(padding) ? allPadding === null ? cellOpts.padding : allPadding : padding;
+      const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showOverflow) ? isAllOverflow : showOverflow;
       const showEllipsis = cellOverflow === 'ellipsis';
       const showTitle = cellOverflow === 'title';
       const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
-      // 如果表格加上 showOverflow 则不再支持列单独设置
-      const hasEllipsis = allColumnOverflow || showTitle || showTooltip || showEllipsis;
+      const hasEllipsis = isAllOverflow || showTitle || showTooltip || showEllipsis;
+      const showResizable = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
+      const isCsHeight = !!customCellHeight;
+      const isRsHeight = resizeHeight > 0;
       let isDirty;
       const tdOns = {};
-      const rest = fullAllDataRowIdData[rowid];
       const cellAlign = align || (compConf ? compConf.tableCellAlign : '') || allAlign;
+      const cellVerticalAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(verticalAlign) ? allVerticalAlign : verticalAlign;
       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,
@@ -6354,7 +6409,7 @@ const renderType = 'body';
         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) {
@@ -6366,11 +6421,11 @@ const renderType = 'body';
             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 退出事件
@@ -6384,13 +6439,13 @@ const renderType = 'body';
           }
           $xeTable.dispatchEvent('cell-mouseleave', Object.assign({
             cell: evnt.currentTarget
-          }, params), evnt);
+          }, cellParams), evnt);
         };
       }
       // 按下事件处理
       if (isRowDragCell || checkboxOpts.range || mouseConfig) {
         tdOns.onMousedown = evnt => {
-          $xeTable.triggerCellMousedownEvent(evnt, params);
+          $xeTable.triggerCellMousedownEvent(evnt, cellParams);
         };
       }
       // 拖拽列事件
@@ -6399,11 +6454,11 @@ const renderType = 'body';
       }
       // 点击事件处理
       tdOns.onClick = evnt => {
-        $xeTable.triggerCellClickEvent(evnt, params);
+        $xeTable.triggerCellClickEvent(evnt, cellParams);
       };
       // 双击事件处理
       tdOns.onDblclick = evnt => {
-        $xeTable.triggerCellDblclickEvent(evnt, params);
+        $xeTable.triggerCellDblclickEvent(evnt, cellParams);
       };
       // 合并行或列
       if (mergeList.length) {
@@ -6417,10 +6472,10 @@ const renderType = 'body';
             return null;
           }
           if (rowspan > 1) {
-            attrs.rowspan = rowspan;
+            tdAttrs.rowspan = rowspan;
           }
           if (colspan > 1) {
-            attrs.colspan = colspan;
+            tdAttrs.colspan = colspan;
           }
         }
       } else if (spanMethod) {
@@ -6428,20 +6483,20 @@ const renderType = 'body';
         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;
         }
       }
@@ -6449,40 +6504,69 @@ const renderType = 'body';
       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 (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
+        tcStyle.height = `${cellHeight}px`;
+      } else {
+        tcStyle.minHeight = `${cellHeight}px`;
+      }
       const tdVNs = [];
-      if (fixedHiddenColumn && (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
+      if (fixedHiddenColumn && isAllOverflow) {
         tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.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(params), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        tdVNs.push(...renderLine(cellParams, cellHeight), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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,
           title: showTitle ? $xeTable.getCellLabel(row, column) : null
-        }, column.renderCell(params)));
+        }, isVNPreEmptyStatus ? [] : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          colid,
+          rowid,
+          class: 'vxe-cell--wrapper'
+        }, column.renderCell(cellParams))]));
         if (showValidTip && errorValidItem) {
           const errRule = errorValidItem.rule;
           const validSlot = slots ? slots.valid : null;
           const validParams = {
-            ...params,
+            ...cellParams,
             ...errorValidItem,
             rule: errorValidItem
           };
           tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            key: 'tcv',
             class: ['vxe-cell--valid-error-tip', getPropClass(validOpts.className, validParams)],
             style: errRule && errRule.maxWidth ? {
               width: `${errRule.maxWidth}px`
@@ -6494,57 +6578,55 @@ const renderType = 'body';
           }, 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`;
-      }
+      let showAreaRowStatus = false;
       if (mouseConfig && mouseOpts.area && selectCellToRow) {
-        if (!$columnIndex && selectCellToRow === true || selectCellToRow === column.field) {
-          tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-            class: 'vxe-cell--area-status'
-          }));
+        if (!_columnIndex && selectCellToRow === true || selectCellToRow === column.field) {
+          showAreaRowStatus = true;
         }
       }
-      const isLastColumn = $columnIndex === columns.length - 1;
-      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 (!fixedHiddenColumn && showResizable && isAllColumnDrag) {
+        tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          key: 'tcc',
+          class: ['vxe-cell--col-resizable', {
+            'is--line': !border || border === 'none'
+          }],
+          onMousedown: evnt => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
+          onDblclick: evnt => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
+        }));
+      }
+      if ((rowResize || isAllRowDrag) && rowOpts.resizable) {
+        tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          key: 'tcr',
+          class: 'vxe-cell--row-resizable',
+          onMousedown: evnt => $xeTable.handleRowResizeMousedownEvent(evnt, cellParams),
+          onDblclick: evnt => $xeTable.handleRowResizeDblclickEvent(evnt, cellParams)
+        }));
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
-        class: ['vxe-body--column', colid, {
-          [`col--${cellAlign}`]: cellAlign,
-          [`col--vertical-${verticalAlign}`]: verticalAlign,
-          [`col--${type}`]: type,
+        class: ['vxe-body--column', colid, cellVerticalAlign ? `col--vertical-${cellVerticalAlign}` : '', cellAlign ? `col--${cellAlign}` : '', type ? `col--${type}` : '', {
           'col--last': isLastColumn,
           'col--tree-node': treeNode,
           'col--edit': isEdit,
           'col--ellipsis': hasEllipsis,
+          'col--cs-height': isCsHeight,
+          'col--rs-height': isRsHeight,
+          'col--to-row': showAreaRowStatus,
+          'col--auto-height': isVNAutoHeight,
           'fixed--width': !isAutoCellWidth,
           'fixed--hidden': fixedHiddenColumn,
+          'is--padding': isCellPadding,
           '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
-        }, getPropClass(compCellClassName, params), getPropClass(className, params), getPropClass(allCellClassName, params)],
+        }, getPropClass(compCellClassName, cellParams), getPropClass(className, cellParams), getPropClass(allCellClassName, cellParams)],
         key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? colid : $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),
+        ...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),
         ...tdOns
-      }, isPreLoadStatus || isOptimizeMode && fixedHiddenColumn ? [] : tdVNs);
+      }, isOptimizeMode && fixedHiddenColumn ? [] : tdVNs);
     };
     const renderRows = (fixedType, isOptimizeMode, tableData, tableColumn) => {
       const {
@@ -6553,15 +6635,16 @@ const renderType = 'body';
         highlightHoverRow,
         rowClassName,
         rowStyle,
-        showOverflow: allColumnOverflow,
         editConfig,
         treeConfig
       } = tableProps;
       const {
         hasFixedColumn,
         treeExpandedMaps,
+        isColLoading,
         scrollXLoad,
         scrollYLoad,
+        isAllOverflow,
         rowExpandedMaps,
         expandColumn,
         selectRadioRow,
@@ -6665,7 +6748,7 @@ const renderType = 'body';
         const tdVNs = tableColumn.map((column, $columnIndex) => {
           return renderTdColumn(seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
         });
-        rows.push(columnOpts.drag && columnDragOpts.animation ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
+        rows.push(!isColLoading && columnOpts.drag && columnDragOpts.animation ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
           name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
           tag: 'tr',
           class: trClass,
@@ -6699,7 +6782,7 @@ const renderType = 'body';
           const {
             showOverflow
           } = expandColumn;
-          const hasEllipsis = 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 hasEllipsis = 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) ? isAllOverflow : showOverflow;
           const expandParams = {
             $table: $xeTable,
             seq,
@@ -6787,7 +6870,6 @@ const renderType = 'body';
         tableColumn
       } = props;
       const {
-        showOverflow: allColumnOverflow,
         spanMethod,
         footerSpanMethod,
         mouseConfig
@@ -6795,6 +6877,8 @@ const renderType = 'body';
       const {
         isGroup,
         tableData,
+        isRowLoading,
+        isColLoading,
         scrollXLoad,
         scrollYLoad,
         isAllOverflow,
@@ -6818,7 +6902,7 @@ const renderType = 'body';
       let renderColumnList = tableColumn;
       let isOptimizeMode = false;
       // 如果是使用优化模式
-      if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+      if (scrollXLoad || scrollYLoad || isAllOverflow) {
         if (expandColumn || spanMethod || footerSpanMethod) {
           // 如果不支持优化模式
         } else {
@@ -6937,9 +7021,9 @@ const renderType = 'body';
         });
       })),
       /**
-      * 内容
-      */
-      rowOpts.drag && rowDragOpts.animation ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
+       * 内容
+       */
+      !(isRowLoading || isColLoading) && rowOpts.drag && rowDragOpts.animation ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
         ref: refBodyTBody,
         name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`,
         tag: 'tbody'
@@ -6972,6 +7056,8 @@ const renderType = 'body';
         class: 'vxe-table--cell-multi-area'
       }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: 'vxe-table--cell-active-area'
+      }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+        class: 'vxe-table--cell-row-status-area'
       })]) : body_renderEmptyElement($xeTable), !fixedType ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-table--empty-block',
         ref: refBodyEmptyBlock
@@ -6990,10 +7076,7 @@ const renderType = 'body';
 
 
 
-
-
 const {
-  getI18n: header_getI18n,
   renderer: header_renderer,
   renderEmptyElement: header_renderEmptyElement
 } = core_.VxeUI;
@@ -7018,18 +7101,13 @@ const header_renderType = 'header';
       reactData: tableReactData,
       internalData: tableInternalData
     } = $xeTable;
-    const {
-      refElem: tableRefElem,
-      refLeftContainer,
-      refRightContainer,
-      refCellResizeBar,
-      refCellResizeTip
-    } = $xeTable.getRefMaps();
     const {
       computeColumnOpts,
       computeColumnDragOpts,
-      computeResizableOpts,
-      computeScrollbarXToTop
+      computeCellOpts,
+      computeMouseOpts,
+      computeHeaderCellOpts,
+      computeDefaultRowHeight
     } = $xeTable.getComputeMaps();
     const headerColumn = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)([]);
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -7045,153 +7123,6 @@ const header_renderType = 'header';
       } = tableReactData;
       headerColumn.value = isGroup ? convertHeaderColumnToRows(props.tableGroupColumn) : [];
     };
-    const resizeMousedownEvent = (evnt, params) => {
-      const {
-        column
-      } = params;
-      const {
-        fixedType
-      } = props;
-      const {
-        scrollbarHeight
-      } = tableReactData;
-      const {
-        elemStore,
-        visibleColumn
-      } = tableInternalData;
-      const resizableOpts = computeResizableOpts.value;
-      const tableEl = tableRefElem.value;
-      const leftContainerElem = refLeftContainer.value;
-      const rightContainerElem = refRightContainer.value;
-      const resizeBarElem = refCellResizeBar.value;
-      const resizeTipElem = refCellResizeTip.value;
-      const scrollbarXToTop = computeScrollbarXToTop.value;
-      const {
-        clientX: dragClientX
-      } = evnt;
-      const wrapperElem = refElem.value;
-      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 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 && 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 ? scrollbarHeight : 0}px`;
-        resizeBarElem.style.height = `${scrollbarXToTop ? tableHeight - scrollbarHeight : tableHeight}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 = 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`;
-          resizeTipElem.textContent = header_getI18n('vxe.table.resizeColTip', [resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)]);
-        }
-      };
-      tableReactData._isResize = true;
-      addClass(tableEl, 'drag--resize');
-      resizeBarElem.style.display = 'block';
-      document.onmousemove = updateEvent;
-      document.onmouseup = function (evnt) {
-        document.onmousemove = domMousemove;
-        document.onmouseup = domMouseup;
-        const resizeWidth = resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
-        resizeColumn.resizeWidth = resizeWidth;
-        if (resizableOpts.dragMode === 'fixed') {
-          visibleColumn.forEach(item => {
-            if (item.id !== resizeColumn.id) {
-              if (!item.resizeWidth) {
-                item.resizeWidth = item.renderWidth;
-              }
-            }
-          });
-        }
-        resizeBarElem.style.display = 'none';
-        tableReactData._isResize = false;
-        tableInternalData._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);
-        });
-        removeClass(tableEl, 'drag--resize');
-      };
-      updateEvent(evnt);
-      if ($xeTable.closeMenu) {
-        $xeTable.closeMenu();
-      }
-    };
     const renderRows = (isGroup, isOptimizeMode, cols, $rowIndex) => {
       const {
         fixedType
@@ -7218,6 +7149,10 @@ const header_renderType = 'header';
       } = tableInternalData;
       const columnOpts = computeColumnOpts.value;
       const columnDragOpts = computeColumnDragOpts.value;
+      const cellOpts = computeCellOpts.value;
+      const defaultRowHeight = computeDefaultRowHeight.value;
+      const headerCellOpts = computeHeaderCellOpts.value;
+      const currCellHeight = getCellHeight(headerCellOpts.height || cellOpts.height) || defaultRowHeight;
       const {
         disabledMethod: dragDisabledMethod,
         isCrossDrag,
@@ -7239,6 +7174,7 @@ const header_renderType = 'header';
         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().eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
         const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
         let showEllipsis = headOverflow === 'ellipsis';
@@ -7253,7 +7189,7 @@ const header_renderType = 'header';
         }
         const columnIndex = $xeTable.getColumnIndex(column);
         const _columnIndex = $xeTable.getVTColumnIndex(column);
-        const params = {
+        const cellParams = {
           $table: $xeTable,
           $grid: $xeTable.xegrid,
           $rowIndex,
@@ -7273,8 +7209,8 @@ const header_renderType = 'header';
           rowspan: column.rowSpan > 1 ? column.rowSpan : null
         };
         const thOns = {
-          onClick: evnt => $xeTable.triggerHeaderCellClickEvent(evnt, params),
-          onDblclick: evnt => $xeTable.triggerHeaderCellDblclickEvent(evnt, params)
+          onClick: evnt => $xeTable.triggerHeaderCellClickEvent(evnt, cellParams),
+          onDblclick: evnt => $xeTable.triggerHeaderCellDblclickEvent(evnt, cellParams)
         };
         // 横向虚拟滚动不支持动态行高
         if (scrollXLoad && !hasEllipsis) {
@@ -7283,11 +7219,11 @@ const header_renderType = 'header';
         const isColDragCell = columnOpts.drag && columnDragOpts.trigger === 'cell';
         let isDisabledDrag = false;
         if (isColDragCell) {
-          isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
+          isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(cellParams));
         }
         // 按下事件处理
         if (mouseConfig || isColDragCell) {
-          thOns.onMousedown = evnt => $xeTable.triggerHeaderCellMousedownEvent(evnt, params);
+          thOns.onMousedown = evnt => $xeTable.triggerHeaderCellMousedownEvent(evnt, cellParams);
         }
         // 拖拽列事件
         if (columnOpts.drag) {
@@ -7301,9 +7237,15 @@ const header_renderType = 'header';
         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 (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {
           class: ['vxe-header--column', colid, {
@@ -7315,14 +7257,15 @@ const header_renderType = 'header';
             '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
-          }, headerClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerClassName) ? headerClassName(params) : headerClassName : '', headerCellClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellClassName) ? headerCellClassName(params) : headerCellClassName : ''],
-          style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle : null,
+          }, headerClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerClassName) ? headerClassName(cellParams) : headerClassName : '', headerCellClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellClassName) ? headerCellClassName(cellParams) : headerCellClassName : ''],
+          style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle) ? headerCellStyle(cellParams) : headerCellStyle : null,
           ...thAttrs,
           ...thOns,
           key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
@@ -7331,17 +7274,21 @@ const header_renderType = 'header';
             'c--title': showTitle,
             'c--tooltip': showTooltip,
             'c--ellipsis': showEllipsis
-          }]
-        }, isPreLoadStatus || isOptimizeMode && fixedHiddenColumn ? [] : column.renderHeader(params)),
+          }],
+          style: tcStyle
+        }, isVNPreEmptyStatus || isOptimizeMode && fixedHiddenColumn ? [] : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          colid,
+          class: 'vxe-cell--wrapper'
+        }, column.renderHeader(cellParams))]),
         /**
          * 列宽拖动
          */
         !fixedHiddenColumn && showResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-          class: ['vxe-resizable', {
+          class: ['vxe-cell--col-resizable', {
             'is--line': !border || border === 'none'
           }],
-          onMousedown: evnt => resizeMousedownEvent(evnt, params),
-          onDblclick: evnt => $xeTable.handleResizeDblclickEvent(evnt, params)
+          onMousedown: evnt => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
+          onDblclick: evnt => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
         }) : header_renderEmptyElement($xeTable)]);
       });
     };
@@ -7354,6 +7301,7 @@ const header_renderType = 'header';
         headerRowStyle
       } = tableProps;
       const {
+        isColLoading,
         isDragColMove
       } = tableReactData;
       const columnOpts = computeColumnOpts.value;
@@ -7365,7 +7313,7 @@ const header_renderType = 'header';
           fixed: fixedType,
           type: header_renderType
         };
-        if (columnOpts.drag && columnDragOpts.animation) {
+        if (!isColLoading && columnOpts.drag && columnDragOpts.animation) {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
             key: $rowIndex,
             name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
@@ -7390,6 +7338,7 @@ const header_renderType = 'header';
         tableColumn
       } = props;
       const {
+        mouseConfig,
         showHeaderOverflow: allColumnHeaderOverflow,
         spanMethod,
         footerSpanMethod
@@ -7404,6 +7353,7 @@ const header_renderType = 'header';
         visibleColumn,
         fullColumnIdData
       } = tableInternalData;
+      const mouseOpts = computeMouseOpts.value;
       let renderHeaderList = headerColumn.value;
       let renderColumnList = tableColumn;
       let isOptimizeMode = false;
@@ -7490,14 +7440,21 @@ const header_renderType = 'header';
       */
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('thead', {
         ref: refHeaderTHead
-      }, renderHeads(isGroup, isOptimizeMode, renderHeaderList))])]),
-      /**
-       * 其他
-       */
-      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-        ref: refHeaderBorderRepair,
-        class: 'vxe-table--header-border-line'
-      })]);
+      }, renderHeads(isGroup, isOptimizeMode, renderHeaderList))]), mouseConfig && mouseOpts.area ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-table--cell-area'
+      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+        class: 'vxe-table--cell-main-area'
+      }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+        class: 'vxe-table--cell-copy-area'
+      }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+        class: 'vxe-table--cell-extend-area'
+      }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+        class: 'vxe-table--cell-multi-area'
+      }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+        class: 'vxe-table--cell-active-area'
+      }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+        class: 'vxe-table--cell-col-status-area'
+      })]) : header_renderEmptyElement($xeTable)])]);
     };
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.tableColumn, uploadColumn);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
@@ -7550,6 +7507,7 @@ const header_renderType = 'header';
 
 
 
+
 const {
   renderer: footer_renderer,
   renderEmptyElement: footer_renderEmptyElement
@@ -7610,7 +7568,11 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
     const {
       computeTooltipOpts,
       computeColumnOpts,
-      computeColumnDragOpts
+      computeColumnDragOpts,
+      computeCellOpts,
+      computeFooterCellOpts,
+      computeDefaultRowHeight,
+      computeResizableOpts
     } = $xeTable.getComputeMaps();
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refFooterScroll = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -7623,6 +7585,8 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         fixedType
       } = props;
       const {
+        resizable: allResizable,
+        border,
         footerCellClassName,
         footerCellStyle,
         footerAlign: allFooterAlign,
@@ -7642,7 +7606,15 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         scrollXStore
       } = tableInternalData;
       const tooltipOpts = computeTooltipOpts.value;
+      const resizableOpts = computeResizableOpts.value;
+      const {
+        isAllColumnDrag
+      } = resizableOpts;
       const columnOpts = computeColumnOpts.value;
+      const defaultRowHeight = computeDefaultRowHeight.value;
+      const cellOpts = computeCellOpts.value;
+      const footerCellOpts = computeFooterCellOpts.value;
+      const currCellHeight = getCellHeight(footerCellOpts.height || cellOpts.height) || defaultRowHeight;
       return tableColumn.map((column, $columnIndex) => {
         const {
           type,
@@ -7653,19 +7625,22 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           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';
         const showTitle = footOverflow === 'title';
         const showTooltip = footOverflow === true || footOverflow === 'tooltip';
         let hasEllipsis = showTitle || showTooltip || showEllipsis;
+        const showResizable = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
         const attrs = {
-          colid: column.id
+          colid
         };
         const tfOns = {};
         const columnIndex = $xeTable.getColumnIndex(column);
@@ -7754,9 +7729,15 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         }
         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 (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
           class: ['vxe-footer--column', column.id, {
@@ -7765,6 +7746,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
             'col--last': isLastColumn,
             'fixed--width': !isAutoCellWidth,
             'fixed--hidden': fixedHiddenColumn,
+            'is--padding': isPadding,
             'col--ellipsis': hasEllipsis,
             'col--current': currentColumn === column
           }, getPropClass(footerClassName, cellParams), getPropClass(footerCellClassName, cellParams)],
@@ -7777,8 +7759,22 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
             'c--title': showTitle,
             'c--tooltip': showTooltip,
             'c--ellipsis': showEllipsis
-          }]
-        }, isPreLoadStatus ? [] : column.renderFooter(cellParams))]);
+          }],
+          style: tcStyle
+        }, isVNPreEmptyStatus ? [] : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          colid,
+          class: 'vxe-cell--wrapper'
+        }, column.renderFooter(cellParams))]),
+        /**
+         * 列宽拖动
+         */
+        !fixedHiddenColumn && showResizable && isAllColumnDrag ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          class: ['vxe-cell--col-resizable', {
+            'is--line': !border || border === 'none'
+          }],
+          onMousedown: evnt => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
+          onDblclick: evnt => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
+        }) : footer_renderEmptyElement($xeTable)]);
       });
     };
     const renderHeads = renderColumnList => {
@@ -7791,6 +7787,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         footerRowStyle
       } = tableProps;
       const {
+        isColLoading,
         isDragColMove
       } = tableReactData;
       const columnOpts = computeColumnOpts.value;
@@ -7805,7 +7802,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           fixed: fixedType,
           type: footer_renderType
         };
-        if (columnOpts.drag && columnDragOpts.animation) {
+        if (!isColLoading && columnOpts.drag && columnDragOpts.animation) {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
             key: $rowIndex,
             name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
@@ -7992,10 +7989,10 @@ const {
     type: [Boolean, String],
     default: () => props_getConfig().table.border
   },
-  // 单元格是否有边距
+  // 已废弃，被 cell-config.padding 替换
   padding: {
     type: Boolean,
-    default: () => props_getConfig().table.padding
+    default: null
   },
   // 是否圆角边框
   round: {
@@ -8044,12 +8041,18 @@ const {
     type: Boolean,
     default: () => props_getConfig().table.highlightHoverRow
   },
-  // （即将废弃）是否要高亮当前选中列
+  /**
+   * （即将废弃）是否要高亮当前选中列
+   * @deprecated
+   */
   highlightCurrentColumn: {
     type: Boolean,
     default: () => props_getConfig().table.highlightCurrentColumn
   },
-  // （即将废弃）鼠标移到列是否要高亮显示
+  /**
+   * （即将废弃）鼠标移到列是否要高亮显示
+   * @deprecated
+   */
   highlightHoverColumn: {
     type: Boolean,
     default: () => props_getConfig().table.highlightHoverColumn
@@ -8141,6 +8144,10 @@ const {
   columnConfig: Object,
   // 单元格配置信息
   cellConfig: Object,
+  // 表头单元格配置信息
+  headerCellConfig: Object,
+  // 表尾单元格配置信息
+  footerCellConfig: Object,
   // 行配置信息
   rowConfig: Object,
   // 已废弃，被 rowDragConfig 替换
@@ -8221,7 +8228,7 @@ const {
   params: Object
 });
 ;// ./packages/table/src/emits.ts
-/* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'checkbox-range-select', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'cell-selected', 'cell-delete-value', 'cell-backspace-value', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'row-dragstart', 'row-dragover', 'row-dragend', 'column-dragstart', 'column-dragover', 'column-dragend', 'enter-append-row', 'edit-actived', 'edit-activated', 'edit-disabled', 'valid-error', 'scroll', 'scroll-boundary', 'custom', 'change-fnr', 'open-fnr', 'show-fnr', 'hide-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-selection', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-invalid', 'cell-area-selection-start', 'cell-area-selection-drag', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-drag', 'cell-area-extension-end', 'cell-area-selection-all-start', 'cell-area-selection-all-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-change-start', 'active-cell-change-end']);
+/* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'checkbox-range-select', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'cell-selected', 'cell-delete-value', 'cell-backspace-value', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'column-resizable-change', 'row-resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'row-dragstart', 'row-dragover', 'row-dragend', 'column-dragstart', 'column-dragover', 'column-dragend', 'enter-append-row', 'edit-actived', 'edit-activated', 'edit-disabled', 'valid-error', 'scroll', 'scroll-boundary', 'custom', 'change-fnr', 'open-fnr', 'show-fnr', 'hide-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-selection', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-invalid', 'cell-area-selection-start', 'cell-area-selection-drag', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-drag', 'cell-area-extension-end', 'cell-area-selection-all-start', 'cell-area-selection-all-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-change-start', 'active-cell-change-end']);
 ;// ./packages/table/module/custom/panel.ts
 
 
@@ -10332,7 +10339,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       computeSize
     } = useFns.useSize(props);
     const reactData = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)({
-      isCalcColumn: false,
       // 低性能的静态列
       staticColumns: [],
       // 渲染的列分组
@@ -10545,15 +10551,17 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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,
+      isRowLoading: false,
+      isColLoading: false
     });
     const internalData = {
       tZindex: 0,
@@ -10627,10 +10635,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
-      // 列选取状态
-      columnStatusMaps: {},
-      // 行选取状态
-      rowStatusMaps: {},
       // prevDragRow: null,
       inited: false,
       tooltipTimeout: null,
@@ -10658,8 +10662,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const refTableRightFooter = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refLeftContainer = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refRightContainer = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
-    const refCellResizeBar = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
-    const refCellResizeTip = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const refColResizeBar = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const refRowResizeBar = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refEmptyPlaceholder = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refDragTipElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refDragRowLineElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -10758,7 +10762,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const computeDefaultRowHeight = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const vSize = computeSize.value;
       const rowHeightMaps = computeRowHeightMaps.value;
-      return rowHeightMaps[vSize || 'default'];
+      return rowHeightMaps[vSize || 'default'] || 18;
     });
     const computeColumnOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, table_getConfig().table.columnConfig, props.columnConfig);
@@ -10766,6 +10770,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const computeCellOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, table_getConfig().table.cellConfig, props.cellConfig);
     });
+    const computeHeaderCellOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      return Object.assign({}, table_getConfig().table.headerCellConfig, props.headerCellConfig);
+    });
+    const computeFooterCellOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      return Object.assign({}, table_getConfig().table.footerCellConfig, props.footerCellConfig);
+    });
     const computeRowOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, table_getConfig().table.rowConfig, props.rowConfig);
     });
@@ -10795,6 +10805,17 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const computeTooltipOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, table_getConfig().tooltip, table_getConfig().table.tooltipConfig, props.tooltipConfig);
     });
+    const computeTableTipConfig = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const {
+        tooltipStore
+      } = reactData;
+      const tooltipOpts = computeTooltipOpts.value;
+      return Object.assign({}, tooltipOpts, tooltipStore.currOpts);
+    });
+    const computeValidTipConfig = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const tooltipOpts = computeTooltipOpts.value;
+      return Object.assign({}, tooltipOpts);
+    });
     const computeEditOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, table_getConfig().table.editConfig, props.editConfig);
     });
@@ -11025,8 +11046,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       refTableRightFooter,
       refLeftContainer,
       refRightContainer,
-      refCellResizeBar,
-      refCellResizeTip,
+      refColResizeBar,
+      refRowResizeBar,
       refScrollXVirtualElem,
       refScrollYVirtualElem,
       refScrollXHandleElem,
@@ -11048,6 +11069,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       computeScrollYThreshold,
       computeDefaultRowHeight,
       computeCellOpts,
+      computeHeaderCellOpts,
+      computeFooterCellOpts,
       computeRowOpts,
       computeRowDragOpts,
       computeColumnDragOpts,
@@ -11198,59 +11221,66 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       };
     };
     const computeRowHeight = () => {
+      const {
+        isAllOverflow
+      } = reactData;
       const tableHeader = refTableHeader.value;
       const tableBody = refTableBody.value;
       const tableBodyElem = tableBody ? tableBody.$el : null;
       const defaultRowHeight = computeDefaultRowHeight.value;
       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 (isAllOverflow) {
+        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);
     };
-    const handleVirtualYVisible = () => {
-      const {
-        showOverflow
-      } = props;
+    const handleVirtualYVisible = currScrollTop => {
       const {
-        rowHeight
+        isAllOverflow
       } = reactData;
       const {
         elemStore,
+        isResizeCellHeight,
         afterFullData,
         fullAllDataRowIdData
       } = internalData;
+      const rowOpts = computeRowOpts.value;
+      const cellOpts = computeCellOpts.value;
+      const defaultRowHeight = computeDefaultRowHeight.value;
       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 && isAllOverflow) {
+          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;
+            const rowRest = fullAllDataRowIdData[rowid] || {};
+            offsetTop += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
             if (toVisibleIndex === -1 && scrollTop < offsetTop) {
               toVisibleIndex = rIndex;
             }
@@ -11641,56 +11671,40 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       internalData.customMaxHeight = calcTableHeight('maxHeight');
     };
     const 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;
     };
     const calcCellWidth = () => {
       const autoWidthColumnList = computeAutoWidthColumnList.value;
-      reactData.isCalcColumn = true;
-      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
-        const {
-          fullColumnIdData
-        } = internalData;
-        const el = refElem.value;
-        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 = refElem.value;
+      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');
+      }
     };
     /**
      * 列宽算法，计算单元格列宽，动态分配可用剩余空间
@@ -11746,39 +11760,39 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       });
       // 最小自适应
       autoMinList.forEach(column => {
-        const scaleWidth = Math.max(60, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.renderAutoWidth));
-        tableWidth += scaleWidth;
-        column.renderWidth = scaleWidth;
+        const caWidth = Math.max(60, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.renderAutoWidth));
+        tableWidth += caWidth;
+        column.renderWidth = caWidth;
       });
       // 最小百分比
       scaleMinList.forEach(column => {
-        const scaleWidth = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.minWidth) * meanWidth);
-        tableWidth += scaleWidth;
-        column.renderWidth = scaleWidth;
+        const smWidth = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.minWidth) * meanWidth);
+        tableWidth += smWidth;
+        column.renderWidth = smWidth;
       });
       // 固定百分比
       scaleList.forEach(column => {
-        const scaleWidth = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.width) * meanWidth);
-        tableWidth += scaleWidth;
-        column.renderWidth = scaleWidth;
+        const sfWidth = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.width) * meanWidth);
+        tableWidth += sfWidth;
+        column.renderWidth = sfWidth;
       });
       // 固定宽
       pxList.forEach(column => {
-        const width = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.width);
-        tableWidth += width;
-        column.renderWidth = width;
+        const pWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.width);
+        tableWidth += pWidth;
+        column.renderWidth = pWidth;
       });
       // 自适应宽
       autoList.forEach(column => {
-        const width = Math.max(60, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.renderAutoWidth));
-        tableWidth += width;
-        column.renderWidth = width;
+        const aWidth = Math.max(60, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.renderAutoWidth));
+        tableWidth += aWidth;
+        column.renderWidth = aWidth;
       });
       // 调整了列宽
       resizeList.forEach(column => {
-        const width = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.resizeWidth);
-        tableWidth += width;
-        column.renderWidth = width;
+        const reWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.resizeWidth);
+        tableWidth += reWidth;
+        column.renderWidth = reWidth;
       });
       remainWidth -= tableWidth;
       meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + autoMinList.length + remainList.length)) : 0;
@@ -11818,7 +11832,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }
       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;
@@ -11827,7 +11841,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       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;
@@ -11837,64 +11851,43 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         $xeTable.checkScrolling();
       }
     };
-    // const updateCellOffset = () => {
-    //   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 colHeight = rowRest.height;
+      for (let i = 0; i < cellElemList.length; i++) {
+        const cellElem = cellElemList[i];
+        const tdEl = cellElem.parentElement;
+        const topBottomPadding = Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(tdEl.style.paddingTop) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(tdEl.style.paddingBottom));
+        const cellHeight = cellElem ? cellElem.clientHeight : 0;
+        colHeight = Math.max(colHeight - topBottomPadding, Math.ceil(cellHeight));
+      }
+      return colHeight;
+    };
     const calcCellHeight = () => {
-      const {
-        showOverflow
-      } = props;
       const {
         tableData,
+        isAllOverflow,
+        scrollYLoad,
         scrollXLoad
       } = reactData;
       const {
         fullAllDataRowIdData
       } = internalData;
+      const defaultRowHeight = computeDefaultRowHeight.value;
       const el = refElem.value;
-      if (!showOverflow && el) {
-        let paddingTop = 0;
-        let paddingBottom = 0;
-        let calcPadding = false;
+      if (!isAllOverflow && scrollYLoad && el) {
+        el.setAttribute('data-calc-row', 'Y');
         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 reHeight = calcCellAutoHeight(rowRest, el);
+            rowRest.height = Math.max(defaultRowHeight, scrollXLoad ? Math.max(rowRest.height, reHeight) : reHeight);
           }
+          el.removeAttribute('data-calc-row');
         });
-        reactData.isCalcCellHeight++;
+        reactData.calcCellHeightFlag++;
       }
-      // updateCellOffset()
     };
     const getOrderField = column => {
       const {
@@ -11948,6 +11941,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             parent: null,
             level: 0,
             height: 0,
+            resizeHeight: 0,
             oTop: 0
           };
           fullAllDataRowIdData[rowid] = rest;
@@ -11997,6 +11991,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               parent: null,
               level: 0,
               height: 0,
+              resizeHeight: 0,
               oTop: 0
             };
             fullAllDataRowIdData[rowid] = rest;
@@ -12266,7 +12261,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const updateStyle = () => {
       const {
         border,
-        showOverflow: allColumnOverflow,
         showHeaderOverflow: allColumnHeaderOverflow,
         showFooterOverflow: allColumnFooterOverflow,
         mouseConfig,
@@ -12279,7 +12273,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tableColumn,
         scrollXLoad,
         scrollYLoad,
+        overflowX,
         scrollbarWidth,
+        overflowY,
         scrollbarHeight,
         columnStore,
         editStore,
@@ -12303,6 +12299,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return;
       }
       const containerList = ['main', 'left', 'right'];
+      const osbWidth = overflowY ? scrollbarWidth : 0;
+      const osbHeight = overflowX ? scrollbarHeight : 0;
       const emptyPlaceholderElem = refEmptyPlaceholder.value;
       const cellOffsetWidth = computeCellOffsetWidth.value;
       const mouseOpts = computeMouseOpts.value;
@@ -12310,16 +12308,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       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) {
@@ -12337,27 +12335,27 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const scrollbarXToTop = computeScrollbarXToTop.value;
       const scrollXVirtualEl = refScrollXVirtualElem.value;
       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 xWrapperEl = refScrollXWrapperElem.value;
       if (xWrapperEl) {
-        xWrapperEl.style.left = scrollbarXToTop ? `${scrollbarWidth}px` : '';
-        xWrapperEl.style.width = `${el.clientWidth - scrollbarWidth}px`;
+        xWrapperEl.style.left = scrollbarXToTop ? `${osbWidth}px` : '';
+        xWrapperEl.style.width = `${el.clientWidth - osbWidth}px`;
       }
       if (xLeftCornerEl) {
-        xLeftCornerEl.style.width = scrollbarXToTop ? `${scrollbarWidth}px` : '';
-        xLeftCornerEl.style.display = scrollbarXToTop ? scrollbarWidth && scrollbarHeight ? 'block' : '' : '';
+        xLeftCornerEl.style.width = scrollbarXToTop ? `${osbWidth}px` : '';
+        xLeftCornerEl.style.display = scrollbarXToTop ? osbWidth && osbHeight ? 'block' : '' : '';
       }
       if (xRightCornerEl) {
-        xRightCornerEl.style.width = scrollbarXToTop ? '' : `${scrollbarWidth}px`;
-        xRightCornerEl.style.display = scrollbarXToTop ? '' : scrollbarWidth && scrollbarHeight ? 'block' : '';
+        xRightCornerEl.style.width = scrollbarXToTop ? '' : `${osbWidth}px`;
+        xRightCornerEl.style.display = scrollbarXToTop ? '' : osbWidth && osbHeight ? 'block' : '';
       }
       const scrollYVirtualEl = refScrollYVirtualElem.value;
       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 = refScrollYTopCornerElem.value;
       if (yTopCornerEl) {
@@ -12476,14 +12474,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               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;
             let renderColumnList = tableColumn;
             let isOptimizeMode = false;
             // 如果是使用优化模式
-            if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+            if (scrollXLoad || scrollYLoad || isAllOverflow) {
               if (expandColumn || spanMethod || footerSpanMethod) {
                 // 如果不支持优化模式
               } else {
@@ -12505,7 +12503,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             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) {
@@ -12540,7 +12538,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               // 如果是固定列
               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`;
                 }
               }
             }
@@ -12567,7 +12565,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 } else if (layout === 'footer') {
                   cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showFooterOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
                 } else {
-                  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;
+                  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) ? isAllOverflow : showOverflow;
                 }
                 const showEllipsis = cellOverflow === 'ellipsis';
                 const showTitle = cellOverflow === 'title';
@@ -13196,16 +13194,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           scrollXStore,
           scrollYStore
         } = internalData;
-        const sYOpts = computeSYOpts.value;
-        const sXOpts = computeSXOpts.value;
+        const virtualYOpts = computeVirtualYOpts.value;
+        const virtualXOpts = computeVirtualXOpts.value;
         // 计算 X 逻辑
         if (scrollXLoad) {
           const {
             toVisibleIndex: toXVisibleIndex,
             visibleSize: visibleXSize
           } = handleVirtualXVisible();
-          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);
@@ -13217,7 +13215,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } else {
           $xeTable.updateScrollXSpace();
         }
-        calcCellHeight();
         // 计算 Y 逻辑
         const rowHeight = computeRowHeight();
         scrollYStore.rowHeight = rowHeight;
@@ -13227,8 +13224,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           visibleSize: visibleYSize
         } = handleVirtualYVisible();
         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);
@@ -13257,7 +13254,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       return computeScrollLoad().then(() => {
         if (reFull === true) {
           // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
-          calcCellHeight();
           calcCellWidth();
           autoCellWidth();
           updateStyle();
@@ -13269,11 +13265,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
      * 加载表格数据
      * @param {Array} datas 数据
      */
-    const loadTableData = datas => {
+    const loadTableData = (datas, isReset) => {
       const {
         keepSource,
-        treeConfig,
-        showOverflow
+        treeConfig
       } = props;
       const {
         editStore,
@@ -13286,7 +13281,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         lastScrollTop
       } = internalData;
       const treeOpts = computeTreeOpts.value;
-      const rowOpts = computeRowOpts.value;
       const {
         transform
       } = treeOpts;
@@ -13333,42 +13327,30 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       scrollYStore.endIndex = 1;
       scrollXStore.startIndex = 0;
       scrollXStore.endIndex = 1;
+      reactData.isRowLoading = true;
       reactData.scrollVMLoading = false;
       editStore.insertMaps = {};
       editStore.removeMaps = {};
       const sYLoad = updateScrollYStatus(fullData);
+      reactData.isDragColMove = false;
       reactData.isDragRowMove = false;
       // 全量数据
       internalData.tableFullData = fullData;
       internalData.tableFullTreeData = treeData;
       // 缓存数据
-      tablePrivateMethods.cacheRowMap(true);
+      $xeTable.cacheRowMap(true, isReset);
       // 原始数据
       internalData.tableSynchData = datas;
+      if (isReset) {
+        internalData.isResizeCellHeight = false;
+        reactData.rowExpandedMaps = {};
+        reactData.rowExpandLazyLoadedMaps = {};
+        reactData.treeExpandedMaps = {};
+        reactData.treeExpandLazyLoadedMaps = {};
+      }
       // 克隆原数据，用于显示编辑状态，与编辑值做对比
       if (keepSource) {
-        tablePrivateMethods.cacheSourceMap(fullData);
-      }
-      if (sYLoad) {
-        if (showOverflow) {
-          if (!rowOpts.height) {
-            const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
-            if (errColumn) {
-              errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
-            }
-          }
-        }
-        if (true) {
-          if (!(props.height || props.maxHeight)) {
-            errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-          }
-          // if (!props.showOverflow) {
-          //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-          // }
-          if (props.spanMethod) {
-            warnLog('vxe.error.scrollErrProp', ['table.span-method']);
-          }
-        }
+        $xeTable.cacheSourceMap(fullData);
       }
       if ($xeTable.clearCellAreas && props.mouseConfig) {
         $xeTable.clearCellAreas();
@@ -13388,6 +13370,27 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         if (sYLoad) {
           scrollYStore.endIndex = scrollYStore.visibleSize;
         }
+        if (sYLoad) {
+          // if (showOverflow) {
+          //   if (!rowOpts.height) {
+          //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+          //     if (errColumn) {
+          //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+          //     }
+          //   }
+          // }
+          if (true) {
+            if (!(props.height || props.maxHeight)) {
+              errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+            }
+            // if (!props.showOverflow) {
+            //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+            // }
+            if (props.spanMethod) {
+              warnLog('vxe.error.scrollErrProp', ['table.span-method']);
+            }
+          }
+        }
         handleReserveStatus();
         tablePrivateMethods.checkSelectionStatus();
         return new Promise(resolve => {
@@ -13403,6 +13406,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             if (sYOpts.scrollToTopOnChange) {
               targetScrollTop = 0;
             }
+            reactData.isRowLoading = false;
+            calcCellHeight();
             // 是否变更虚拟滚动
             if (oldScrollYLoad === sYLoad) {
               restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop).then(() => {
@@ -13665,11 +13670,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       internalData.collectColumn = collectColumn;
       const tableFullColumn = getColumnList(collectColumn);
       internalData.tableFullColumn = tableFullColumn;
-      reactData.isLoading = true;
+      reactData.isColLoading = true;
       reactData.isDragColMove = false;
       initColumnSort();
       return Promise.resolve(restoreCustomStorage()).then(() => {
-        reactData.isLoading = false;
         cacheColumnMap();
         parseColumns(true).then(() => {
           if (reactData.scrollXLoad) {
@@ -13694,6 +13698,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if ($xeTable.handleUpdateCustomColumn) {
             $xeTable.handleUpdateCustomColumn();
           }
+          reactData.isColLoading = false;
           return $xeTable.recalculate();
         });
       });
@@ -13835,12 +13840,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     /**
      * 纵向 Y 可视渲染处理
      */
-    const loadScrollYData = () => {
+    const loadScrollYData = scrollTop => {
       const {
-        showOverflow
-      } = props;
-      const {
-        mergeList
+        mergeList,
+        isAllOverflow
       } = reactData;
       const {
         scrollYStore
@@ -13851,11 +13854,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         endIndex,
         offsetSize
       } = scrollYStore;
-      const autoOffsetYSize = showOverflow ? offsetSize : offsetSize + 1;
+      const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
       const {
         toVisibleIndex,
         visibleSize
-      } = handleVirtualYVisible();
+      } = handleVirtualYVisible(scrollTop);
       const offsetItem = {
         startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize - preloadSize),
         endIndex: toVisibleIndex + visibleSize + autoOffsetYSize + preloadSize
@@ -13913,7 +13916,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const {
         visibleSize
       } = scrollXStore;
-      const fpsTime = Math.max(5, Math.min(80, Math.floor(visibleSize * 3)));
+      const fpsTime = Math.max(5, Math.min(10, Math.floor(visibleSize / 3)));
       if (lxTimeout) {
         clearTimeout(lxTimeout);
       }
@@ -13928,9 +13931,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }, fpsTime);
     };
     const lazyScrollYData = () => {
-      const {
-        showOverflow
-      } = props;
       const {
         lyTimeout,
         lyRunTime,
@@ -13939,7 +13939,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const {
         visibleSize
       } = scrollYStore;
-      const fpsTime = showOverflow ? 5 : Math.max(5, Math.min(80, Math.floor(visibleSize / 2)));
+      const fpsTime = Math.floor(Math.max(4, Math.min(10, visibleSize / 3)));
       if (lyTimeout) {
         clearTimeout(lyTimeout);
       }
@@ -13967,27 +13967,63 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       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();
         if (isRollX && scrollXLoad) {
-          $xeTable.updateScrollXData().then(() => {
-            calcCellHeight();
-            loadScrollXData();
-          });
+          $xeTable.updateScrollXData();
         }
         if (isRollY && scrollYLoad) {
           $xeTable.updateScrollYData().then(() => {
             calcCellHeight();
-            loadScrollYData();
+            $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);
+    };
     const dispatchEvent = (type, params, evnt) => {
       emit(type, createEvent(evnt, {
         $table: $xeTable,
@@ -14004,12 +14040,31 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
     };
-    function handleUupdateResize() {
+    const handleUpdateResize = () => {
       const el = refElem.value;
       if (el && el.clientWidth && el.clientHeight) {
         tableMethods.recalculate();
       }
-    }
+    };
+    const handleUpdateColResize = (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 = (evnt, params) => {
+      reactData.resizeHeightFlag++;
+      $xeTable.recalculate(true).then(() => {
+        $xeTable.updateCellAreas();
+        $xeTable.dispatchEvent('row-resizable-change', params, evnt);
+        setTimeout(() => $xeTable.recalculate(true), 300);
+      });
+    };
     tableMethods = {
       dispatchEvent,
       /**
@@ -14067,7 +14122,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const {
           initStatus
         } = internalData;
-        return loadTableData(datas).then(() => {
+        return loadTableData(datas, false).then(() => {
           internalData.inited = true;
           internalData.initStatus = true;
           if (!initStatus) {
@@ -14084,7 +14139,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return tableMethods.clearAll().then(() => {
           internalData.inited = true;
           internalData.initStatus = true;
-          return loadTableData(datas);
+          return loadTableData(datas, true);
         }).then(() => {
           handleLoadDefaults();
           return tableMethods.recalculate();
@@ -14203,6 +14258,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               parent: parentRow,
               level: parentLevel + nodes.length,
               height: 0,
+              resizeHeight: 0,
               oTop: 0
             };
             fullDataRowIdData[rowid] = rest;
@@ -14443,29 +14499,32 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       getCellElement(row, fieldOrColumn) {
+        const {
+          elemStore
+        } = internalData;
         const column = handleFieldOrColumn($xeTable, fieldOrColumn);
         if (!column) {
           return null;
         }
         const rowid = getRowid($xeTable, row);
-        const tableBody = refTableBody.value;
-        const leftBody = refTableLeftBody.value;
-        const rightBody = refTableRightBody.value;
+        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) {
           if (column.fixed) {
             if (column.fixed === 'left') {
-              if (leftBody) {
-                bodyElem = leftBody.$el;
+              if (leftScrollElem) {
+                bodyElem = leftScrollElem;
               }
             } else {
-              if (rightBody) {
-                bodyElem = rightBody.$el;
+              if (rightScrollElem) {
+                bodyElem = rightScrollElem;
               }
             }
           }
           if (!bodyElem) {
-            bodyElem = tableBody.$el;
+            bodyElem = bodyScrollElem;
           }
           if (bodyElem) {
             return bodyElem.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);
@@ -14938,29 +14997,40 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       setColumnWidth(fieldOrColumn, width) {
+        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 tableBody = refTableBody.value;
-              const bodyElem = tableBody ? tableBody.$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 tableMethods.refreshColumn();
         }
-        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+          return {
+            status
+          };
+        });
       },
       getColumnWidth(fieldOrColumn) {
         const column = handleFieldOrColumn($xeTable, fieldOrColumn);
@@ -14993,6 +15063,106 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           return tableMethods.recalculate();
         });
       },
+      setRowHeightConf(heightConf) {
+        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 (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+          return {
+            status
+          };
+        });
+      },
+      getRowHeightConf(isFull) {
+        const {
+          fullAllDataRowIdData,
+          afterFullData
+        } = internalData;
+        const rowOpts = computeRowOpts.value;
+        const cellOpts = computeCellOpts.value;
+        const defaultRowHeight = computeDefaultRowHeight.value;
+        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 || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+              rest[rowid] = currCellHeight;
+            }
+          }
+        });
+        return rest;
+      },
+      setRowHeight(rowOrId, height) {
+        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 = refTableBody.value;
+          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++;
+          }
+        }
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+          return {
+            status
+          };
+        });
+      },
+      getRowHeight(rowOrId) {
+        const {
+          fullAllDataRowIdData
+        } = internalData;
+        const rowOpts = computeRowOpts.value;
+        const cellOpts = computeCellOpts.value;
+        const defaultRowHeight = computeDefaultRowHeight.value;
+        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];
+        if (rowRest) {
+          return rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+        }
+        return 0;
+      },
       /**
        * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
        */
@@ -16203,13 +16373,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           scrollXLoad,
           scrollYLoad
         } = reactData;
-        const tableBody = refTableBody.value;
-        const bodyElem = tableBody.$el;
+        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
         };
       },
       /**
@@ -16260,9 +16432,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        */
       scrollToRow(row, fieldOrColumn) {
         const {
-          showOverflow
-        } = props;
-        const {
+          isAllOverflow,
           scrollYLoad,
           scrollXLoad
         } = reactData;
@@ -16279,7 +16449,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
         return Promise.all(rest).then(() => {
           if (row) {
-            if (!showOverflow && (scrollYLoad || scrollXLoad)) {
+            if (!isAllOverflow && (scrollYLoad || scrollXLoad)) {
               calcCellHeight();
               calcCellWidth();
             }
@@ -17349,13 +17519,17 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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) {
@@ -17366,14 +17540,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             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 ? scrollbarWidth : 0}px`;
+            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 {
@@ -17398,7 +17572,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               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;
             }
@@ -17409,7 +17583,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             if (prevDragToChild) {
               cdLineEl.style.height = `${thRect.height}px`;
             } else {
-              cdLineEl.style.height = `${tableHeight - offsetTop - (scrollbarXToTop ? 0 : scrollbarHeight)}px`;
+              cdLineEl.style.height = `${tableHeight - offsetTop - (scrollbarXToTop ? 0 : osbHeight)}px`;
             }
             cdLineEl.setAttribute('drag-pos', dragPos);
             cdLineEl.setAttribute('drag-to-child', prevDragToChild ? 'y' : 'n');
@@ -17445,11 +17619,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
      * @param {Event} evnt 事件
      * @param {Row} row 行对象
      */
-    const handleTooltip = (evnt, cell, overflowElem, tipElem, params) => {
+    const handleTooltip = (evnt, tdEl, overflowElem, tipElem, params) => {
       if (!overflowElem) {
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       }
-      params.cell = cell;
+      params.cell = tdEl;
       const {
         tooltipStore
       } = reactData;
@@ -17621,9 +17795,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       },
       /**
        * 更新数据行的 Map
-       * 牺牲数据组装的耗时，用来换取使用过程中的流畅
        */
-      cacheRowMap(isSource) {
+      cacheRowMap(isReset, isSource) {
         const {
           treeConfig
         } = props;
@@ -17651,7 +17824,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             row[childrenField] = null;
           }
           let cacheItem = fullAllDataRowIdData[rowid];
-          if (!cacheItem) {
+          if (isReset || !cacheItem) {
             cacheItem = {
               row,
               rowid,
@@ -17664,6 +17837,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               parent: parentRow,
               level,
               height: 0,
+              resizeHeight: 0,
               oTop: 0
             };
           }
@@ -17777,13 +17951,167 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           remainList
         });
       },
-      handleResizeDblclickEvent(evnt, params) {
+      handleColResizeMousedownEvent(evnt, fixedType, params) {
+        evnt.stopPropagation();
+        evnt.preventDefault();
+        const {
+          column
+        } = params;
+        const {
+          overflowX,
+          scrollbarHeight
+        } = reactData;
+        const {
+          elemStore,
+          visibleColumn
+        } = internalData;
+        const resizableOpts = computeResizableOpts.value;
+        const osbHeight = overflowX ? scrollbarHeight : 0;
+        const tableEl = refElem.value;
+        const leftContainerElem = refLeftContainer.value;
+        const rightContainerElem = refRightContainer.value;
+        const resizeBarElem = refColResizeBar.value;
+        if (!resizeBarElem) {
+          return;
+        }
+        const resizeTipElem = resizeBarElem.firstElementChild;
+        const scrollbarXToTop = computeScrollbarXToTop.value;
+        const {
+          clientX: dragClientX
+        } = evnt;
+        const wrapperElem = refElem.value;
+        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 = table_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;
+        };
+        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';
+          internalData._lastResizeTime = Date.now();
+          setTimeout(() => {
+            reactData.isDragResize = false;
+          }, 50);
+          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(evnt, resizeParams);
+          }
+          removeClass(tableEl, 'col-drag--resize');
+        };
+        updateEvent(evnt);
+        if ($xeTable.closeMenu) {
+          $xeTable.closeMenu();
+        }
+      },
+      handleColResizeDblclickEvent(evnt, params) {
         const resizableOpts = computeResizableOpts.value;
         const {
           isDblclickAutoWidth
         } = resizableOpts;
         const el = refElem.value;
         if (isDblclickAutoWidth && el) {
+          evnt.stopPropagation();
+          evnt.preventDefault();
           const {
             fullColumnIdData
           } = internalData;
@@ -17804,23 +18132,195 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             cell
           });
           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);
           }
-          resizeColumn.resizeWidth = Math.max(colMinWidth, resizeWidth);
-          reactData._isResize = false;
+          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(evnt, resizeParams);
+          }
+        }
+      },
+      handleRowResizeMousedownEvent(evnt, params) {
+        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 = computeScrollbarYToLeft.value;
+        const resizableOpts = computeResizableOpts.value;
+        const rowOpts = computeRowOpts.value;
+        const cellOpts = computeCellOpts.value;
+        const tableEl = refElem.value;
+        const resizeBarElem = refRowResizeBar.value;
+        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 = computeDefaultRowHeight.value;
+        const currCellHeight = rowRest.resizeHeight || rowRest.height || 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 = table_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;
+        };
+        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';
           internalData._lastResizeTime = Date.now();
-          $xeTable.analyColumnWidth();
-          $xeTable.recalculate(true).then(() => {
-            $xeTable.saveCustomStore('update:visible');
-            $xeTable.updateCellAreas();
-            $xeTable.dispatchEvent('resizable-change', {
+          setTimeout(() => {
+            reactData.isDragResize = false;
+          }, 50);
+          if (resizeHeight !== currCellHeight) {
+            const resizeParams = {
               ...params,
-              resizeWidth
-            }, evnt);
-            setTimeout(() => $xeTable.recalculate(true), 300);
-          });
+              resizeHeight,
+              resizeRow: row
+            };
+            internalData.isResizeCellHeight = true;
+            if ($xeTable.handleRowResizeCellAreaEvent) {
+              $xeTable.handleRowResizeCellAreaEvent(evnt, resizeParams);
+            } else {
+              rowRest.resizeHeight = resizeHeight;
+              handleUpdateRowResize(evnt, resizeParams);
+            }
+          }
+          removeClass(tableEl, 'row-drag--resize');
+        };
+        updateEvent(evnt);
+      },
+      handleRowResizeDblclickEvent(evnt, params) {
+        const resizableOpts = computeResizableOpts.value;
+        const {
+          isDblclickAutoHeight
+        } = resizableOpts;
+        const el = refElem.value;
+        if (isDblclickAutoHeight && el) {
+          evnt.stopPropagation();
+          evnt.preventDefault();
+          const {
+            editStore
+          } = reactData;
+          const {
+            fullAllDataRowIdData
+          } = internalData;
+          const {
+            actived
+          } = editStore;
+          const {
+            row
+          } = params;
+          const rowid = getRowid($xeTable, row);
+          const rowRest = fullAllDataRowIdData[rowid];
+          if (!rowRest) {
+            return;
+          }
+          const handleRsHeight = () => {
+            el.setAttribute('data-calc-row', 'Y');
+            const resizeHeight = calcCellAutoHeight(rowRest, el);
+            el.removeAttribute('data-calc-row');
+            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(evnt, resizeParams);
+            }
+          };
+          if (actived.row || actived.column) {
+            $xeTable.clearEdit().then(handleRsHeight);
+          } else {
+            handleRsHeight();
+          }
         }
       },
       saveCustomStore(type) {
@@ -18226,10 +18726,21 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const {
           column
         } = params;
-        const titleElem = evnt.currentTarget;
         handleTargetEnterEvent(true);
+        const titleElem = evnt.currentTarget;
+        if (!titleElem) {
+          return;
+        }
+        const cellEl = titleElem.parentElement;
+        if (!cellEl) {
+          return;
+        }
+        const thEl = cellEl.parentElement;
+        if (!thEl) {
+          return;
+        }
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-          handleTooltip(evnt, titleElem, titleElem, null, params);
+          handleTooltip(evnt, thEl, cellEl, null, params);
         }
       },
       /**
@@ -18253,7 +18764,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           row,
           column
         } = params;
-        const cell = evnt.currentTarget;
+        const tdEl = evnt.currentTarget;
         handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row !== row);
         // 单元格处于编辑状态时不触发提示框
         if (column.editRender && isEnableConf(editConfig)) {
@@ -18267,17 +18778,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           }
         }
         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');
-          }
-          handleTooltip(evnt, cell, overflowElem || cell.children[0], tipElem, params);
+          handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), null, params);
         }
       },
       /**
@@ -18293,7 +18794,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const cell = evnt.currentTarget;
         handleTargetEnterEvent(tooltipStore.column !== column || !!tooltipStore.row);
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-          handleTooltip(evnt, cell, cell.querySelector('.vxe-cell--item') || cell.children[0], null, params);
+          handleTooltip(evnt, cell, cell.querySelector('.vxe-cell--wrapper') || cell.children[0], null, params);
         }
       },
       handleTargetLeaveEvent() {
@@ -18306,11 +18807,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           internalData.tooltipTimeout = setTimeout(() => {
             $tooltip = refTooltip.value;
             if ($tooltip && $tooltip.isActived && !$tooltip.isActived()) {
-              tableMethods.closeTooltip();
+              $xeTable.closeTooltip();
             }
           }, tooltipOpts.leaveDelay);
         } else {
-          tableMethods.closeTooltip();
+          $xeTable.closeTooltip();
         }
       },
       triggerHeaderCellClickEvent(evnt, params) {
@@ -18355,8 +18856,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           editConfig
         } = props;
         const {
-          editStore
+          editStore,
+          isDragResize
         } = reactData;
+        if (isDragResize) {
+          return;
+        }
         const expandOpts = computeExpandOpts.value;
         const editOpts = computeEditOpts.value;
         const treeOpts = computeTreeOpts.value;
@@ -18466,8 +18971,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           editConfig
         } = props;
         const {
-          editStore
+          editStore,
+          isDragResize
         } = reactData;
+        if (isDragResize) {
+          return;
+        }
         const editOpts = computeEditOpts.value;
         const {
           actived
@@ -18758,13 +19267,19 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        */
       triggerSortEvent(evnt, column, order) {
         const sortOpts = computeSortOpts.value;
+        const {
+          multiple,
+          allowClear
+        } = sortOpts;
         const {
           field,
           sortable
         } = column;
         if (sortable) {
           if (!order || column.order === order) {
-            tableMethods.clearSort(sortOpts.multiple ? column : null);
+            if (allowClear) {
+              tableMethods.clearSort(multiple ? column : null);
+            }
           } else {
             tableMethods.sort({
               field,
@@ -18891,7 +19406,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           isPeerDrag,
           isCrossDrag,
           isSelfToChildDrag,
-          dragEndMethod
+          dragEndMethod,
+          dragToChildMethod
         } = rowDragOpts;
         const treeOpts = computeTreeOpts.value;
         const {
@@ -18910,13 +19426,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         if (prevDragRow && dragRow) {
           // 判断是否有拖动
           if (prevDragRow !== dragRow) {
-            return Promise.resolve(dEndMethod ? dEndMethod({
+            const dragParams = {
               oldRow: dragRow,
               newRow: prevDragRow,
               dragPos: prevDragPos,
               dragToChild: !!prevDragToChild,
               offsetIndex: dragOffsetIndex
-            }) : true).then(status => {
+            };
+            const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+            return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then(status => {
               if (!status) {
                 return;
               }
@@ -18994,7 +19512,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                       // 根到根
                     }
                     const fullList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(internalData.afterTreeFullData, {
-                      children: childrenField
+                      key: rowField,
+                      parentKey: parentField,
+                      children: mapChildrenField
                     });
                     // 移出
                     const otfIndex = $xeTable.findRowIndexOf(fullList, dragRow);
@@ -19009,12 +19529,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                         childRow[parentField] = dragRow[parentField];
                       });
                     }
-                    dragRow[parentField] = prevDragToChild ? prevDragRow[rowField] : prevDragRow[parentField];
+                    dragRow[parentField] = isDragToChildFlag ? prevDragRow[rowField] : prevDragRow[parentField];
                     internalData.tableFullTreeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(fullList, {
-                      key: treeOpts.rowField,
-                      parentKey: treeOpts.parentField,
+                      key: rowField,
+                      parentKey: parentField,
                       children: childrenField,
-                      mapChildren: treeOpts.mapChildrenField
+                      mapChildren: mapChildrenField
                     });
                   }
                 }
@@ -19034,7 +19554,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               }
               reactData.isDragRowMove = true;
               $xeTable.handleTableData(treeConfig && transform);
-              $xeTable.cacheRowMap();
+              $xeTable.cacheRowMap(false);
               updateScrollYStatus();
               if (!(treeConfig && transform)) {
                 $xeTable.updateAfterDataIndex();
@@ -19051,7 +19571,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 oldRow: dragRow,
                 newRow: prevDragRow,
                 dragPos: prevDragPos,
-                dragToChild: !!prevDragToChild,
+                dragToChild: isDragToChildFlag,
                 offsetIndex: dragOffsetIndex,
                 _index: {
                   newIndex: nafIndex,
@@ -19083,18 +19603,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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);
@@ -19224,7 +19742,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           isCrossDrag,
           isSelfToChildDrag,
           isToChildDrag,
-          dragEndMethod
+          dragEndMethod,
+          dragToChildMethod
         } = columnDragOpts;
         const {
           collectColumn
@@ -19235,13 +19754,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (prevDragCol !== dragCol) {
             const oldColumn = dragCol;
             const newColumn = prevDragCol;
-            return Promise.resolve(dragEndMethod ? dragEndMethod({
+            const dragParams = {
               oldColumn,
               newColumn,
               dragPos: prevDragPos,
               dragToChild: !!prevDragToChild,
               offsetIndex: dragOffsetIndex
-            }) : true).then(status => {
+            };
+            const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+            return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then(status => {
               if (!status) {
                 return;
               }
@@ -19337,7 +19858,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                   parent: nParent
                 } = newMatchRest;
                 // 转子级
-                if (isCrossDrag && isToChildDrag && prevDragToChild) {
+                if (isCrossDrag && isToChildDrag && isDragToChildFlag) {
                   oldColumn.parentId = newColumn.id;
                   newColumn.children = (newColumn.children || []).concat([oldColumn]);
                 } else {
@@ -19368,7 +19889,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 oldColumn,
                 newColumn,
                 dragPos: prevDragPos,
-                dragToChild: !!prevDragToChild,
+                dragToChild: isDragToChildFlag,
                 offsetIndex: dragOffsetIndex,
                 _index: {
                   newIndex: nafIndex,
@@ -19636,6 +20157,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       triggerBodyScrollEvent(evnt, fixedType) {
         const {
           elemStore,
+          intoRunScroll,
           lastScrollTop,
           lastScrollLeft,
           inWheelScroll,
@@ -19655,6 +20177,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         if (inWheelScroll || inVirtualScroll || inHeaderScroll || inFooterScroll) {
           return;
         }
+        if (intoRunScroll) {
+          return;
+        }
         if (!bodyScrollElem) {
           return;
         }
@@ -19711,6 +20236,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       triggerHeaderScrollEvent(evnt, fixedType) {
         const {
           elemStore,
+          intoRunScroll,
           inWheelScroll,
           inVirtualScroll,
           inBodyScroll,
@@ -19721,16 +20247,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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) {
-          return;
-        }
-        if (inBodyScroll) {
+        if (inWheelScroll || inVirtualScroll || inBodyScroll || inFooterScroll) {
           return;
         }
-        if (inFooterScroll) {
+        if (intoRunScroll) {
           return;
         }
         if (!headerScrollElem) {
@@ -19759,6 +20279,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       triggerFooterScrollEvent(evnt, fixedType) {
         const {
           elemStore,
+          intoRunScroll,
           inWheelScroll,
           inVirtualScroll,
           inHeaderScroll,
@@ -19769,16 +20290,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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 || inHeaderScroll || inBodyScroll) {
           return;
         }
-        if (inHeaderScroll) {
-          return;
-        }
-        if (inBodyScroll) {
+        if (intoRunScroll) {
           return;
         }
         if (!footerScrollElem) {
@@ -19806,9 +20321,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       },
       triggerBodyWheelEvent(evnt) {
         const {
+          target,
           deltaY,
           deltaX
         } = evnt;
+        if (target && /^textarea$/i.test(target.tagName)) {
+          return;
+        }
         const {
           highlightHoverRow
         } = src_props;
@@ -19832,26 +20351,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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;
@@ -19864,16 +20370,29 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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: ''
+            });
           });
+          // internalData.inWheelScroll = true
+          // setScrollTop(yHandleEl, scrollTop)
+          // setScrollTop(bodyScrollElem, scrollTop)
+          // setScrollTop(leftScrollElem, scrollTop)
+          // setScrollTop(rightScrollElem, scrollTop)
+          // loadScrollYData(scrollTop)
+          // $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
+          //   type: 'footer',
+          //   fixed: ''
+          // })
         }
       },
       triggerVirtualScrollXEvent(evnt) {
@@ -20043,45 +20562,43 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       // 更新纵向 Y 可视渲染上下剩余空间大小
       updateScrollYSpace() {
         const {
-          showOverflow
-        } = props;
-        const {
-          scrollYLoad,
-          rowHeight
+          isAllOverflow,
+          scrollYLoad
         } = reactData;
         const {
           scrollYStore,
           elemStore,
+          isResizeCellHeight,
           afterFullData,
           fullAllDataRowIdData
         } = internalData;
         const {
           startIndex
         } = scrollYStore;
+        const rowOpts = computeRowOpts.value;
+        const cellOpts = computeCellOpts.value;
+        const defaultRowHeight = computeDefaultRowHeight.value;
         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 && isAllOverflow) {
+            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;
-              }
+              const rowRest = fullAllDataRowIdData[rowid] || {};
+              ySpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || 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;
-              }
+              const rowRest = fullAllDataRowIdData[rowid] || {};
+              topSpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
             }
           }
         } else {
@@ -20106,30 +20623,26 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         if (scrollYSpaceEl) {
           scrollYSpaceEl.style.height = ySpaceHeight ? `${ySpaceHeight}px` : '';
         }
-        (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           updateStyle();
         });
       },
       updateScrollXData() {
         const {
-          showOverflow
-        } = props;
+          isAllOverflow
+        } = reactData;
         handleTableColumn();
-        // calcCellHeight()
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
-          // calcCellHeight()
           handleTableColumn();
           $xeTable.updateScrollXSpace();
-          if (!showOverflow) {
+          if (!isAllOverflow) {
             $xeTable.updateScrollYSpace();
           }
         });
       },
       updateScrollYData() {
         $xeTable.handleTableData();
-        // calcCellHeight()
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
-          // calcCellHeight()
           $xeTable.handleTableData();
           $xeTable.updateScrollYSpace();
         });
@@ -20474,7 +20987,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         editRules
       } = props;
       const {
-        isCalcColumn,
         isGroup,
         overflowX,
         overflowY,
@@ -20484,15 +20996,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         initStore,
         columnStore,
         filterStore,
-        customStore,
-        tooltipStore
+        customStore
       } = reactData;
       const {
         leftList,
         rightList
       } = columnStore;
       const loadingSlot = slots.loading;
-      const tooltipOpts = computeTooltipOpts.value;
+      const tableTipConfig = computeTableTipConfig.value;
+      const validTipConfig = computeValidTipConfig.value;
       const validOpts = computeValidOpts.value;
       const checkboxOpts = computeCheckboxOpts.value;
       const treeOpts = computeTreeOpts.value;
@@ -20504,7 +21016,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const areaOpts = computeAreaOpts.value;
       const loadingOpts = computeLoadingOpts.value;
       const isMenu = computeIsMenu.value;
-      const currLoading = reactData.isLoading || loading;
+      const currLoading = reactData.isColLoading || reactData.isRowLoading || loading;
       const resizableOpts = computeResizableOpts.value;
       const isArea = mouseConfig && mouseOpts.area;
       const columnDragOpts = computeColumnDragOpts.value;
@@ -20525,7 +21037,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           '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,
@@ -20534,7 +21045,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           '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,
@@ -20577,11 +21087,20 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 列宽线
        */
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-        key: 'cl',
-        ref: refCellResizeBar,
-        class: 'vxe-table--resizable-bar'
+        key: 'tcl',
+        ref: refColResizeBar,
+        class: 'vxe-table--resizable-col-bar'
+      }, resizableOpts.showDragTip ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-table--resizable-number-tip'
+      })] : []),
+      /**
+       * 行高线
+       */
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        key: 'trl',
+        ref: refRowResizeBar,
+        class: 'vxe-table--resizable-row-bar'
       }, resizableOpts.showDragTip ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-        ref: refCellResizeTip,
         class: 'vxe-table--resizable-number-tip'
       })] : []),
       /**
@@ -20667,10 +21186,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       /**
         * 工具提示
         */
-      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUITooltipComponent, Object.assign({
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUITooltipComponent, {
         key: 'btp',
-        ref: refTooltip
-      }, tooltipOpts, tooltipStore.currOpts)),
+        ref: refTooltip,
+        theme: tableTipConfig.theme,
+        enterable: tableTipConfig.enterable,
+        enterDelay: tableTipConfig.enterDelay,
+        leaveDelay: tableTipConfig.leaveDelay
+      }),
       /**
         * 校验提示
         */
@@ -20680,9 +21203,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         class: [{
           'old-cell-valid': editRules && table_getConfig().cellVaildMode === 'obsolete'
         }, 'vxe-table--valid-error'],
-        ...(validOpts.message === 'tooltip' || tableData.length === 1 ? Object.assign({
-          isArrow: false
-        }, tooltipOpts) : {})
+        theme: validTipConfig.theme,
+        enterable: validTipConfig.enterable,
+        enterDelay: validTipConfig.enterDelay,
+        leaveDelay: validTipConfig.leaveDelay
       }) : table_renderEmptyElement($xeTable)]) : table_renderEmptyElement($xeTable)]);
     };
     const dataFlag = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(0);
@@ -20700,7 +21224,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       if (value && value.length >= 50000) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
-      loadTableData(value).then(() => {
+      loadTableData(value, true).then(() => {
         const {
           scrollXLoad,
           scrollYLoad,
@@ -20795,10 +21319,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.syncResize, value => {
       if (value) {
-        handleUupdateResize();
+        handleUpdateResize();
         (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-          handleUupdateResize();
-          setTimeout(() => handleUupdateResize());
+          handleUpdateResize();
+          setTimeout(() => handleUpdateResize());
         });
       }
     });
@@ -20913,6 +21437,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (props.showFooter && !(props.footerMethod || props.footerData)) {
             warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
           }
+          if (rowOpts.height) {
+            warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
+          }
           // if (props.highlightCurrentRow) {
           //   warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
           // }
@@ -21023,7 +21550,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           endIndex: 0,
           visibleSize: 0
         });
-        loadTableData(data || []).then(() => {
+        loadTableData(data || [], true).then(() => {
           if (data && data.length) {
             internalData.inited = true;
             internalData.initStatus = true;
@@ -22132,6 +22659,7 @@ edit_hook_hooks.add('tableEditModule', {
             parent: parentRow,
             level: parentLevel + 1,
             height: 0,
+            resizeHeight: 0,
             oTop: 0
           };
           fullDataRowIdData[rowid] = rest;
@@ -22156,6 +22684,7 @@ edit_hook_hooks.add('tableEditModule', {
             parent: null,
             level: 0,
             height: 0,
+            resizeHeight: 0,
             oTop: 0
           };
           fullDataRowIdData[rowid] = rest;
@@ -22211,6 +22740,7 @@ edit_hook_hooks.add('tableEditModule', {
               parent: null,
               level: 0,
               height: 0,
+              resizeHeight: 0,
               oTop: 0
             };
             fullDataRowIdData[rowid] = rest;
@@ -22248,6 +22778,7 @@ edit_hook_hooks.add('tableEditModule', {
                 parent: null,
                 level: 0,
                 height: 0,
+                resizeHeight: 0,
                 oTop: 0
               };
               fullDataRowIdData[rowid] = rest;
@@ -22308,6 +22839,7 @@ edit_hook_hooks.add('tableEditModule', {
                   parent: parentRow,
                   level: parentLevel + 1,
                   height: 0,
+                  resizeHeight: 0,
                   oTop: 0
                 };
                 fullDataRowIdData[rowid] = rest;
@@ -22382,7 +22914,7 @@ edit_hook_hooks.add('tableEditModule', {
         const rowid = getRowid($xeTable, newRow);
         insertMaps[rowid] = newRow;
       });
-      $xeTable.cacheRowMap();
+      $xeTable.cacheRowMap(false);
       $xeTable.updateScrollYStatus();
       $xeTable.handleTableData(treeConfig && transform);
       if (!(treeConfig && transform)) {
@@ -22645,7 +23177,7 @@ edit_hook_hooks.add('tableEditModule', {
         editStore.insertMaps = insertDataRowMaps;
         reactData.pendingRowMaps = pendingDataRowMaps;
         $xeTable.updateFooter();
-        $xeTable.cacheRowMap();
+        $xeTable.cacheRowMap(false);
         $xeTable.handleTableData(treeConfig && transform);
         if (!(treeConfig && transform)) {
           $xeTable.updateAfterDataIndex();
@@ -23368,7 +23900,21 @@ function getTxtCellValue(val, vMaps) {
   const rest = replaceTxtCell(val, vMaps);
   return rest.replace(/^"+$/g, qVal => '"'.repeat(Math.ceil(qVal.length / 2)));
 }
-function parseCsvAndTxt(columns, content, cellSeparator) {
+function toExportField(tableConf, field) {
+  const {
+    fieldMaps,
+    titleMaps
+  } = tableConf;
+  // title 转 field
+  if (!fieldMaps[field]) {
+    const teCol = titleMaps[field];
+    if (teCol && teCol.field) {
+      field = teCol.field;
+    }
+  }
+  return field;
+}
+function parseCsvAndTxt(tableConf, content, cellSeparator) {
   const list = content.split(enterSymbol);
   const rows = [];
   let fields = [];
@@ -23389,7 +23935,7 @@ function parseCsvAndTxt(columns, content, cellSeparator) {
         });
         const cells = rVal.split(cellSeparator);
         if (!fields.length) {
-          fields = cells.map(val => getTxtCellValue(val.trim(), vMaps));
+          fields = cells.map(val => toExportField(tableConf, getTxtCellValue(val.trim(), vMaps)));
         } else {
           cells.forEach((val, colIndex) => {
             if (colIndex < fields.length) {
@@ -23406,13 +23952,13 @@ function parseCsvAndTxt(columns, content, cellSeparator) {
     rows
   };
 }
-function parseCsv(columns, content) {
-  return parseCsvAndTxt(columns, content, ',');
+function parseCsv(tableConf, content) {
+  return parseCsvAndTxt(tableConf, content, ',');
 }
-function parseTxt(columns, content) {
-  return parseCsvAndTxt(columns, content, '\t');
+function parseTxt(tableConf, content) {
+  return parseCsvAndTxt(tableConf, content, '\t');
 }
-function parseHTML(columns, content) {
+function parseHTML(tableConf, content) {
   const domParser = new DOMParser();
   const xmlDoc = domParser.parseFromString(content, 'text/html');
   const bodyNodes = getElementsByTagName(xmlDoc, 'body');
@@ -23425,7 +23971,7 @@ function parseHTML(columns, content) {
       if (theadNodes.length) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(getElementsByTagName(theadNodes[0], 'tr'), rowNode => {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(getElementsByTagName(rowNode, 'th'), cellNode => {
-            fields.push(cellNode.textContent);
+            fields.push(toExportField(tableConf, cellNode.textContent || ''));
           });
         });
         const tbodyNodes = getElementsByTagName(tableNodes[0], 'tbody');
@@ -23448,7 +23994,7 @@ function parseHTML(columns, content) {
     rows
   };
 }
-function parseXML(columns, content) {
+function parseXML(tableConf, content) {
   const domParser = new DOMParser();
   const xmlDoc = domParser.parseFromString(content, 'application/xml');
   const sheetNodes = getElementsByTagName(xmlDoc, 'Worksheet');
@@ -23460,7 +24006,7 @@ function parseXML(columns, content) {
       const rowNodes = getElementsByTagName(tableNodes[0], 'Row');
       if (rowNodes.length) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(getElementsByTagName(rowNodes[0], 'Cell'), cellNode => {
-          fields.push(cellNode.textContent);
+          fields.push(toExportField(tableConf, cellNode.textContent || ''));
         });
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(rowNodes, (rowNode, index) => {
           if (index) {
@@ -23493,21 +24039,6 @@ function clearColumnConvert(columns) {
     children: 'children'
   });
 }
-/**
- * 检查导入的列是否完整
- * @param {Array} fields 字段名列表
- * @param {Array} rows 数据列表
- */
-function checkImportData(columns, fields) {
-  const tableFields = [];
-  columns.forEach(column => {
-    const field = column.field;
-    if (field) {
-      tableFields.push(field);
-    }
-  });
-  return fields.some(field => tableFields.indexOf(field) > -1);
-}
 const tableExportMethodKeys = ['exportData', 'importByFile', 'importData', 'saveFile', 'readFile', 'print', 'getPrintHtml', 'openImport', 'closeImport', 'openExport', 'closeExport', 'openPrint', 'closePrint'];
 export_hook_hooks.add('tableExportModule', {
   setupTable($xeTable) {
@@ -24136,25 +24667,41 @@ export_hook_hooks.add('tableExportModule', {
         fields: [],
         rows: []
       };
+      const tableFieldMaps = {};
+      const tableTitleMaps = {};
+      tableFullColumn.forEach(column => {
+        const field = column.field;
+        const title = column.getTitle();
+        if (field) {
+          tableFieldMaps[field] = column;
+        }
+        if (title) {
+          tableTitleMaps[column.getTitle()] = column;
+        }
+      });
+      const tableConf = {
+        fieldMaps: tableFieldMaps,
+        titleMaps: tableTitleMaps
+      };
       switch (opts.type) {
         case 'csv':
-          rest = parseCsv(tableFullColumn, content);
+          rest = parseCsv(tableConf, content);
           break;
         case 'txt':
-          rest = parseTxt(tableFullColumn, content);
+          rest = parseTxt(tableConf, content);
           break;
         case 'html':
-          rest = parseHTML(tableFullColumn, content);
+          rest = parseHTML(tableConf, content);
           break;
         case 'xml':
-          rest = parseXML(tableFullColumn, content);
+          rest = parseXML(tableConf, content);
           break;
       }
       const {
         fields,
         rows
       } = rest;
-      const status = checkImportData(tableFullColumn, fields);
+      const status = fields.some(field => tableFieldMaps[field] || tableTitleMaps[field]);
       if (status) {
         $xeTable.createData(rows).then(data => {
           let loadRest;
@@ -24312,6 +24859,43 @@ export_hook_hooks.add('tableExportModule', {
         return Promise.reject(e);
       });
     };
+    const 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;
+      });
+    };
+    const 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);
+    };
     const handleExportAndPrint = (options, isPrint) => {
       const {
         treeConfig,
@@ -24352,7 +24936,9 @@ export_hook_hooks.add('tableExportModule', {
       const checkMethod = customOpts.checkMethod;
       const exportColumns = collectColumn.slice(0);
       const {
-        columns
+        columns,
+        excludeFields,
+        includeFields
       } = defOpts;
       // 处理类型
       const typeList = types.map(value => {
@@ -24376,33 +24962,19 @@ export_hook_hooks.add('tableExportModule', {
       // 默认选中
       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, {
@@ -25039,38 +25611,75 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
       computeEditOpts,
       computeCheckboxOpts,
       computeMouseOpts,
-      computeTreeOpts
+      computeTreeOpts,
+      computeRowOpts,
+      computeCellOpts,
+      computeDefaultRowHeight
     } = $xeTable.getComputeMaps();
     function getCheckboxRangeRows(evnt, params, targetTrElem, trRect, offsetClientTop, moveRange) {
+      const {
+        showOverflow
+      } = props;
+      const {
+        fullAllDataRowIdData,
+        isResizeCellHeight
+      } = internalData;
+      const rowOpts = computeRowOpts.value;
+      const cellOpts = computeCellOpts.value;
+      const defaultRowHeight = computeDefaultRowHeight.value;
+      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);
@@ -25084,24 +25693,30 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
       return rangeRows;
     }
     const handleCheckboxRangeEvent = (evnt, params) => {
+      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 = refElem.value;
-        const {
-          elemStore
-        } = internalData;
-        const disX = evnt.clientX;
-        const disY = evnt.clientY;
-        const bodyWrapperElem = getRefElem(elemStore[`${column.fixed || 'main'}-body-wrapper`] || elemStore['main-body-wrapper']);
+        let bodyWrapperElem = bodyScrollElem;
+        if (leftScrollElem && column.fixed === 'left') {
+          bodyWrapperElem = leftScrollElem;
+        } else if (rightScrollElem && column.fixed === 'right') {
+          bodyWrapperElem = rightScrollElem;
+        }
         if (!bodyWrapperElem) {
           return;
         }
+        const el = refElem.value;
+        const disX = evnt.clientX;
+        const disY = evnt.clientY;
         const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range');
-        const domMousemove = document.onmousemove;
-        const domMouseup = document.onmouseup;
         const trElem = cell.parentElement;
         const selectRecords = $xeTable.getCheckboxRecords();
         let lastRangeRows = [];
@@ -25244,8 +25859,8 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
           stopMouseScroll();
           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);
@@ -28228,7 +28843,7 @@ const {
   renderEmptyElement: grid_renderEmptyElement
 } = core_.VxeUI;
 const tableComponentPropKeys = Object.keys(src_props);
-const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
+const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect'];
 const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'];
 /* harmony default export */ var grid = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'VxeGrid',
@@ -29868,7 +30483,8 @@ const Grid = VxeGrid;
       customRestore: '恢复默认',
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
-      resizeColTip: '{0} 像素'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',