vxe-table 3.12.10-beta.9 → 3.12.11

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.10-beta.9";
+const version = "3.12.11";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2255,7 +2255,10 @@ core_.VxeUI.setConfig({
     },
     resizableConfig: {
       dragMode: 'auto',
-      showDragTip: true
+      showDragTip: true,
+      isSyncAutoHeight: true,
+      isSyncAutoWidth: true,
+      minHeight: 18
     },
     radioConfig: {
       // trigger: 'default'
@@ -2289,6 +2292,15 @@ core_.VxeUI.setConfig({
     columnConfig: {
       maxFixedSize: 4
     },
+    cellConfig: {
+      padding: true
+    },
+    headerCellConfig: {
+      height: 'unset'
+    },
+    footerCellConfig: {
+      height: 'unset'
+    },
     // menuConfig: {
     //   visibleMethod () {}
     // },
@@ -2322,6 +2334,8 @@ core_.VxeUI.setConfig({
       // orders: ['asc', 'desc', null],
       // sortMethod: null,
       showIcon: true,
+      allowClear: true,
+      allowBtn: true,
       iconLayout: 'vertical'
     },
     filterConfig: {
@@ -2393,20 +2407,20 @@ core_.VxeUI.setConfig({
       isReplace: true
     },
     virtualXConfig: {
-      // enabled: false,
+      enabled: true,
       gt: 60,
       preSize: 0,
       oSize: 1
     },
     virtualYConfig: {
-      // enabled: false,
+      enabled: true,
       gt: 100,
       preSize: 1,
       oSize: 2
     },
     scrollbarConfig: {
-      width: 10,
-      height: 10
+      // width: 0,
+      // height: 0
     }
   },
   // export: {
@@ -2826,7 +2840,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.10-beta.9"}`;
+const log_version = `table v${"3.12.11"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2916,6 +2930,8 @@ class ColumnInfo {
       footerClassName: _vm.footerClassName,
       formatter,
       footerFormatter: _vm.footerFormatter,
+      padding: _vm.padding,
+      verticalAlign: _vm.verticalAlign,
       sortable: _vm.sortable,
       sortBy: _vm.sortBy,
       sortType: _vm.sortType,
@@ -2929,6 +2945,7 @@ class ColumnInfo {
       filterRender: _vm.filterRender,
       treeNode: _vm.treeNode,
       dragSort: _vm.dragSort,
+      rowResize: _vm.rowResize,
       cellType: _vm.cellType,
       cellRender: _vm.cellRender,
       editRender: _vm.editRender,
@@ -3122,9 +3139,15 @@ function getElementMarginWidth(elem) {
   }
   return 0;
 }
+function getCellHeight(height) {
+  if (height === 'unset') {
+    return 0;
+  }
+  return height || 0;
+}
 function handleFieldOrColumn(_vm, fieldOrColumn) {
   if (fieldOrColumn) {
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? _vm.getColumnByField(fieldOrColumn) : fieldOrColumn;
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(fieldOrColumn) ? _vm.getColumnByField(`${fieldOrColumn}`) : fieldOrColumn;
   }
   return null;
 }
@@ -3209,6 +3232,7 @@ function getColReMinWidth(params) {
     column,
     cell
   } = params;
+  const internalData = $table;
   const {
     showHeaderOverflow: allColumnHeaderOverflow,
     resizableOpts
@@ -3223,6 +3247,9 @@ function getColReMinWidth(params) {
       return Math.max(1, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(customMinWidth));
     }
   }
+  const {
+    elemStore
+  } = internalData;
   const {
     showHeaderOverflow,
     minWidth: colMinWidth
@@ -3249,13 +3276,10 @@ function getColReMinWidth(params) {
   }
   // 如果设置最小宽
   if (colMinWidth) {
-    const {
-      refTableBody
-    } = $table.$refs;
-    const bodyElem = refTableBody ? refTableBody.$el : null;
-    if (bodyElem) {
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    if (bodyScrollElem) {
       if (isScale(colMinWidth)) {
-        const bodyWidth = bodyElem.clientWidth - 1;
+        const bodyWidth = bodyScrollElem.clientWidth - 1;
         const meanWidth = bodyWidth / 100;
         return Math.max(mWidth, Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(colMinWidth) * meanWidth));
       } else if (isPx(colMinWidth)) {
@@ -3301,14 +3325,39 @@ function getOffsetSize($xeTable) {
 }
 function calcTreeLine(params, prevRow) {
   const {
-    $table
+    $table,
+    row
   } = params;
+  const tableProps = $table;
   const tableReactData = $table;
+  const tableInternalData = $table;
+  const {
+    showOverflow
+  } = tableProps;
+  const {
+    scrollYLoad
+  } = tableReactData;
+  const {
+    fullAllDataRowIdData
+  } = tableInternalData;
+  const rowOpts = $table.computeRowOpts;
+  const cellOpts = $table.computeCellOpts;
+  const defaultRowHeight = $table.computeDefaultRowHeight;
+  const rowid = getRowid($table, row);
+  const rowRest = fullAllDataRowIdData[rowid];
+  const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.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++) {
@@ -3383,43 +3432,32 @@ function createColumn($xeTable, options, renderOptions) {
   return isColumnInfo(options) ? options : new ColumnInfo($xeTable, options, renderOptions);
 }
 function rowToVisible($xeTable, row) {
+  const tableProps = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
-  const tableProps = $xeTable;
   const {
     showOverflow
   } = tableProps;
-  const refTableBody = $xeTable.$refs.refTableBody;
   const {
-    columnStore,
     scrollYLoad
   } = reactData;
   const {
+    elemStore,
     afterFullData,
-    scrollYStore,
-    fullAllDataRowIdData
+    fullAllDataRowIdData,
+    isResizeCellHeight
   } = internalData;
-  const {
-    rowHeight
-  } = scrollYStore;
-  const {
-    leftList,
-    rightList
-  } = columnStore;
-  const bodyElem = refTableBody ? refTableBody.$el : null;
+  const rowOpts = $xeTable.computeRowOpts;
+  const cellOpts = $xeTable.computeCellOpts;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+  const leftFixedWidth = $xeTable.computeLeftFixedWidth;
+  const rightFixedWidth = $xeTable.computeRightFixedWidth;
+  const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
   const rowid = getRowid($xeTable, row);
-  let offsetFixedLeft = 0;
-  leftList.forEach(item => {
-    offsetFixedLeft += item.renderWidth;
-  });
-  let offsetFixedRight = 0;
-  rightList.forEach(item => {
-    offsetFixedRight += item.renderWidth;
-  });
-  if (bodyElem) {
-    const bodyHeight = bodyElem.clientHeight;
-    const bodyScrollTop = bodyElem.scrollTop;
-    const trElem = bodyElem.querySelector(`[rowid="${rowid}"]`);
+  if (bodyScrollElem) {
+    const bodyHeight = bodyScrollElem.clientHeight;
+    const bodyScrollTop = bodyScrollElem.scrollTop;
+    const trElem = bodyScrollElem.querySelector(`[rowid="${rowid}"]`);
     if (trElem) {
       const trOffsetParent = trElem.offsetParent;
       const trOffsetTop = trElem.offsetTop + (trOffsetParent ? trOffsetParent.offsetTop : 0);
@@ -3433,73 +3471,67 @@ function rowToVisible($xeTable, row) {
     } else {
       // 如果是虚拟渲染滚动
       if (scrollYLoad) {
-        if (showOverflow) {
-          return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * rowHeight);
+        const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
+        if (!isCustomCellHeight && showOverflow) {
+          return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * defaultRowHeight);
         }
         let scrollTop = 0;
         const rowRest = fullAllDataRowIdData[rowid];
-        const rHeight = rowRest ? rowRest.height || rowHeight : rowHeight;
+        const rHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || 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 || cellOpts.height || rowOpts.height || currRowRest.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;
+  const internalData = $xeTable;
   const {
-    columnStore,
-    scrollXLoad,
-    visibleColumn
-  } = $xeTable;
-  const refTableBody = $xeTable.$refs.refTableBody;
+    scrollXLoad
+  } = reactData;
   const {
-    leftList,
-    rightList
-  } = columnStore;
-  const bodyElem = refTableBody ? refTableBody.$el : null;
+    elemStore,
+    visibleColumn
+  } = internalData;
+  const leftFixedWidth = $xeTable.computeLeftFixedWidth;
+  const rightFixedWidth = $xeTable.computeRightFixedWidth;
+  const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
   if (column.fixed) {
     return Promise.resolve();
   }
-  let offsetFixedLeft = 0;
-  leftList.forEach(item => {
-    offsetFixedLeft += item.renderWidth;
-  });
-  let offsetFixedRight = 0;
-  rightList.forEach(item => {
-    offsetFixedRight += item.renderWidth;
-  });
-  if (bodyElem) {
-    const bodyWidth = bodyElem.clientWidth;
-    const bodyScrollLeft = bodyElem.scrollLeft;
+  if (bodyScrollElem) {
+    const bodyWidth = bodyScrollElem.clientWidth;
+    const bodyScrollLeft = bodyScrollElem.scrollLeft;
     let tdElem = null;
     if (row) {
       const rowid = getRowid($xeTable, row);
-      tdElem = bodyElem.querySelector(`[rowid="${rowid}"] .${column.id}`);
+      tdElem = bodyScrollElem.querySelector(`[rowid="${rowid}"] .${column.id}`);
     }
     if (!tdElem) {
-      tdElem = bodyElem.querySelector(`.${column.id}`);
+      tdElem = bodyScrollElem.querySelector(`.${column.id}`);
     }
     if (tdElem) {
       const tdOffsetParent = tdElem.offsetParent;
       const tdOffsetLeft = tdElem.offsetLeft + (tdOffsetParent ? tdOffsetParent.offsetLeft : 0);
       const cellWidth = tdElem.clientWidth;
       // 检测是否在可视区中
-      if (tdOffsetLeft < bodyScrollLeft + offsetFixedLeft) {
-        return $xeTable.scrollTo(tdOffsetLeft - offsetFixedLeft - 1);
-      } else if (tdOffsetLeft + cellWidth - bodyScrollLeft > bodyWidth - offsetFixedRight) {
-        return $xeTable.scrollTo(tdOffsetLeft + cellWidth - (bodyWidth - offsetFixedRight - 1));
+      if (tdOffsetLeft < bodyScrollLeft + leftFixedWidth) {
+        return $xeTable.scrollTo(tdOffsetLeft - leftFixedWidth - 1);
+      } else if (tdOffsetLeft + cellWidth - bodyScrollLeft > bodyWidth - rightFixedWidth) {
+        return $xeTable.scrollTo(tdOffsetLeft + cellWidth - (bodyWidth - rightFixedWidth - 1));
       }
     } else {
       // 检测是否在虚拟渲染可视区中
@@ -3507,15 +3539,16 @@ function colToVisible($xeTable, column, row) {
         let scrollLeft = 0;
         const cellWidth = column.renderWidth;
         for (let i = 0; i < visibleColumn.length; i++) {
-          if (visibleColumn[i] === column) {
+          const currCol = visibleColumn[i];
+          if (currCol === column || currCol.id === column.id) {
             break;
           }
-          scrollLeft += visibleColumn[i].renderWidth;
+          scrollLeft += currCol.renderWidth;
         }
         if (scrollLeft < bodyScrollLeft) {
-          return $xeTable.scrollTo(scrollLeft - offsetFixedLeft - 1);
+          return $xeTable.scrollTo(scrollLeft - leftFixedWidth - 1);
         }
-        return $xeTable.scrollTo(scrollLeft + cellWidth - (bodyWidth - offsetFixedRight - 1));
+        return $xeTable.scrollTo(scrollLeft + cellWidth - (bodyWidth - rightFixedWidth - 1));
       }
     }
   }
@@ -3759,7 +3792,7 @@ function renderTitleContent(h, params, content) {
   const ons = {};
   if (showTitle || showTooltip || showAllTip) {
     ons.mouseenter = evnt => {
-      if (tableReactData._isResize) {
+      if (tableReactData.isDragResize) {
         return;
       }
       if (showTitle) {
@@ -3771,7 +3804,7 @@ function renderTitleContent(h, params, content) {
   }
   if (showTooltip || showAllTip) {
     ons.mouseleave = evnt => {
-      if (tableReactData._isResize) {
+      if (tableReactData.isDragResize) {
         return;
       }
       if (showTooltip || showAllTip) {
@@ -3790,18 +3823,6 @@ function renderTitleContent(h, params, content) {
     on: 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(h, params) {
   const {
     $table,
@@ -3820,33 +3841,36 @@ function getFooterContent(h, params) {
   if (slots && slots.footer) {
     return $table.callSlot(slots.footer, params, h);
   }
+  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);
     const rtFooter = compConf ? compConf.renderTableFooter || compConf.renderFooter : null;
     if (rtFooter) {
-      return getSlotVNs(rtFooter.call($table, h, renderOpts, params));
+      return getSlotVNs(rtFooter.call($table, h, 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 {
@@ -4019,9 +4043,7 @@ const Cell = {
     return Cell.renderTreeIcon(h, params, Cell.renderDefaultCell.call(this, h, params));
   },
   renderDefaultFooter(h, params) {
-    return [h('span', {
-      class: 'vxe-cell--item'
-    }, getFooterContent(h, params))];
+    return getFooterContent(h, params);
   },
   /**
    * 树节点
@@ -4585,6 +4607,7 @@ const Cell = {
     const sortOpts = $table.computeSortOpts;
     const {
       showIcon,
+      allowBtn,
       iconLayout,
       iconAsc,
       iconDesc,
@@ -4600,12 +4623,12 @@ const Cell = {
         attrs: {
           title: cell_getI18n('vxe.table.sortAsc')
         },
-        on: {
+        on: allowBtn ? {
           click(evnt) {
             evnt.stopPropagation();
             $table.triggerSortEvent(evnt, column, 'asc');
           }
-        }
+        } : undefined
       }), h('i', {
         class: ['vxe-sort--desc-btn', iconDesc || cell_getIcon().TABLE_SORT_DESC, {
           'sort--active': column.order === 'desc'
@@ -4613,12 +4636,12 @@ const Cell = {
         attrs: {
           title: cell_getI18n('vxe.table.sortDesc')
         },
-        on: {
+        on: allowBtn ? {
           click(evnt) {
             evnt.stopPropagation();
             $table.triggerSortEvent(evnt, column, 'desc');
           }
-        }
+        } : undefined
       })])];
     }
     return [];
@@ -4841,6 +4864,16 @@ const columnProps = {
   formatter: [Function, Array, String],
   // 格式化表尾显示内容
   footerFormatter: [Function, Array, String],
+  // 是否显示间距
+  padding: {
+    type: Boolean,
+    default: null
+  },
+  // 垂直对齐方式
+  verticalAlign: {
+    type: String,
+    default: null
+  },
   // 是否允许排序
   sortable: Boolean,
   // 在 v3 中废弃
@@ -4876,6 +4909,8 @@ const columnProps = {
   treeNode: Boolean,
   // 设置为拖拽排序
   dragSort: Boolean,
+  // 设置为行高拖拽
+  rowResize: Boolean,
   // 是否可视
   visible: {
     type: Boolean,
@@ -5412,6 +5447,7 @@ function updateAfterListIndex($xeTable) {
         parent: null,
         level: 0,
         height: 0,
+        resizeHeight: 0,
         oTop: 0
       };
       fullAllDataRowIdData[rowid] = rest;
@@ -5463,6 +5499,7 @@ function updateAfterDataIndex($xeTable) {
           parent: null,
           level: 0,
           height: 0,
+          resizeHeight: 0,
           oTop: 0
         };
         fullAllDataRowIdData[rowid] = rest;
@@ -5526,7 +5563,6 @@ function updateStyle($xeTable) {
   const internalData = $xeTable;
   const {
     border,
-    showOverflow: allColumnOverflow,
     showHeaderOverflow: allColumnHeaderOverflow,
     showFooterOverflow: allColumnFooterOverflow,
     mouseConfig,
@@ -5539,7 +5575,9 @@ function updateStyle($xeTable) {
     tableColumn,
     scrollXLoad,
     scrollYLoad,
+    overflowX,
     scrollbarWidth,
+    overflowY,
     scrollbarHeight,
     columnStore,
     editStore,
@@ -5563,6 +5601,8 @@ function updateStyle($xeTable) {
     return;
   }
   const containerList = ['main', 'left', 'right'];
+  const osbWidth = overflowY ? scrollbarWidth : 0;
+  const osbHeight = overflowX ? scrollbarHeight : 0;
   const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder;
   const cellOffsetWidth = $xeTable.computeCellOffsetWidth;
   const mouseOpts = $xeTable.computeMouseOpts;
@@ -5570,16 +5610,16 @@ function updateStyle($xeTable) {
   const bodyTableElem = getRefElem(elemStore['main-body-table']);
   if (emptyPlaceholderElem) {
     emptyPlaceholderElem.style.top = `${headerHeight}px`;
-    emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - scrollbarHeight}px` : '';
+    emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - osbHeight}px` : '';
   }
   let bodyHeight = 0;
   let bodyMaxHeight = 0;
-  const bodyMinHeight = customMinHeight - headerHeight - footerHeight - scrollbarHeight;
+  const bodyMinHeight = customMinHeight - headerHeight - footerHeight - osbHeight;
   if (customMaxHeight) {
-    bodyMaxHeight = Math.max(bodyMinHeight, customMaxHeight - headerHeight - footerHeight - scrollbarHeight);
+    bodyMaxHeight = Math.max(bodyMinHeight, customMaxHeight - headerHeight - footerHeight - osbHeight);
   }
   if (customHeight) {
-    bodyHeight = customHeight - headerHeight - footerHeight - scrollbarHeight;
+    bodyHeight = customHeight - headerHeight - footerHeight - osbHeight;
   }
   if (!bodyHeight) {
     if (bodyTableElem) {
@@ -5597,27 +5637,27 @@ function updateStyle($xeTable) {
   const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
   const scrollXVirtualEl = $xeTable.$refs.refScrollXVirtualElem;
   if (scrollXVirtualEl) {
-    scrollXVirtualEl.style.height = `${scrollbarHeight}px`;
-    scrollXVirtualEl.style.visibility = scrollbarHeight ? 'visible' : 'hidden';
+    scrollXVirtualEl.style.height = `${osbHeight}px`;
+    scrollXVirtualEl.style.visibility = overflowX ? 'visible' : 'hidden';
   }
   const xWrapperEl = $xeTable.$refs.refScrollXWrapperElem;
   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 = $xeTable.$refs.refScrollYVirtualElem;
   if (scrollYVirtualEl) {
-    scrollYVirtualEl.style.width = `${scrollbarWidth}px`;
+    scrollYVirtualEl.style.width = `${osbWidth}px`;
     scrollYVirtualEl.style.height = `${bodyHeight + headerHeight + footerHeight}px`;
-    scrollYVirtualEl.style.visibility = scrollbarWidth ? 'visible' : 'hidden';
+    scrollYVirtualEl.style.visibility = overflowY ? 'visible' : 'hidden';
   }
   const yTopCornerEl = $xeTable.$refs.refScrollYTopCornerElem;
   if (yTopCornerEl) {
@@ -5736,14 +5776,14 @@ function updateStyle($xeTable) {
           if (wrapperElem) {
             wrapperElem.style.top = `${headerHeight}px`;
           }
-          fixedWrapperElem.style.height = `${customHeight > 0 ? customHeight : tableHeight + headerHeight + footerHeight + scrollbarHeight}px`;
+          fixedWrapperElem.style.height = `${customHeight > 0 ? customHeight : tableHeight + headerHeight + footerHeight + osbHeight}px`;
           fixedWrapperElem.style.width = `${fixedColumn.reduce((previous, column) => previous + column.renderWidth, 0)}px`;
         }
         let tWidth = tableWidth;
         let renderColumnList = tableColumn;
         let isOptimizeMode = false;
         // 如果是使用优化模式
-        if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+        if (scrollXLoad || scrollYLoad || isAllOverflow) {
           if (expandColumn || spanMethod || footerSpanMethod) {
             // 如果不支持优化模式
           } else {
@@ -5765,7 +5805,7 @@ function updateStyle($xeTable) {
         if (tableElem) {
           tableElem.style.width = tWidth ? `${tWidth}px` : '';
           // 兼容性处理
-          tableElem.style.paddingRight = scrollbarWidth && fixedType && (browse['-moz'] || browse.safari) ? `${scrollbarWidth}px` : '';
+          tableElem.style.paddingRight = osbWidth && fixedType && (browse['-moz'] || browse.safari) ? `${osbWidth}px` : '';
         }
         const emptyBlockElem = getRefElem(elemStore[`${name}-${layout}-emptyBlock`]);
         if (emptyBlockElem) {
@@ -5800,7 +5840,7 @@ function updateStyle($xeTable) {
           // 如果是固定列
           if (fixedWrapperElem) {
             if (wrapperElem) {
-              wrapperElem.style.top = `${customHeight > 0 ? customHeight - footerHeight - scrollbarHeight : tableHeight + headerHeight}px`;
+              wrapperElem.style.top = `${customHeight > 0 ? customHeight - footerHeight - osbHeight : tableHeight + headerHeight}px`;
             }
           }
         }
@@ -5827,7 +5867,7 @@ function updateStyle($xeTable) {
             } 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';
@@ -5871,16 +5911,16 @@ function updateStyle($xeTable) {
   return $xeTable.$nextTick();
 }
 function computeRowHeight($xeTable) {
-  const props = $xeTable;
+  const reactData = $xeTable;
   const {
-    showOverflow
-  } = props;
+    isAllOverflow
+  } = reactData;
   const tableHeader = $xeTable.$refs.refTableHeader;
   const tableBody = $xeTable.$refs.refTableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   let rowHeight = 0;
-  if (showOverflow) {
+  if (isAllOverflow) {
     if (tableBodyElem) {
       const tableHeaderElem = tableHeader ? tableHeader.$el : null;
       let firstTrElem;
@@ -5901,40 +5941,39 @@ function computeRowHeight($xeTable) {
   // 最低支持 18px 行高
   return Math.max(18, rowHeight);
 }
-function handleVirtualYVisible($xeTable) {
-  const props = $xeTable;
+function handleVirtualYVisible($xeTable, currScrollTop) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
-    showOverflow
-  } = props;
-  const {
-    rowHeight
+    isAllOverflow
   } = reactData;
   const {
     elemStore,
+    isResizeCellHeight,
     afterFullData,
     fullAllDataRowIdData
   } = internalData;
+  const rowOpts = $xeTable.computeRowOpts;
+  const cellOpts = $xeTable.computeCellOpts;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
   if (bodyScrollElem) {
-    const {
-      scrollTop,
-      clientHeight
-    } = bodyScrollElem;
+    const clientHeight = bodyScrollElem.clientHeight;
+    const scrollTop = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(currScrollTop) ? currScrollTop : bodyScrollElem.scrollTop;
     const endHeight = scrollTop + clientHeight;
     let toVisibleIndex = -1;
     let offsetTop = 0;
     let visibleSize = 0;
-    if (showOverflow) {
-      toVisibleIndex = Math.floor(scrollTop / rowHeight);
-      visibleSize = Math.ceil(clientHeight / rowHeight) + 1;
+    const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
+    if (!isCustomCellHeight && 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 || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
         if (toVisibleIndex === -1 && scrollTop < offsetTop) {
           toVisibleIndex = rIndex;
         }
@@ -6222,7 +6261,7 @@ function autoCellWidth($xeTable) {
   }
   const tableHeight = bodyElem.offsetHeight;
   const overflowY = yHandleEl.scrollHeight > yHandleEl.clientHeight;
-  reactData.scrollbarWidth = overflowY ? Math.max(scrollbarOpts.width || 0, yHandleEl.offsetWidth - yHandleEl.clientWidth) : 0;
+  reactData.scrollbarWidth = Math.max(scrollbarOpts.width || 0, yHandleEl.offsetWidth - yHandleEl.clientWidth);
   reactData.overflowY = overflowY;
   internalData.tableWidth = tableWidth;
   internalData.tableHeight = tableHeight;
@@ -6231,7 +6270,7 @@ function autoCellWidth($xeTable) {
   const headerHeight = headerTableElem ? headerTableElem.clientHeight : 0;
   const overflowX = tableWidth > bodyWidth;
   const footerHeight = footerTableElem ? footerTableElem.clientHeight : 0;
-  reactData.scrollbarHeight = overflowX ? Math.max(scrollbarOpts.height || 0, xHandleEl.offsetHeight - xHandleEl.clientHeight) : 0;
+  reactData.scrollbarHeight = Math.max(scrollbarOpts.height || 0, xHandleEl.offsetHeight - xHandleEl.clientHeight);
   internalData.headerHeight = headerHeight;
   internalData.footerHeight = footerHeight;
   reactData.overflowX = overflowX;
@@ -6241,68 +6280,43 @@ function autoCellWidth($xeTable) {
     $xeTable.checkScrolling();
   }
 }
-// const updateCellOffset = ($xeTable: VxeTableConstructor) => {
-//   const internalData = $xeTable as unknown as TableInternalData
-//   const { chTimeout, chRunTime } = internalData
-//   if (chTimeout) {
-//     clearTimeout(chTimeout)
-//   }
-//   if (!chRunTime || chRunTime + 10 < Date.now()) {
-//     internalData.chRunTime = Date.now()
-//   }
-//   internalData.chTimeout = setTimeout(() => {
-//     internalData.chRunTime = undefined
-//     internalData.chTimeout = undefined
-//   }, 80)
-// }
+const calcCellAutoHeight = (rowRest, wrapperEl) => {
+  const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
+  let 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 = $xeTable => {
-  const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
-  const {
-    showOverflow
-  } = props;
   const {
     tableData,
+    isAllOverflow,
+    scrollYLoad,
     scrollXLoad
   } = reactData;
   const {
     fullAllDataRowIdData
   } = internalData;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const el = $xeTable.$refs.refElem;
-  if (!showOverflow && el) {
-    let paddingTop = 0;
-    let paddingBottom = 0;
-    let calcPadding = false;
+  if (!isAllOverflow && scrollYLoad && el) {
     tableData.forEach(row => {
       const rowid = getRowid($xeTable, row);
       const rowRest = fullAllDataRowIdData[rowid];
-      const cellList = el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]>.vxe-body--column>.vxe-cell>.vxe-cell--auto-wrapper`);
-      if (rowRest && cellList.length) {
-        let height = 0;
-        for (let i = 0; i < cellList.length; i++) {
-          const cellElem = cellList[i];
-          const tdEl = cellElem.parentElement;
-          if (!tdEl || !tdEl.clientWidth) {
-            break;
-          }
-          if (!calcPadding) {
-            paddingTop = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(tdEl).paddingTop);
-            paddingBottom = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(tdEl).paddingBottom);
-            calcPadding = true;
-          }
-          let cellHeight = paddingTop + paddingBottom;
-          if (cellElem) {
-            cellHeight += cellElem.clientHeight;
-          }
-          height = Math.max(height, cellHeight);
-        }
-        rowRest.height = scrollXLoad ? Math.max(rowRest.height, height) : height;
+      if (rowRest) {
+        const height = calcCellAutoHeight(rowRest, el);
+        rowRest.height = Math.max(defaultRowHeight, scrollXLoad ? Math.max(rowRest.height, height) : height);
       }
     });
-    reactData.isCalcCellHeight++;
+    reactData.calcCellHeightFlag++;
   }
-  // updateCellOffset()
 };
 function getOrderField(_vm, column) {
   const {
@@ -6329,6 +6343,18 @@ function getOrderField(_vm, column) {
     return cellValue;
   };
 }
+function handleTargetEnterEvent($xeTable, isClear) {
+  const internalData = $xeTable;
+  const $tooltip = $xeTable.$refs.refTooltip;
+  clearTimeout(internalData.tooltipTimeout);
+  if (isClear) {
+    $xeTable.closeTooltip();
+  } else {
+    if ($tooltip && $tooltip.setActived) {
+      $tooltip.setActived(true);
+    }
+  }
+}
 function clearDragStatus($xeTable) {
   const reactData = $xeTable;
   const {
@@ -6439,13 +6465,17 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
     return;
   }
   const {
+    overflowX,
     scrollbarWidth,
+    overflowY,
     scrollbarHeight
   } = reactData;
   const {
     prevDragToChild
   } = internalData;
   const wrapperRect = el.getBoundingClientRect();
+  const osbWidth = overflowY ? scrollbarWidth : 0;
+  const osbHeight = overflowX ? scrollbarHeight : 0;
   const tableWidth = el.clientWidth;
   const tableHeight = el.clientHeight;
   if (trEl) {
@@ -6456,14 +6486,14 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
         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 {
@@ -6488,7 +6518,7 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
           thWidth -= startX - offsetLeft;
           offsetLeft = startX;
         }
-        const endX = tableWidth - rightContainerWidth - (rightContainerWidth ? 0 : scrollbarWidth);
+        const endX = tableWidth - rightContainerWidth - (rightContainerWidth ? 0 : osbWidth);
         if (offsetLeft + thWidth > endX) {
           thWidth = endX - offsetLeft;
         }
@@ -6499,7 +6529,7 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
         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');
@@ -6530,6 +6560,49 @@ function hideDropTip($xeTable) {
     cdLineEl.style.display = '';
   }
 }
+/**
+ * 处理显示 tooltip
+ * @param {Event} evnt 事件
+ * @param {Row} row 行对象
+ */
+function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
+  const reactData = $xeTable;
+  if (!overflowElem) {
+    return $xeTable.$nextTick();
+  }
+  params.cell = tdEl;
+  const {
+    tooltipStore
+  } = reactData;
+  const tooltipOpts = $xeTable.computeTooltipOpts;
+  const {
+    column,
+    row
+  } = params;
+  const {
+    showAll,
+    contentMethod
+  } = tooltipOpts;
+  const customContent = contentMethod ? contentMethod(params) : null;
+  const useCustom = contentMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent);
+  const content = useCustom ? customContent : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toString(column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
+  const isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
+  if (content && (showAll || useCustom || isCellOverflow)) {
+    Object.assign(tooltipStore, {
+      row,
+      column,
+      visible: true,
+      currOpts: {}
+    });
+    $xeTable.$nextTick(() => {
+      const $tooltip = $xeTable.$refs.refTooltip;
+      if ($tooltip && $tooltip.open) {
+        $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, formatText(content));
+      }
+    });
+  }
+  return $xeTable.$nextTick();
+}
 function handleScrollToRowColumn($xeTable, fieldOrColumn, row) {
   const internalData = $xeTable;
   const {
@@ -6861,11 +6934,10 @@ function handleColumn($xeTable, collectColumn) {
   internalData.collectColumn = collectColumn;
   const tableFullColumn = getColumnList(collectColumn);
   internalData.tableFullColumn = tableFullColumn;
-  reactData.isLoading = true;
+  reactData.isColLoading = true;
   reactData.isDragColMove = false;
   initColumnSort($xeTable);
   return Promise.resolve(restoreCustomStorage($xeTable)).then(() => {
-    reactData.isLoading = false;
     cacheColumnMap($xeTable);
     parseColumns($xeTable, true).then(() => {
       if (reactData.scrollXLoad) {
@@ -6890,6 +6962,7 @@ function handleColumn($xeTable, collectColumn) {
       if ($xeTable.handleUpdateCustomColumn) {
         $xeTable.handleUpdateCustomColumn();
       }
+      reactData.isColLoading = false;
       return $xeTable.recalculate();
     });
   });
@@ -6897,15 +6970,12 @@ function handleColumn($xeTable, collectColumn) {
 /**
  * 纵向 Y 可视渲染处理
  */
-function loadScrollYData($xeTable) {
-  const props = $xeTable;
+function loadScrollYData($xeTable, scrollTop) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
-    showOverflow
-  } = props;
-  const {
-    mergeList
+    mergeList,
+    isAllOverflow
   } = reactData;
   const {
     scrollYStore
@@ -6916,11 +6986,11 @@ function loadScrollYData($xeTable) {
     endIndex,
     offsetSize
   } = scrollYStore;
-  const autoOffsetYSize = showOverflow ? offsetSize : offsetSize + 1;
+  const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
   const {
     toVisibleIndex,
     visibleSize
-  } = handleVirtualYVisible($xeTable);
+  } = handleVirtualYVisible($xeTable, scrollTop);
   const offsetItem = {
     startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize - preloadSize),
     endIndex: toVisibleIndex + visibleSize + autoOffsetYSize + preloadSize
@@ -6940,6 +7010,54 @@ function loadScrollYData($xeTable) {
     }
   }
 }
+function lazyScrollXData($xeTable) {
+  const internalData = $xeTable;
+  const {
+    lxTimeout,
+    lxRunTime,
+    scrollXStore
+  } = internalData;
+  const {
+    visibleSize
+  } = scrollXStore;
+  const fpsTime = Math.max(5, Math.min(10, Math.floor(visibleSize / 3)));
+  if (lxTimeout) {
+    clearTimeout(lxTimeout);
+  }
+  if (!lxRunTime || lxRunTime + fpsTime < Date.now()) {
+    internalData.lxRunTime = Date.now();
+    loadScrollXData($xeTable);
+  }
+  internalData.lxTimeout = setTimeout(() => {
+    internalData.lxTimeout = undefined;
+    internalData.lxRunTime = undefined;
+    loadScrollXData($xeTable);
+  }, fpsTime);
+}
+function lazyScrollYData($xeTable) {
+  const internalData = $xeTable;
+  const {
+    lyTimeout,
+    lyRunTime,
+    scrollYStore
+  } = internalData;
+  const {
+    visibleSize
+  } = scrollYStore;
+  const fpsTime = Math.floor(Math.max(4, Math.min(10, visibleSize / 3)));
+  if (lyTimeout) {
+    clearTimeout(lyTimeout);
+  }
+  if (!lyRunTime || lyRunTime + fpsTime < Date.now()) {
+    internalData.lyRunTime = Date.now();
+    loadScrollYData($xeTable);
+  }
+  internalData.lyTimeout = setTimeout(() => {
+    internalData.lyTimeout = undefined;
+    internalData.lyRunTime = undefined;
+    loadScrollYData($xeTable);
+  }, fpsTime);
+}
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -6956,6 +7074,7 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   internalData.lcsTimeout = setTimeout(() => {
     internalData.lcsRunTime = Date.now();
     internalData.lcsTimeout = undefined;
+    internalData.intoRunScroll = false;
     internalData.inVirtualScroll = false;
     internalData.inWheelScroll = false;
     internalData.inHeaderScroll = false;
@@ -6975,6 +7094,43 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
     $xeTable.updateCellAreas();
   }, 200);
 }
+const getWheelSpeed = lastScrollTime => {
+  let multiple = 1;
+  const currTime = Date.now();
+  if (lastScrollTime + 25 > currTime) {
+    multiple = 1.18;
+  } else if (lastScrollTime + 30 > currTime) {
+    multiple = 1.15;
+  } else if (lastScrollTime + 40 > currTime) {
+    multiple = 1.12;
+  } else if (lastScrollTime + 55 > currTime) {
+    multiple = 1.09;
+  } else if (lastScrollTime + 75 > currTime) {
+    multiple = 1.06;
+  } else if (lastScrollTime + 100 > currTime) {
+    multiple = 1.03;
+  }
+  return multiple;
+};
+const wheelScrollTo = (diffNum, cb) => {
+  const duration = Math.abs(diffNum);
+  const startTime = performance.now();
+  let countTop = 0;
+  const step = timestamp => {
+    let progress = (timestamp - startTime) / duration;
+    if (progress > 1) {
+      progress = 1;
+    }
+    const easedProgress = Math.pow(progress, 2);
+    const offsetTop = Math.floor(diffNum * easedProgress) - countTop;
+    countTop += offsetTop;
+    cb(offsetTop);
+    if (progress < 1) {
+      requestAnimationFrame(step);
+    }
+  };
+  requestAnimationFrame(step);
+};
 function updateHeight($xeTable) {
   const internalData = $xeTable;
   internalData.customHeight = calcTableHeight($xeTable, 'height');
@@ -6982,59 +7138,62 @@ function updateHeight($xeTable) {
   internalData.customMaxHeight = calcTableHeight($xeTable, 'maxHeight');
 }
 function calcColumnAutoWidth(column, wrapperEl) {
-  const cellElList = wrapperEl.querySelectorAll(`.vxe-header--column.${column.id}>.vxe-cell,.vxe-body--column.${column.id}>.vxe-cell,.vxe-footer--column.${column.id}>.vxe-cell`);
-  const firstCellEl = cellElList[0];
-  let paddingSize = 0;
-  if (firstCellEl) {
-    const cellStyle = getComputedStyle(firstCellEl);
-    paddingSize = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight)) + 2;
-  }
-  let colWidth = column.renderAutoWidth - paddingSize;
-  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(cellElList, itemEl => {
-    const cellEl = itemEl;
-    const thElem = cellEl.parentElement;
-    let titleWidth = 0;
-    if (`${thElem.tagName}`.toLowerCase() === 'th') {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(cellEl.children, btnEl => {
-        titleWidth += btnEl.offsetWidth + 1;
-      });
-    } else {
-      const labelEl = cellEl.firstElementChild;
-      if (labelEl) {
-        titleWidth = labelEl.offsetWidth;
-      }
-    }
-    if (titleWidth) {
-      colWidth = Math.max(colWidth, Math.ceil(titleWidth) + 4);
-    }
-  });
-  return colWidth + paddingSize;
+  const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[colid="${column.id}"]`);
+  let leftRightPadding = 0;
+  const firstCellEl = cellElemList[0];
+  if (firstCellEl && firstCellEl.parentElement) {
+    const cellStyle = getComputedStyle(firstCellEl.parentElement);
+    leftRightPadding = Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight));
+  }
+  let colWidth = column.renderAutoWidth - leftRightPadding;
+  for (let i = 0; i < cellElemList.length; i++) {
+    const celEl = cellElemList[i];
+    colWidth = Math.max(colWidth, celEl ? Math.ceil(celEl.scrollWidth) + 4 : 0);
+  }
+  return colWidth + leftRightPadding;
 }
 function calcCellWidth($xeTable) {
-  const reactData = $xeTable;
   const internalData = $xeTable;
   const autoWidthColumnList = $xeTable.computeAutoWidthColumnList;
-  reactData.isCalcColumn = true;
-  return $xeTable.$nextTick().then(() => {
-    const {
-      fullColumnIdData
-    } = internalData;
-    const el = $xeTable.$refs.refElem;
-    if (el) {
-      autoWidthColumnList.forEach(column => {
-        const colid = column.id;
-        const colRest = fullColumnIdData[colid];
-        const colWidth = calcColumnAutoWidth(column, el);
-        if (colRest) {
-          colRest.width = Math.max(colWidth, colRest.width);
-        }
-        column.renderAutoWidth = colWidth;
-      });
-      $xeTable.analyColumnWidth();
-    }
-    reactData.isCalcColumn = false;
-  });
+  const {
+    fullColumnIdData
+  } = internalData;
+  const el = $xeTable.$refs.refElem;
+  if (el) {
+    el.setAttribute('data-calc-col', 'Y');
+    autoWidthColumnList.forEach(column => {
+      const colid = column.id;
+      const colRest = fullColumnIdData[colid];
+      const colWidth = calcColumnAutoWidth(column, el);
+      if (colRest) {
+        colRest.width = Math.max(colWidth, colRest.width);
+      }
+      column.renderAutoWidth = colWidth;
+    });
+    $xeTable.analyColumnWidth();
+    el.removeAttribute('data-calc-col');
+  }
 }
+const handleUpdateColResize = ($xeTable, evnt, params) => {
+  $xeTable.analyColumnWidth();
+  $xeTable.recalculate(true).then(() => {
+    $xeTable.saveCustomStore('update:width');
+    $xeTable.updateCellAreas();
+    $xeTable.dispatchEvent('column-resizable-change', params, evnt);
+    // 已废弃 resizable-change
+    $xeTable.dispatchEvent('resizable-change', params, evnt);
+    setTimeout(() => $xeTable.recalculate(true), 300);
+  });
+};
+const handleUpdateRowResize = ($xeTable, evnt, params) => {
+  const reactData = $xeTable;
+  reactData.resizeHeightFlag++;
+  $xeTable.recalculate(true).then(() => {
+    $xeTable.updateCellAreas();
+    $xeTable.dispatchEvent('row-resizable-change', params, evnt);
+    setTimeout(() => $xeTable.recalculate(true), 300);
+  });
+};
 const Methods = {
   callSlot(slotFunc, params, h, vNodes) {
     if (slotFunc) {
@@ -7099,7 +7258,7 @@ const Methods = {
     warnLog('vxe.error.delFunc', ['syncData', 'getData']);
     return this.$nextTick().then(() => {
       this.tableData = [];
-      return this.$nextTick().then(() => this.loadTableData(this.tableFullData));
+      return this.$nextTick().then(() => this.loadTableData(this.tableFullData, true));
     });
   },
   /**
@@ -7161,11 +7320,12 @@ const Methods = {
    * 加载表格数据
    * @param {Array} datas 数据
    */
-  loadTableData(datas) {
+  loadTableData(datas, isReset) {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
       keepSource,
-      showOverflow,
       treeConfig,
       treeOpts,
       editStore,
@@ -7178,7 +7338,6 @@ const Methods = {
       sYOpts
     } = this;
     const childrenField = treeOpts.children || treeOpts.childrenField;
-    const rowOpts = $xeTable.computeRowOpts;
     let treeData = [];
     let fullData = datas ? datas.slice(0) : [];
     if (treeConfig) {
@@ -7221,42 +7380,30 @@ const Methods = {
     scrollYStore.endIndex = 1;
     scrollXStore.startIndex = 0;
     scrollXStore.endIndex = 1;
+    reactData.isRowLoading = true;
+    reactData.scrollVMLoading = false;
     editStore.insertMaps = {};
-    editStore.removeList = [];
     editStore.removeMaps = {};
     const sYLoad = updateScrollYStatus($xeTable, fullData);
-    this.isDragRowMove = false;
+    reactData.isDragColMove = false;
+    reactData.isDragRowMove = false;
     // 全量数据
-    this.tableFullData = fullData;
-    this.tableFullTreeData = treeData;
+    internalData.tableFullData = fullData;
+    internalData.tableFullTreeData = treeData;
     // 缓存数据
-    this.cacheRowMap(true);
+    $xeTable.cacheRowMap(true, isReset);
     // 原始数据
-    this.tableSynchData = datas;
+    internalData.tableSynchData = datas;
+    if (isReset) {
+      internalData.isResizeCellHeight = false;
+      reactData.rowExpandedMaps = {};
+      reactData.rowExpandLazyLoadedMaps = {};
+      reactData.treeExpandedMaps = {};
+      reactData.treeExpandLazyLoadedMaps = {};
+    }
     // 克隆原数据，用于显示编辑状态，与编辑值做对比
     if (keepSource) {
-      this.cacheSourceMap(fullData);
-    }
-    if (sYLoad) {
-      if (showOverflow) {
-        if (!rowOpts.height) {
-          const errColumn = this.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 (!(this.height || this.maxHeight)) {
-          errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-        }
-        // if (!this.showOverflow) {
-        //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-        // }
-        if (this.spanMethod) {
-          warnLog('vxe.error.scrollErrProp', ['table.span-method']);
-        }
-      }
+      $xeTable.cacheSourceMap(fullData);
     }
     if (this.clearCellAreas && this.mouseConfig) {
       this.clearCellAreas();
@@ -7276,6 +7423,27 @@ const Methods = {
       if (sYLoad) {
         scrollYStore.endIndex = scrollYStore.visibleSize;
       }
+      if (sYLoad) {
+        // if (showOverflow) {
+        //   if (!rowOpts.height) {
+        //     const errColumn = this.tableFullColumn.find((column: any) => column.showOverflow === false)
+        //     if (errColumn) {
+        //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+        //     }
+        //   }
+        // }
+        if (true) {
+          if (!(this.height || this.maxHeight)) {
+            errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+          }
+          // if (!this.showOverflow) {
+          //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+          // }
+          if (this.spanMethod) {
+            warnLog('vxe.error.scrollErrProp', ['table.span-method']);
+          }
+        }
+      }
       this.handleReserveStatus();
       this.checkSelectionStatus();
       return new Promise(resolve => {
@@ -7289,6 +7457,7 @@ const Methods = {
           if (sYOpts.scrollToTopOnChange) {
             targetScrollTop = 0;
           }
+          reactData.isRowLoading = false;
           calcCellHeight($xeTable);
           // 是否变更虚拟滚动
           if (oldScrollYLoad === sYLoad) {
@@ -7314,7 +7483,7 @@ const Methods = {
     const {
       initStatus
     } = this;
-    return this.loadTableData(datas).then(() => {
+    return this.loadTableData(datas, false).then(() => {
       this.inited = true;
       this.initStatus = true;
       if (!initStatus) {
@@ -7331,7 +7500,7 @@ const Methods = {
     return this.clearAll().then(() => {
       this.inited = true;
       this.initStatus = true;
-      return this.loadTableData(datas);
+      return this.loadTableData(datas, true);
     }).then(() => {
       this.handleLoadDefaults();
       return this.recalculate();
@@ -7414,9 +7583,8 @@ const Methods = {
   },
   /**
    * 更新数据行的 Map
-   * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
-  cacheRowMap(isSource) {
+  cacheRowMap(isReset, isSource) {
     const {
       treeConfig,
       treeOpts,
@@ -7442,7 +7610,7 @@ const Methods = {
         row[childrenField] = null;
       }
       let cacheItem = fullAllDataRowIdData[rowid];
-      if (!cacheItem) {
+      if (isReset || !cacheItem) {
         cacheItem = {
           row,
           rowid,
@@ -7455,6 +7623,7 @@ const Methods = {
           parent: parentRow,
           level,
           height: 0,
+          resizeHeight: 0,
           oTop: 0
         };
       }
@@ -7560,6 +7729,7 @@ const Methods = {
           parent: parentRow,
           level: parentLevel + nodes.length,
           height: 0,
+          resizeHeight: 0,
           oTop: 0
         };
         fullDataRowIdData[rowid] = rest;
@@ -7952,20 +8122,38 @@ const Methods = {
     return this.$nextTick();
   },
   getCellElement(row, fieldOrColumn) {
-    const column = handleFieldOrColumn(this, fieldOrColumn);
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      elemStore
+    } = internalData;
+    const column = handleFieldOrColumn($xeTable, fieldOrColumn);
     if (!column) {
       return null;
     }
-    const {
-      $refs
-    } = this;
-    const rowid = getRowid(this, row);
-    let bodyElem = null;
+    const rowid = getRowid($xeTable, row);
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
+    const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
+    let bodyElem;
     if (column) {
-      bodyElem = $refs[`${column.fixed || 'table'}Body`] || $refs.refTableBody;
-    }
-    if (bodyElem && bodyElem.$el) {
-      return bodyElem.$el.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);
+      if (column.fixed) {
+        if (column.fixed === 'left') {
+          if (leftScrollElem) {
+            bodyElem = leftScrollElem;
+          }
+        } else {
+          if (rightScrollElem) {
+            bodyElem = rightScrollElem;
+          }
+        }
+      }
+      if (!bodyElem) {
+        bodyElem = bodyScrollElem;
+      }
+      if (bodyElem) {
+        return bodyElem.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);
+      }
     }
     return null;
   },
@@ -8492,7 +8680,11 @@ const Methods = {
    * @param {String/Number} rowid 行主键
    */
   getRowById(cellValue) {
-    const fullDataRowIdData = this.fullDataRowIdData;
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullDataRowIdData
+    } = internalData;
     const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cellValue) ? '' : encodeURIComponent(cellValue);
     return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
   },
@@ -8500,14 +8692,9 @@ const Methods = {
    * 根据行获取行的唯一主键
    * @param {Row} row 行对象
    */
-  getRowid(cellValue) {
+  getRowid(row) {
     const $xeTable = this;
-    const internalData = $xeTable;
-    const {
-      fullDataRowIdData
-    } = internalData;
-    const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cellValue) ? '' : encodeURIComponent(cellValue || '');
-    return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
+    return getRowid($xeTable, row);
   },
   /**
    * 获取处理后的表格数据
@@ -8711,29 +8898,41 @@ const Methods = {
   },
   setColumnWidth(fieldOrColumn, width) {
     const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      elemStore
+    } = internalData;
     let status = false;
     const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
-    cols.forEach(item => {
-      const column = handleFieldOrColumn($xeTable, item);
-      if (column) {
-        const colWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(width);
-        let rdWidth = colWidth;
-        if (isScale(width)) {
-          const refTableBody = $xeTable.$refs.refTableBody;
-          const bodyElem = refTableBody ? refTableBody.$el : null;
-          const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0;
-          rdWidth = Math.floor(colWidth * bodyWidth);
-        }
-        column.resizeWidth = rdWidth;
-        if (!status) {
-          status = true;
+    let cWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(width);
+    if (isScale(width)) {
+      const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+      const bodyWidth = bodyScrollElem ? bodyScrollElem.clientWidth - 1 : 0;
+      cWidth = Math.floor(cWidth * bodyWidth);
+    }
+    if (cWidth) {
+      cols.forEach(item => {
+        const column = handleFieldOrColumn($xeTable, item);
+        if (column) {
+          column.resizeWidth = cWidth;
+          if (!status) {
+            status = true;
+          }
         }
+      });
+      if (status) {
+        return $xeTable.refreshColumn().then(() => {
+          return {
+            status
+          };
+        });
       }
-    });
-    if (status) {
-      return $xeTable.refreshColumn();
     }
-    return $xeTable.$nextTick();
+    return $xeTable.$nextTick().then(() => {
+      return {
+        status
+      };
+    });
   },
   getColumnWidth(fieldOrColumn) {
     const column = handleFieldOrColumn(this, fieldOrColumn);
@@ -9060,7 +9259,162 @@ const Methods = {
       remainList
     });
   },
-  handleResizeDblclickEvent(evnt, params) {
+  handleColResizeMousedownEvent(evnt, fixedType, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    evnt.stopPropagation();
+    evnt.preventDefault();
+    const {
+      column
+    } = params;
+    const {
+      overflowX,
+      scrollbarHeight
+    } = reactData;
+    const {
+      elemStore,
+      visibleColumn
+    } = internalData;
+    const resizableOpts = $xeTable.computeResizableOpts;
+    const osbHeight = overflowX ? scrollbarHeight : 0;
+    const tableEl = $xeTable.$refs.refElem;
+    const leftContainerElem = $xeTable.$refs.refLeftContainer;
+    const rightContainerElem = $xeTable.$refs.refRightContainer;
+    const resizeBarElem = $xeTable.$refs.refColResizeBar;
+    if (!resizeBarElem) {
+      return;
+    }
+    const resizeTipElem = resizeBarElem.firstElementChild;
+    const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
+    const {
+      clientX: dragClientX
+    } = evnt;
+    const wrapperElem = $xeTable.$refs.refElem;
+    const dragBtnElem = evnt.target;
+    let resizeColumn = column;
+    if (column.children && column.children.length) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(column.children, childColumn => {
+        resizeColumn = childColumn;
+      });
+    }
+    const cell = dragBtnElem.parentNode;
+    const cellParams = Object.assign(params, {
+      cell
+    });
+    let dragLeft = 0;
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    if (!bodyScrollElem) {
+      return;
+    }
+    const pos = getOffsetPos(dragBtnElem, wrapperElem);
+    const dragBtnWidth = dragBtnElem.clientWidth;
+    const dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
+    const minInterval = getColReMinWidth(cellParams) - dragBtnOffsetWidth; // 列之间的最小间距
+    let dragMinLeft = pos.left - cell.clientWidth + dragBtnWidth + minInterval;
+    let dragPosLeft = pos.left + dragBtnOffsetWidth;
+    const isLeftFixed = fixedType === 'left';
+    const isRightFixed = fixedType === 'right';
+    // 计算左右侧固定列偏移量
+    let fixedOffsetWidth = 0;
+    if (isLeftFixed || isRightFixed) {
+      const siblingProp = isLeftFixed ? 'nextElementSibling' : 'previousElementSibling';
+      let tempCellElem = cell[siblingProp];
+      while (tempCellElem) {
+        if (hasClass(tempCellElem, 'fixed--hidden')) {
+          break;
+        } else if (!hasClass(tempCellElem, 'col--group')) {
+          fixedOffsetWidth += tempCellElem.offsetWidth;
+        }
+        tempCellElem = tempCellElem[siblingProp];
+      }
+      if (isRightFixed && rightContainerElem) {
+        dragPosLeft = rightContainerElem.offsetLeft + fixedOffsetWidth;
+      }
+    }
+    // 处理拖动事件
+    const updateEvent = evnt => {
+      evnt.stopPropagation();
+      evnt.preventDefault();
+      const tableHeight = tableEl.clientHeight;
+      const offsetX = evnt.clientX - dragClientX;
+      let left = dragPosLeft + offsetX;
+      const scrollLeft = fixedType ? 0 : bodyScrollElem.scrollLeft;
+      if (isLeftFixed) {
+        // 左固定列（不允许超过右侧固定列、不允许超过右边距）
+        left = Math.min(left, (rightContainerElem ? rightContainerElem.offsetLeft : bodyScrollElem.clientWidth) - fixedOffsetWidth - minInterval);
+      } else if (isRightFixed) {
+        // 右侧固定列（不允许超过左侧固定列、不允许超过左边距）
+        dragMinLeft = (leftContainerElem ? leftContainerElem.clientWidth : 0) + fixedOffsetWidth + minInterval;
+        left = Math.min(left, dragPosLeft + cell.clientWidth - minInterval);
+      } else {
+        dragMinLeft = Math.max(bodyScrollElem.scrollLeft, dragMinLeft);
+        // left = Math.min(left, bodyScrollElem.clientWidth + bodyScrollElem.scrollLeft - 40)
+      }
+      dragLeft = Math.max(left, dragMinLeft);
+      const resizeBarLeft = Math.max(1, dragLeft - scrollLeft);
+      resizeBarElem.style.left = `${resizeBarLeft}px`;
+      resizeBarElem.style.top = `${scrollbarXToTop ? osbHeight : 0}px`;
+      resizeBarElem.style.height = `${scrollbarXToTop ? tableHeight - osbHeight : tableHeight}px`;
+      if (resizableOpts.showDragTip && resizeTipElem) {
+        resizeTipElem.textContent = methods_getI18n('vxe.table.resizeColTip', [resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)]);
+        const tableWidth = tableEl.clientWidth;
+        const wrapperRect = wrapperElem.getBoundingClientRect();
+        const resizeBarWidth = resizeBarElem.clientWidth;
+        const resizeTipWidth = resizeTipElem.clientWidth;
+        const resizeTipHeight = resizeTipElem.clientHeight;
+        let resizeTipLeft = -resizeTipWidth;
+        if (resizeBarLeft < resizeTipWidth + resizeBarWidth) {
+          resizeTipLeft = 0;
+        } else if (resizeBarLeft > tableWidth) {
+          resizeTipLeft += tableWidth - resizeBarLeft;
+        }
+        resizeTipElem.style.left = `${resizeTipLeft}px`;
+        resizeTipElem.style.top = `${Math.min(tableHeight - resizeTipHeight, Math.max(0, evnt.clientY - wrapperRect.y - resizeTipHeight / 2))}px`;
+      }
+      reactData.isDragResize = true;
+    };
+    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($xeTable, evnt, resizeParams);
+      }
+      removeClass(tableEl, 'col-drag--resize');
+    };
+    updateEvent(evnt);
+    if ($xeTable.closeMenu) {
+      $xeTable.closeMenu();
+    }
+  },
+  handleColResizeDblclickEvent(evnt, params) {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -9070,6 +9424,8 @@ const Methods = {
     } = resizableOpts;
     const el = $xeTable.$refs.refElem;
     if (isDblclickAutoWidth && el) {
+      evnt.stopPropagation();
+      evnt.preventDefault();
       const {
         fullColumnIdData
       } = internalData;
@@ -9090,24 +9446,306 @@ const Methods = {
         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();
-      $xeTable.analyColumnWidth();
-      $xeTable.recalculate(true).then(() => {
-        $xeTable.saveCustomStore('update:visible');
-        $xeTable.updateCellAreas();
-        $xeTable.dispatchEvent('resizable-change', {
+      if ($xeTable.handleColResizeDblclickCellAreaEvent) {
+        $xeTable.handleColResizeDblclickCellAreaEvent(evnt, resizeParams);
+      } else {
+        resizeColumn.resizeWidth = resizeWidth;
+        handleUpdateColResize($xeTable, evnt, resizeParams);
+      }
+    }
+  },
+  handleRowResizeMousedownEvent(evnt, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    evnt.stopPropagation();
+    evnt.preventDefault();
+    const {
+      row
+    } = params;
+    const {
+      overflowX,
+      scrollbarWidth,
+      overflowY,
+      scrollbarHeight
+    } = reactData;
+    const {
+      elemStore,
+      fullAllDataRowIdData
+    } = internalData;
+    const osbWidth = overflowY ? scrollbarWidth : 0;
+    const osbHeight = overflowX ? scrollbarHeight : 0;
+    const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
+    const resizableOpts = $xeTable.computeResizableOpts;
+    const rowOpts = $xeTable.computeRowOpts;
+    const cellOpts = $xeTable.computeCellOpts;
+    const tableEl = $xeTable.$refs.refElem;
+    const resizeBarElem = $xeTable.$refs.refRowResizeBar;
+    if (!resizeBarElem) {
+      return;
+    }
+    const {
+      clientY: dragClientY
+    } = evnt;
+    const resizeTipElem = resizeBarElem.firstElementChild;
+    const dragBtnElem = evnt.currentTarget;
+    const tdEl = dragBtnElem.parentNode;
+    const trEl = tdEl.parentNode;
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+    if (!bodyScrollElem) {
+      return;
+    }
+    const rowid = getRowid($xeTable, row);
+    const rowRest = fullAllDataRowIdData[rowid];
+    if (!rowRest) {
+      return;
+    }
+    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+    const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+    const tableRect = tableEl.getBoundingClientRect();
+    const trRect = trEl.getBoundingClientRect();
+    const targetOffsetY = dragClientY - trRect.y - trEl.clientHeight;
+    let resizeHeight = currCellHeight;
+    const cellEl = tdEl.querySelector('.vxe-cell');
+    let cellMinHeight = 0;
+    if (cellEl) {
+      const cellStyle = getComputedStyle(cellEl);
+      cellMinHeight = Math.max(1, Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingTop) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingBottom)));
+    }
+    const minTop = trRect.y - tableRect.y + cellMinHeight;
+    // 处理拖动事件
+    const updateEvent = evnt => {
+      evnt.stopPropagation();
+      evnt.preventDefault();
+      const tableWidth = tableEl.clientWidth - osbWidth;
+      const tableHeight = tableEl.clientHeight - osbHeight;
+      let dragTop = evnt.clientY - tableRect.y - targetOffsetY;
+      if (dragTop < minTop) {
+        dragTop = minTop;
+      } else {
+        resizeHeight = Math.max(cellMinHeight, currCellHeight + evnt.clientY - dragClientY);
+      }
+      resizeBarElem.style.left = `${scrollbarYToLeft ? osbWidth : 0}px`;
+      resizeBarElem.style.top = `${dragTop}px`;
+      resizeBarElem.style.width = `${tableWidth}px`;
+      if (resizableOpts.showDragTip && resizeTipElem) {
+        resizeTipElem.textContent = methods_getI18n('vxe.table.resizeRowTip', [resizeHeight]);
+        const resizeTipWidth = resizeTipElem.clientWidth;
+        const resizeTipHeight = resizeTipElem.clientHeight;
+        let resizeBarLeft = Math.max(2, evnt.clientX - tableRect.x);
+        let resizeBarTop = 0;
+        if (resizeBarLeft + resizeTipWidth >= tableWidth - 2) {
+          resizeBarLeft = tableWidth - resizeTipWidth - 2;
+        }
+        if (dragTop + resizeTipHeight >= tableHeight) {
+          resizeBarTop = tableHeight - (dragTop + resizeTipHeight);
+        }
+        resizeTipElem.style.left = `${resizeBarLeft}px`;
+        resizeTipElem.style.top = `${resizeBarTop}px`;
+      }
+      reactData.isDragResize = true;
+    };
+    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();
+      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($xeTable, evnt, resizeParams);
+        }
+      }
+      removeClass(tableEl, 'row-drag--resize');
+    };
+    updateEvent(evnt);
+  },
+  handleRowResizeDblclickEvent(evnt, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const resizableOpts = $xeTable.computeResizableOpts;
+    const {
+      isDblclickAutoHeight
+    } = resizableOpts;
+    const el = $xeTable.$refs.refElem;
+    if (isDblclickAutoHeight && el) {
+      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 = () => {
+        const resizeHeight = calcCellAutoHeight(rowRest, el);
+        const resizeParams = {
+          ...params,
+          resizeHeight,
+          resizeRow: row
+        };
+        reactData.isDragResize = false;
+        internalData._lastResizeTime = Date.now();
+        if ($xeTable.handleRowResizeDblclickCellAreaEvent) {
+          $xeTable.handleRowResizeDblclickCellAreaEvent(evnt, resizeParams);
+        } else {
+          rowRest.resizeHeight = resizeHeight;
+          handleUpdateRowResize($xeTable, evnt, resizeParams);
+        }
+      };
+      if (actived.row || actived.column) {
+        $xeTable.clearEdit().then(handleRsHeight);
+      } else {
+        handleRsHeight();
+      }
+    }
+  },
+  setRowHeightConf(heightConf) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    let status = false;
+    if (heightConf) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(heightConf, (height, rowid) => {
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          const rHeight = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(height);
+          if (rHeight) {
+            rowRest.resizeHeight = rHeight;
+            if (!status) {
+              status = true;
+            }
+          }
+        }
       });
+      if (status) {
+        internalData.isResizeCellHeight = true;
+        reactData.resizeHeightFlag++;
+      }
+    }
+    return $xeTable.$nextTick().then(() => {
+      return {
+        status
+      };
+    });
+  },
+  getRowHeightConf(isFull) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData,
+      afterFullData
+    } = internalData;
+    const rowOpts = $xeTable.computeRowOpts;
+    const cellOpts = $xeTable.computeCellOpts;
+    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+    const rest = {};
+    afterFullData.forEach(row => {
+      const rowid = getRowid($xeTable, row);
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (rowRest) {
+        const resizeHeight = rowRest.resizeHeight;
+        if (resizeHeight || isFull) {
+          const currCellHeight = resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+          rest[rowid] = currCellHeight;
+        }
+      }
+    });
+    return rest;
+  },
+  setRowHeight(rowOrId, height) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    let status = false;
+    const rows = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rowOrId) ? rowOrId : [rowOrId];
+    let rHeight = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(height);
+    if (isScale(height)) {
+      const tableBody = $xeTable.$refs.refTableBody;
+      const bodyElem = tableBody ? tableBody.$el : null;
+      const bodyHeight = bodyElem ? bodyElem.clientHeight - 1 : 0;
+      rHeight = Math.floor(rHeight * bodyHeight);
+    }
+    if (rHeight) {
+      rows.forEach(row => {
+        const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(row) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row) ? row : getRowid($xeTable, row);
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          rowRest.resizeHeight = rHeight;
+          if (!status) {
+            status = true;
+          }
+        }
+      });
+      if (status) {
+        internalData.isResizeCellHeight = true;
+        reactData.resizeHeightFlag++;
+      }
+    }
+    return $xeTable.$nextTick();
+  },
+  getRowHeight(rowOrId) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    const rowOpts = $xeTable.computeRowOpts;
+    const cellOpts = $xeTable.computeCellOpts;
+    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+    const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowOrId) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
+    const rowRest = fullAllDataRowIdData[rowid];
+    if (rowRest) {
+      return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
     }
+    return 0;
   },
   /**
    * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
@@ -9543,10 +10181,10 @@ const Methods = {
           }
         } else if (isContextMenu) {
           // 如果按下上下文键
-          this._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
+          internalData._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
           clearTimeout(internalData.keyCtxTimeout);
           internalData.keyCtxTimeout = setTimeout(() => {
-            this._keyCtx = false;
+            internalData._keyCtx = false;
           }, 1000);
         } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
           const {
@@ -9827,53 +10465,45 @@ const Methods = {
     this.updateCellAreas();
     this.recalculate(true);
   },
-  handleTargetEnterEvent(isClear) {
-    const $tooltip = this.$refs.tooltip;
-    clearTimeout(this.tooltipTimeout);
-    if (isClear) {
-      this.closeTooltip();
-    } else {
-      if ($tooltip) {
-        $tooltip.setActived(true);
-      }
-    }
-  },
   handleTargetLeaveEvent() {
-    const tooltipOpts = this.tooltipOpts;
-    let $tooltip = this.$refs.tooltip;
-    if ($tooltip) {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const tooltipOpts = $xeTable.computeTooltipOpts;
+    let $tooltip = $xeTable.$refs.refTooltip;
+    if ($tooltip && $tooltip.setActived) {
       $tooltip.setActived(false);
     }
     if (tooltipOpts.enterable) {
-      this.tooltipTimeout = setTimeout(() => {
-        $tooltip = this.$refs.tooltip;
-        if ($tooltip && !$tooltip.isActived()) {
-          this.closeTooltip();
+      internalData.tooltipTimeout = setTimeout(() => {
+        $tooltip = $xeTable.$refs.refTooltip;
+        if ($tooltip && $tooltip.isActived && !$tooltip.isActived()) {
+          $xeTable.closeTooltip();
         }
       }, tooltipOpts.leaveDelay);
     } else {
-      this.closeTooltip();
+      $xeTable.closeTooltip();
     }
   },
   triggerHeaderTitleEvent(evnt, iconParams, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const tipContent = iconParams.content || iconParams.message;
     if (tipContent) {
       const {
-        $refs,
         tooltipStore
-      } = this;
+      } = reactData;
       const {
         column
       } = params;
       const content = getFuncText(tipContent);
-      this.handleTargetEnterEvent(true);
+      handleTargetEnterEvent($xeTable, true);
       tooltipStore.row = null;
       tooltipStore.column = column;
       tooltipStore.visible = true;
       tooltipStore.currOpts = iconParams;
-      this.$nextTick(() => {
-        const $tooltip = $refs.tooltip;
-        if ($tooltip) {
+      $xeTable.$nextTick(() => {
+        const $tooltip = $xeTable.$refs.refTooltip;
+        if ($tooltip && $tooltip.open) {
           $tooltip.open(evnt.currentTarget, content);
         }
       });
@@ -9883,28 +10513,48 @@ const Methods = {
    * 触发表头 tooltip 事件
    */
   triggerHeaderTooltipEvent(evnt, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       tooltipStore
-    } = this;
+    } = reactData;
     const {
       column
     } = params;
+    handleTargetEnterEvent($xeTable, true);
     const titleElem = evnt.currentTarget;
-    this.handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row);
+    if (!titleElem) {
+      return;
+    }
+    const cellEl = titleElem.parentElement;
+    if (!cellEl) {
+      return;
+    }
+    const thEl = cellEl.parentElement;
+    if (!thEl) {
+      return;
+    }
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      this.handleTooltip(evnt, titleElem, titleElem, null, params);
+      handleTooltip($xeTable, evnt, thEl, cellEl, null, params);
     }
   },
   /**
    * 触发单元格 tooltip 事件
    */
   triggerBodyTooltipEvent(evnt, params) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const {
+      editConfig
+    } = props;
+    const {
+      editStore
+    } = reactData;
     const {
-      editConfig,
-      editOpts,
-      editStore,
       tooltipStore
-    } = this;
+    } = reactData;
+    const editOpts = $xeTable.computeEditOpts;
     const {
       actived
     } = editStore;
@@ -9912,8 +10562,8 @@ const Methods = {
       row,
       column
     } = params;
-    const cell = evnt.currentTarget;
-    this.handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row !== row);
+    const tdEl = evnt.currentTarget;
+    handleTargetEnterEvent($xeTable, tooltipStore.column !== column || tooltipStore.row !== row);
     // 单元格处于编辑状态时不触发提示框
     if (column.editRender && isEnableConf(editConfig)) {
       // 如果是行编辑模式
@@ -9926,80 +10576,26 @@ const Methods = {
       }
     }
     if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-      let overflowElem;
-      let tipElem;
-      if (column.treeNode) {
-        overflowElem = cell.querySelector('.vxe-tree-cell');
-        if (column.type === 'html') {
-          tipElem = cell.querySelector('.vxe-cell--html');
-        }
-      } else {
-        tipElem = cell.querySelector(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label');
-      }
-      this.handleTooltip(evnt, cell, overflowElem || cell.children[0], tipElem, params);
+      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), null, params);
     }
   },
   /**
    * 触发表尾 tooltip 事件
    */
   triggerFooterTooltipEvent(evnt, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       column
     } = params;
     const {
       tooltipStore
-    } = this;
+    } = reactData;
     const cell = evnt.currentTarget;
-    this.handleTargetEnterEvent(true);
+    handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      this.handleTooltip(evnt, cell, cell.querySelector('.vxe-cell--item') || cell.children[0], null, params);
-    }
-  },
-  /**
-   * 处理显示 tooltip
-   * @param {Event} evnt 事件
-   * @param {ColumnInfo} column 列配置
-   * @param {Row} row 行对象
-   */
-  handleTooltip(evnt, cell, overflowElem, tipElem, params) {
-    const $xeTable = this;
-    if (!overflowElem) {
-      return $xeTable.$nextTick();
-    }
-    params.cell = cell;
-    const {
-      $refs,
-      tooltipOpts,
-      tooltipStore
-    } = this;
-    const {
-      column,
-      row
-    } = params;
-    const {
-      showAll,
-      enabled,
-      contentMethod
-    } = tooltipOpts;
-    const customContent = contentMethod ? contentMethod(params) : null;
-    const useCustom = contentMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent);
-    const content = useCustom ? customContent : (column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
-    const isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
-    if (content && (showAll || enabled || useCustom || isCellOverflow)) {
-      Object.assign(tooltipStore, {
-        row,
-        column,
-        visible: true,
-        currOpts: {}
-      });
-      this.$nextTick(() => {
-        const $tooltip = $refs.tooltip;
-        if ($tooltip) {
-          $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, formatText(content));
-        }
-      });
+      handleTooltip($xeTable, evnt, cell, cell.querySelector('.vxe-cell--wrapper') || cell.children[0], null, params);
     }
-    return this.$nextTick();
   },
   openTooltip(target, content) {
     const {
@@ -10015,12 +10611,13 @@ const Methods = {
    * 关闭 tooltip
    */
   closeTooltip() {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
-      $refs,
       tooltipStore
-    } = this;
-    const tooltip = $refs.tooltip;
-    const commTip = $refs.refCommTooltip;
+    } = reactData;
+    const tooltip = $xeTable.$refs.refTooltip;
+    const commTip = $xeTable.$refs.refCommTooltip;
     if (tooltipStore.visible) {
       Object.assign(tooltipStore, {
         row: null,
@@ -11243,10 +11840,13 @@ const Methods = {
     this.hoverRow = null;
   },
   triggerHeaderCellClickEvent(evnt, params) {
+    const $xeTable = this;
+    const internalData = $xeTable;
     const {
-      _lastResizeTime,
-      sortOpts
-    } = this;
+      _lastResizeTime
+    } = internalData;
+    const sortOpts = $xeTable.computeSortOpts;
+    const columnOpts = $xeTable.computeColumnOpts;
     const {
       column
     } = params;
@@ -11255,18 +11855,18 @@ const Methods = {
     const triggerSort = getEventTargetNode(evnt, cell, 'vxe-cell--sort').flag;
     const triggerFilter = getEventTargetNode(evnt, cell, 'vxe-cell--filter').flag;
     if (sortOpts.trigger === 'cell' && !(triggerResizable || triggerSort || triggerFilter)) {
-      this.triggerSortEvent(evnt, column, getNextSortOrder(this, column));
+      $xeTable.triggerSortEvent(evnt, column, getNextSortOrder($xeTable, column));
     }
-    this.emitEvent('header-cell-click', Object.assign({
+    $xeTable.dispatchEvent('header-cell-click', Object.assign({
       triggerResizable,
       triggerSort,
       triggerFilter,
       cell
     }, params), evnt);
-    if (this.columnOpts.isCurrent || this.highlightCurrentColumn) {
-      this.triggerCurrentColumnEvent(evnt, params);
+    if (columnOpts.isCurrent || $xeTable.highlightCurrentColumn) {
+      $xeTable.triggerCurrentColumnEvent(evnt, params);
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   triggerHeaderCellDblclickEvent(evnt, params) {
     this.emitEvent('header-cell-dblclick', Object.assign({
@@ -11318,18 +11918,26 @@ const Methods = {
    */
   triggerCellClickEvent(evnt, params) {
     const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
     const {
       highlightCurrentRow,
+      editConfig
+    } = props;
+    const {
       editStore,
-      radioOpts,
-      expandOpts,
-      treeOpts,
-      keyboardOpts,
-      editConfig,
-      editOpts,
-      checkboxOpts,
-      rowOpts
-    } = this;
+      isDragResize
+    } = reactData;
+    if (isDragResize) {
+      return;
+    }
+    const expandOpts = $xeTable.computeExpandOpts;
+    const editOpts = $xeTable.computeEditOpts;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const radioOpts = $xeTable.computeRadioOpts;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
+    const keyboardOpts = $xeTable.computeKeyboardOpts;
+    const rowOpts = $xeTable.computeRowOpts;
     const {
       actived,
       focused
@@ -11428,11 +12036,20 @@ const Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent(evnt, params) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const {
+      editConfig
+    } = props;
     const {
       editStore,
-      editConfig,
-      editOpts
-    } = this;
+      isDragResize
+    } = reactData;
+    if (isDragResize) {
+      return;
+    }
+    const editOpts = $xeTable.computeEditOpts;
     const {
       actived
     } = editStore;
@@ -11520,6 +12137,10 @@ const Methods = {
   triggerSortEvent(evnt, column, order) {
     const $xeTable = this;
     const sortOpts = $xeTable.computeSortOpts;
+    const {
+      multiple,
+      allowClear
+    } = sortOpts;
     const {
       field,
       sortable,
@@ -11527,7 +12148,9 @@ const Methods = {
     } = column;
     if (sortable || remoteSort) {
       if (!order || column.order === order) {
-        $xeTable.clearSort(sortOpts.multiple ? column : null);
+        if (allowClear) {
+          $xeTable.clearSort(multiple ? column : null);
+        }
       } else {
         $xeTable.sort({
           field,
@@ -11662,7 +12285,8 @@ const Methods = {
       isPeerDrag,
       isCrossDrag,
       isSelfToChildDrag,
-      dragEndMethod
+      dragEndMethod,
+      dragToChildMethod
     } = rowDragOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
@@ -11681,13 +12305,15 @@ const Methods = {
     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;
           }
@@ -11765,7 +12391,9 @@ const Methods = {
                   // 根到根
                 }
                 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);
@@ -11780,12 +12408,12 @@ const Methods = {
                     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
                 });
               }
             }
@@ -11805,7 +12433,7 @@ const Methods = {
           }
           reactData.isDragRowMove = true;
           $xeTable.handleTableData(treeConfig && transform);
-          $xeTable.cacheRowMap();
+          $xeTable.cacheRowMap(false);
           updateScrollYStatus($xeTable);
           if (!(treeConfig && transform)) {
             updateAfterDataIndex($xeTable);
@@ -11822,7 +12450,7 @@ const Methods = {
             oldRow: dragRow,
             newRow: prevDragRow,
             dragPos: prevDragPos,
-            dragToChild: !!prevDragToChild,
+            dragToChild: isDragToChildFlag,
             offsetIndex: dragOffsetIndex,
             _index: {
               newIndex: nafIndex,
@@ -11858,18 +12486,16 @@ const Methods = {
       prevDragRow,
       prevDragPos
     } = internalData;
-    if (treeConfig && prevDragToChild) {
+    if (treeConfig && lazy && prevDragToChild) {
       // 懒加载
-      if (lazy) {
-        const newRowid = getRowid($xeTable, prevDragRow);
-        const rowRest = fullAllDataRowIdData[newRowid];
-        if (prevDragRow[hasChildField]) {
-          if (rowRest && rowRest.treeLoaded) {
-            $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
-          }
-        } else {
+      const newRowid = getRowid($xeTable, prevDragRow);
+      const rowRest = fullAllDataRowIdData[newRowid];
+      if (prevDragRow[hasChildField]) {
+        if (rowRest && rowRest.treeLoaded) {
           $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
         }
+      } else {
+        $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
       }
     } else {
       $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
@@ -12013,7 +12639,8 @@ const Methods = {
       isCrossDrag,
       isSelfToChildDrag,
       isToChildDrag,
-      dragEndMethod
+      dragEndMethod,
+      dragToChildMethod
     } = columnDragOpts;
     const {
       collectColumn
@@ -12024,13 +12651,15 @@ const Methods = {
       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;
           }
@@ -12126,7 +12755,7 @@ const Methods = {
               parent: nParent
             } = newMatchRest;
             // 转子级
-            if (isCrossDrag && isToChildDrag && prevDragToChild) {
+            if (isCrossDrag && isToChildDrag && isDragToChildFlag) {
               oldColumn.parentId = newColumn.id;
               newColumn.children = (newColumn.children || []).concat([oldColumn]);
             } else {
@@ -12157,7 +12786,7 @@ const Methods = {
             oldColumn,
             newColumn,
             dragPos: prevDragPos,
-            dragToChild: !!prevDragToChild,
+            dragToChild: isDragToChildFlag,
             offsetIndex: dragOffsetIndex,
             _index: {
               newIndex: nafIndex,
@@ -13421,17 +14050,22 @@ const Methods = {
    * 获取表格的滚动状态
    */
   getScroll() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      $refs,
       scrollXLoad,
       scrollYLoad
-    } = this;
-    const bodyElem = $refs.refTableBody.$el;
+    } = reactData;
+    const {
+      elemStore
+    } = internalData;
+    const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
     return {
       virtualX: scrollXLoad,
       virtualY: scrollYLoad,
-      scrollTop: bodyElem.scrollTop,
-      scrollLeft: bodyElem.scrollLeft
+      scrollTop: bodyScrollElem ? bodyScrollElem.scrollTop : 0,
+      scrollLeft: bodyScrollElem ? bodyScrollElem.scrollLeft : 0
     };
   },
   handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
@@ -13540,60 +14174,6 @@ const Methods = {
     }
     $xeTable.dispatchEvent('scroll', evntParams, evnt);
   },
-  lazyScrollXData() {
-    const $xeTable = this;
-    const internalData = $xeTable;
-    const {
-      lxTimeout,
-      lxRunTime,
-      scrollXStore
-    } = internalData;
-    const {
-      visibleSize
-    } = scrollXStore;
-    const fpsTime = Math.max(5, Math.min(80, Math.floor(visibleSize * 3)));
-    if (lxTimeout) {
-      clearTimeout(lxTimeout);
-    }
-    if (!lxRunTime || lxRunTime + fpsTime < Date.now()) {
-      internalData.lxRunTime = Date.now();
-      loadScrollXData($xeTable);
-    }
-    internalData.lxTimeout = setTimeout(() => {
-      internalData.lxTimeout = undefined;
-      internalData.lxRunTime = undefined;
-      loadScrollXData($xeTable);
-    }, fpsTime);
-  },
-  lazyScrollYData() {
-    const $xeTable = this;
-    const props = $xeTable;
-    const internalData = $xeTable;
-    const {
-      showOverflow
-    } = props;
-    const {
-      lyTimeout,
-      lyRunTime,
-      scrollYStore
-    } = internalData;
-    const {
-      visibleSize
-    } = scrollYStore;
-    const fpsTime = showOverflow ? 5 : Math.max(5, Math.min(80, Math.floor(visibleSize / 2)));
-    if (lyTimeout) {
-      clearTimeout(lyTimeout);
-    }
-    if (!lyRunTime || lyRunTime + fpsTime < Date.now()) {
-      internalData.lyRunTime = Date.now();
-      loadScrollYData($xeTable);
-    }
-    internalData.lyTimeout = setTimeout(() => {
-      internalData.lyTimeout = undefined;
-      internalData.lyRunTime = undefined;
-      loadScrollYData($xeTable);
-    }, fpsTime);
-  },
   /**
    * 横向 X 可视渲染事件处理
    */
@@ -13603,7 +14183,7 @@ const Methods = {
     if (sXOpts.immediate) {
       loadScrollXData($xeTable);
     } else {
-      $xeTable.lazyScrollXData();
+      lazyScrollXData($xeTable);
     }
   },
   /**
@@ -13615,7 +14195,7 @@ const Methods = {
     if (sYOpts.immediate) {
       loadScrollYData($xeTable);
     } else {
-      $xeTable.lazyScrollYData();
+      lazyScrollYData($xeTable);
     }
   },
   triggerBodyScrollEvent(evnt, fixedType) {
@@ -13623,6 +14203,7 @@ const Methods = {
     const internalData = $xeTable;
     const {
       elemStore,
+      intoRunScroll,
       lastScrollTop,
       lastScrollLeft,
       inWheelScroll,
@@ -13642,6 +14223,9 @@ const Methods = {
     if (inWheelScroll || inVirtualScroll || inHeaderScroll || inFooterScroll) {
       return;
     }
+    if (intoRunScroll) {
+      return;
+    }
     if (!bodyScrollElem) {
       return;
     }
@@ -13700,6 +14284,7 @@ const Methods = {
     const internalData = $xeTable;
     const {
       elemStore,
+      intoRunScroll,
       inWheelScroll,
       inVirtualScroll,
       inBodyScroll,
@@ -13710,16 +14295,10 @@ const Methods = {
     const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
     const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
     const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
-    if (inWheelScroll) {
-      return;
-    }
-    if (inVirtualScroll) {
-      return;
-    }
-    if (inBodyScroll) {
+    if (inWheelScroll || inVirtualScroll || inBodyScroll || inFooterScroll) {
       return;
     }
-    if (inFooterScroll) {
+    if (intoRunScroll) {
       return;
     }
     if (!headerScrollElem) {
@@ -13750,6 +14329,7 @@ const Methods = {
     const internalData = $xeTable;
     const {
       elemStore,
+      intoRunScroll,
       inWheelScroll,
       inVirtualScroll,
       inHeaderScroll,
@@ -13760,16 +14340,10 @@ const Methods = {
     const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
     const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
     const footerScrollElem = getRefElem(elemStore['main-footer-scroll']);
-    if (inWheelScroll) {
-      return;
-    }
-    if (inVirtualScroll) {
-      return;
-    }
-    if (inHeaderScroll) {
+    if (inWheelScroll || inVirtualScroll || inHeaderScroll || inBodyScroll) {
       return;
     }
-    if (inBodyScroll) {
+    if (intoRunScroll) {
       return;
     }
     if (!footerScrollElem) {
@@ -13801,9 +14375,13 @@ const Methods = {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const {
+      target,
       deltaY,
       deltaX
     } = evnt;
+    if (target && /^textarea$/i.test(target.tagName)) {
+      return;
+    }
     const {
       highlightHoverRow
     } = tableProps;
@@ -13827,26 +14405,13 @@ const Methods = {
     if (!bodyScrollElem) {
       return;
     }
-    let multiple = 1;
-    if (reactData.lastScrollTime + 25 > Date.now()) {
-      multiple = 1.18;
-    } else if (reactData.lastScrollTime + 30 > Date.now()) {
-      multiple = 1.15;
-    } else if (reactData.lastScrollTime + 40 > Date.now()) {
-      multiple = 1.12;
-    } else if (reactData.lastScrollTime + 55 > Date.now()) {
-      multiple = 1.09;
-    } else if (reactData.lastScrollTime + 75 > Date.now()) {
-      multiple = 1.06;
-    } else if (reactData.lastScrollTime + 100 > Date.now()) {
-      multiple = 1.03;
-    }
-    const deltaTop = deltaY * multiple;
-    const deltaLeft = deltaX * multiple;
+    const wheelSpeed = getWheelSpeed(reactData.lastScrollTime);
+    const deltaTop = deltaY * wheelSpeed;
+    const deltaLeft = deltaX * wheelSpeed;
     const isTopWheel = deltaTop < 0;
-    const currScrollTop = yHandleEl.scrollTop;
+    const currScrollTop = bodyScrollElem.scrollTop;
     // 如果滚动位置已经是顶部或底部，则不需要触发
-    if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= yHandleEl.scrollHeight - yHandleEl.clientHeight) {
+    if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= bodyScrollElem.scrollHeight - bodyScrollElem.clientHeight) {
       return;
     }
     const scrollTop = bodyScrollElem.scrollTop + deltaTop;
@@ -13859,16 +14424,29 @@ const Methods = {
       if (rowOpts.isHover || highlightHoverRow) {
         $xeTable.clearHoverRow();
       }
-      internalData.inWheelScroll = true;
-      setScrollTop(yHandleEl, scrollTop);
-      setScrollTop(bodyScrollElem, scrollTop);
-      setScrollTop(leftScrollElem, scrollTop);
-      setScrollTop(rightScrollElem, scrollTop);
-      $xeTable.triggerScrollYEvent(evnt);
-      $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
-        type: 'footer',
-        fixed: ''
+      wheelScrollTo(scrollTop - bodyScrollElem.scrollTop, offsetTop => {
+        const currTopNum = bodyScrollElem.scrollTop + offsetTop;
+        internalData.inWheelScroll = true;
+        setScrollTop(yHandleEl, currTopNum);
+        setScrollTop(bodyScrollElem, currTopNum);
+        setScrollTop(leftScrollElem, currTopNum);
+        setScrollTop(rightScrollElem, currTopNum);
+        $xeTable.triggerScrollYEvent(evnt);
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, scrollLeft, {
+          type: 'table',
+          fixed: ''
+        });
       });
+      // internalData.inWheelScroll = true
+      // setScrollTop(yHandleEl, scrollTop)
+      // setScrollTop(bodyScrollElem, scrollTop)
+      // setScrollTop(leftScrollElem, scrollTop)
+      // setScrollTop(rightScrollElem, scrollTop)
+      // loadScrollYData($xeTable, scrollTop)
+      // $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
+      //   type: 'footer',
+      //   fixed: ''
+      // })
     }
   },
   triggerVirtualScrollXEvent(evnt) {
@@ -13957,15 +14535,15 @@ const Methods = {
   },
   updateScrollXData() {
     const $xeTable = this;
-    const props = $xeTable;
+    const reactData = $xeTable;
     const {
-      showOverflow
-    } = props;
+      isAllOverflow
+    } = reactData;
     handleTableColumn($xeTable);
     return $xeTable.$nextTick().then(() => {
       handleTableColumn($xeTable);
       $xeTable.updateScrollXSpace();
-      if (!showOverflow) {
+      if (!isAllOverflow) {
         $xeTable.updateScrollYSpace();
       }
     });
@@ -14037,49 +14615,46 @@ const Methods = {
   // 更新纵向 Y 可视渲染上下剩余空间大小
   updateScrollYSpace() {
     const $xeTable = this;
-    const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
     const {
-      showOverflow
-    } = props;
-    const {
-      scrollYLoad,
-      rowHeight
+      isAllOverflow,
+      scrollYLoad
     } = reactData;
     const {
       scrollYStore,
       elemStore,
+      isResizeCellHeight,
       afterFullData,
       fullAllDataRowIdData
     } = internalData;
     const {
       startIndex
     } = scrollYStore;
+    const rowOpts = $xeTable.computeRowOpts;
+    const cellOpts = $xeTable.computeCellOpts;
+    const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const bodyTableElem = getRefElem(elemStore['main-body-table']);
     const containerList = ['main', 'left', 'right'];
     let topSpaceHeight = 0;
     let ySpaceHeight = 0;
     if (scrollYLoad) {
-      if (showOverflow) {
-        ySpaceHeight = afterFullData.length * rowHeight;
-        topSpaceHeight = Math.max(0, startIndex * rowHeight);
+      const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
+      if (!isCustomCellHeight && 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 || cellOpts.height || rowOpts.height || rowRest.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 || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
         }
       }
     } else {
@@ -14104,7 +14679,7 @@ const Methods = {
     if (scrollYSpaceEl) {
       scrollYSpaceEl.style.height = ySpaceHeight ? `${ySpaceHeight}px` : '';
     }
-    $xeTable.$nextTick(() => {
+    return $xeTable.$nextTick().then(() => {
       updateStyle($xeTable);
     });
   },
@@ -14175,12 +14750,9 @@ const Methods = {
    */
   scrollToRow(row, fieldOrColumn) {
     const $xeTable = this;
-    const props = $xeTable;
     const reactData = $xeTable;
     const {
-      showOverflow
-    } = props;
-    const {
+      isAllOverflow,
       scrollYLoad,
       scrollXLoad
     } = reactData;
@@ -14197,7 +14769,7 @@ const Methods = {
     }
     return Promise.all(rest).then(() => {
       if (row) {
-        if (!showOverflow && (scrollYLoad || scrollXLoad)) {
+        if (!isAllOverflow && (scrollYLoad || scrollXLoad)) {
           calcCellHeight($xeTable);
           calcCellWidth($xeTable);
         }
@@ -14568,11 +15140,11 @@ const isVMScrollProcess = $xeTable => {
   } = tableProps;
   const {
     lastScrollTime,
-    _isResize
+    isDragResize
   } = tableReactData;
-  return !!(_isResize || lastScrollTime && Date.now() < lastScrollTime + delayHover);
+  return !!(isDragResize || lastScrollTime && Date.now() < lastScrollTime + delayHover);
 };
-function renderLine(h, _vm, params) {
+function renderLine(h, _vm, params, cellHeight) {
   const $xeTable = _vm.$parent;
   const tableProps = $xeTable;
   const tableInternalData = $xeTable;
@@ -14608,11 +15180,13 @@ function renderLine(h, _vm, params) {
   const isFirstRow = $xeTable.eqRow(afterFullData[0], row);
   if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [h('div', {
+      key: 'tl',
       class: 'vxe-tree--line-wrapper'
     }, [h('div', {
       class: 'vxe-tree--line',
       style: {
         height: `${isFirstRow ? 1 : calcTreeLine(params, prevRow)}px`,
+        bottom: `-${Math.floor(cellHeight / 2)}px`,
         left: `${rLevel * treeOpts.indent + (rLevel ? 2 - getOffsetSize($xeTable) : 0) + 16}px`
       }
     })])];
@@ -14632,8 +15206,9 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   } = tableInternalData;
   const {
     columnKey,
+    resizable: allResizable,
+    border,
     height,
-    showOverflow: allColumnOverflow,
     cellClassName: allCellClassName,
     cellStyle,
     align: allAlign,
@@ -14641,7 +15216,8 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     mouseConfig,
     editConfig,
     editRules,
-    tooltipConfig
+    tooltipConfig,
+    padding: allPadding
   } = tableProps;
   const {
     tableData,
@@ -14649,7 +15225,8 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     currentColumn,
     scrollXLoad,
     scrollYLoad,
-    isCalcCellHeight,
+    calcCellHeightFlag,
+    resizeHeightFlag,
     mergeList,
     editStore,
     isAllOverflow,
@@ -14665,9 +15242,14 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const checkboxOpts = $xeTable.computeCheckboxOpts;
   const editOpts = $xeTable.computeEditOpts;
   const tooltipOpts = $xeTable.computeTooltipOpts;
+  const {
+    isAllColumnDrag,
+    isAllRowDrag
+  } = $xeTable.resizableOpts;
   const rowOpts = $xeTable.computeRowOpts;
   const rowDragOpts = $xeTable.computeRowDragOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+  const customCellHeight = cellOpts.height || rowOpts.height;
   const {
     disabledMethod: dragDisabledMethod,
     isCrossDrag,
@@ -14687,17 +15269,18 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     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;
@@ -14707,23 +15290,27 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const columnIndex = $xeTable.getColumnIndex(column);
   const _columnIndex = $xeTable.getVTColumnIndex(column);
   const isEdit = isEnableConf(editRender);
+  const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
   let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
-  const 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,
@@ -14751,7 +15338,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     isRowDragCell = rowDragOpts.trigger === 'row' || column.dragSort && rowDragOpts.trigger === 'cell';
   }
   if (isRowDragCell) {
-    isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
+    isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(cellParams));
   }
   // hover 进入事件
   if (showTitle || showTooltip || showAllTip || tooltipConfig) {
@@ -14763,11 +15350,11 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
         updateCellTitle(evnt.currentTarget, column);
       } else if (showTooltip || showAllTip) {
         // 如果配置了显示 tooltip
-        $xeTable.triggerBodyTooltipEvent(evnt, params);
+        $xeTable.triggerBodyTooltipEvent(evnt, cellParams);
       }
       $xeTable.dispatchEvent('cell-mouseenter', Object.assign({
         cell: evnt.currentTarget
-      }, params), evnt);
+      }, cellParams), evnt);
     };
   }
   // hover 退出事件
@@ -14781,13 +15368,13 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
       }
       $xeTable.dispatchEvent('cell-mouseleave', Object.assign({
         cell: evnt.currentTarget
-      }, params), evnt);
+      }, cellParams), evnt);
     };
   }
   // 按下事件处理
   if (isRowDragCell || checkboxOpts.range || mouseConfig) {
     tdOns.mousedown = evnt => {
-      $xeTable.triggerCellMousedownEvent(evnt, params);
+      $xeTable.triggerCellMousedownEvent(evnt, cellParams);
     };
   }
   // 拖拽列事件
@@ -14796,11 +15383,11 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   }
   // 点击事件处理
   tdOns.click = evnt => {
-    $xeTable.triggerCellClickEvent(evnt, params);
+    $xeTable.triggerCellClickEvent(evnt, cellParams);
   };
   // 双击事件处理
   tdOns.dblclick = evnt => {
-    $xeTable.triggerCellDblclickEvent(evnt, params);
+    $xeTable.triggerCellDblclickEvent(evnt, cellParams);
   };
   // 合并行或列
   if (mergeList.length) {
@@ -14814,10 +15401,10 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
         return null;
       }
       if (rowspan > 1) {
-        attrs.rowspan = rowspan;
+        tdAttrs.rowspan = rowspan;
       }
       if (colspan > 1) {
-        attrs.colspan = colspan;
+        tdAttrs.colspan = colspan;
       }
     }
   } else if (spanMethod) {
@@ -14825,20 +15412,20 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     const {
       rowspan = 1,
       colspan = 1
-    } = spanMethod(params) || {};
+    } = spanMethod(cellParams) || {};
     if (!rowspan || !colspan) {
       return null;
     }
     if (rowspan > 1) {
-      attrs.rowspan = rowspan;
+      tdAttrs.rowspan = rowspan;
     }
     if (colspan > 1) {
-      attrs.colspan = colspan;
+      tdAttrs.colspan = colspan;
     }
   }
   // 如果被合并不可隐藏
   if (fixedHiddenColumn && mergeList) {
-    if (attrs.colspan > 1 || attrs.rowspan > 1) {
+    if (tdAttrs.colspan > 1 || tdAttrs.rowspan > 1) {
       fixedHiddenColumn = false;
     }
   }
@@ -14847,28 +15434,25 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     isDirty = $xeTable.isUpdateByRow(row, column.field);
   }
   const isVNAutoHeight = scrollYLoad && !hasEllipsis;
-  let cellHeight = 0;
-  const vnHeight = isCalcCellHeight ? rest.height : 0;
-  if (hasEllipsis) {
-    if (customRHeight) {
-      cellHeight = customRHeight;
-    } else if (!isAllOverflow) {
-      cellHeight = vnHeight || defaultRowHeight || 18;
-    }
-  } else {
-    cellHeight = vnHeight || defaultRowHeight || 18;
+  const cellHeight = calcCellHeightFlag ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight : defaultRowHeight;
+  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 (cellHeight) {
-    if (hasEllipsis) {
-      tcStyle.maxHeight = `${cellHeight}px`;
-    } else if (isVNAutoHeight) {
-      tcStyle.height = `${cellHeight}px`;
-    }
+  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(h('div', {
+      key: 'tc',
       class: ['vxe-cell', {
         'c--title': showTitle,
         'c--tooltip': showTooltip,
@@ -14878,7 +15462,8 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     }));
   } else {
     // 渲染单元格
-    tdVNs.push(...renderLine(h, _vm, params), h('div', {
+    tdVNs.push(...renderLine(h, _vm, cellParams, cellHeight), h('div', {
+      key: 'tc',
       class: ['vxe-cell', {
         'c--title': showTitle,
         'c--tooltip': showTooltip,
@@ -14888,18 +15473,23 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
       attrs: {
         title: showTitle ? $xeTable.getCellLabel(row, column) : null
       }
-    }, isVNAutoHeight ? [h('div', {
-      class: 'vxe-cell--auto-wrapper'
-    }, column.renderCell(h, params))] : column.renderCell(h, params)));
+    }, isVNPreEmptyStatus ? [] : [h('div', {
+      attrs: {
+        colid,
+        rowid
+      },
+      class: 'vxe-cell--wrapper'
+    }, column.renderCell(h, cellParams))]));
     if (showValidTip && errorValidItem) {
       const errRule = errorValidItem.rule;
       const validSlot = slots ? slots.valid : null;
       const validParams = {
-        ...params,
+        ...cellParams,
         ...errorValidItem,
         rule: errorValidItem
       };
       tdVNs.push(h('div', {
+        key: 'tcv',
         class: ['vxe-cell--valid-error-tip', getClass(validOpts.className, errorValidItem)],
         style: errRule && errRule.maxWidth ? {
           width: `${errRule.maxWidth}px`
@@ -14911,47 +15501,59 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
       }, errorValidItem.content)]])]));
     }
   }
+  let showAreaRowStatus = false;
   if (mouseConfig && mouseOpts.area && selectCellToRow) {
-    if (!$columnIndex && selectCellToRow === true || selectCellToRow === column.field) {
-      tdVNs.push(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 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;
+  if (!fixedHiddenColumn && showResizable && isAllColumnDrag) {
+    tdVNs.push(h('div', {
+      key: 'tcc',
+      class: ['vxe-cell--col-resizable', {
+        'is--line': !border || border === 'none'
+      }],
+      on: {
+        mousedown: evnt => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
+        dblclick: evnt => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
+      }
+    }));
+  }
+  if ((rowResize || isAllRowDrag) && rowOpts.resizable) {
+    tdVNs.push(h('div', {
+      key: 'tcr',
+      class: 'vxe-cell--row-resizable',
+      on: {
+        mousedown: evnt => $xeTable.handleRowResizeMousedownEvent(evnt, cellParams),
+        dblclick: evnt => $xeTable.handleRowResizeDblclickEvent(evnt, cellParams)
+      }
+    }));
   }
   return h('td', {
-    class: ['vxe-body--column', column.id, {
-      [`col--${cellAlign}`]: cellAlign,
-      [`col--vertical-${verticalAlign}`]: verticalAlign,
-      [`col--${type}`]: type,
+    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
-    }, getClass(compCellClassName, params), getClass(className, params), getClass(allCellClassName, params)],
+    }, getClass(compCellClassName, cellParams), getClass(className, cellParams), getClass(allCellClassName, cellParams)],
     key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? column.id : $columnIndex,
-    attrs,
-    style: Object.assign({
-      height: cellHeight ? `${cellHeight}px` : ''
-    }, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cellStyle) ? cellStyle(params) : cellStyle),
+    attrs: tdAttrs,
+    style: Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(compCellStyle) ? compCellStyle(cellParams) : compCellStyle, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cellStyle) ? cellStyle(cellParams) : cellStyle),
     on: tdOns
-  }, isVNPreEmptyStatus || isOptimizeMode && fixedHiddenColumn ? [] : tdVNs);
+  }, isOptimizeMode && fixedHiddenColumn ? [] : tdVNs);
 }
 function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
   const $xeTable = _vm.$parent;
@@ -14964,15 +15566,16 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     highlightHoverRow,
     rowClassName,
     rowStyle,
-    showOverflow: allColumnOverflow,
     editConfig,
     treeConfig
   } = tableProps;
   const {
     hasFixedColumn,
     treeExpandedMaps,
+    isColLoading,
     scrollXLoad,
     scrollYLoad,
+    isAllOverflow,
     rowExpandedMaps,
     expandColumn,
     selectRadioRow,
@@ -15077,7 +15680,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     const tdVNs = tableColumn.map((column, $columnIndex) => {
       return renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
     });
-    rows.push(columnOpts.drag && columnDragOpts.animation ? h('transition-group', {
+    rows.push(!isColLoading && columnOpts.drag && columnDragOpts.animation ? h('transition-group', {
       props: {
         tag: 'tr',
         name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`
@@ -15115,7 +15718,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       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,
@@ -15227,7 +15830,6 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       tableColumn
     } = props;
     const {
-      showOverflow: allColumnOverflow,
       spanMethod,
       footerSpanMethod,
       mouseConfig
@@ -15235,6 +15837,8 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     const {
       isGroup,
       tableData,
+      isRowLoading,
+      isColLoading,
       scrollXLoad,
       scrollYLoad,
       isAllOverflow,
@@ -15258,7 +15862,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     let renderColumnList = tableColumn;
     let isOptimizeMode = false;
     // 如果是使用优化模式
-    if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+    if (scrollXLoad || scrollYLoad || isAllOverflow) {
       if (expandColumn || spanMethod || footerSpanMethod) {
         // 如果不支持优化模式
       } else {
@@ -15382,9 +15986,9 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       });
     })),
     /**
-    * 内容
-    */
-    rowOpts.drag && rowDragOpts.animation ? h('transition-group', {
+     * 内容
+     */
+    !(isRowLoading || isColLoading) && rowOpts.drag && rowDragOpts.animation ? h('transition-group', {
       ref: 'refBodyTBody',
       props: {
         tag: 'tbody',
@@ -15419,6 +16023,8 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       class: 'vxe-table--cell-multi-area'
     }), h('span', {
       class: 'vxe-table--cell-active-area'
+    }), h('span', {
+      class: 'vxe-table--cell-row-status-area'
     })]) : body_renderEmptyElement($xeTable), !fixedType ? h('div', {
       class: 'vxe-table--empty-block',
       ref: 'emptyBlock'
@@ -15432,9 +16038,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
 
 
 
-
 const {
-  getI18n: header_getI18n,
   renderer: header_renderer,
   renderEmptyElement: header_renderEmptyElement
 } = core_.VxeUI;
@@ -15471,6 +16075,10 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
   } = tableInternalData;
   const columnOpts = $xeTable.computeColumnOpts;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
+  const cellOpts = $xeTable.computeCellOpts;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+  const headerCellOpts = $xeTable.computeHeaderCellOpts;
+  const currCellHeight = getCellHeight(headerCellOpts.height || cellOpts.height) || defaultRowHeight;
   const {
     disabledMethod: dragDisabledMethod,
     isCrossDrag,
@@ -15493,6 +16101,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const compConf = renderOpts ? header_renderer.get(renderOpts.name) : null;
     const isColGroup = column.children && column.children.length;
     const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
+    const isPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
     const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showHeaderOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
     const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
     let showEllipsis = headOverflow === 'ellipsis';
@@ -15507,7 +16116,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     }
     const columnIndex = $xeTable.getColumnIndex(column);
     const _columnIndex = $xeTable.getVTColumnIndex(column);
-    const params = {
+    const cellParams = {
       $table: $xeTable,
       $grid: $xeGrid,
       $rowIndex,
@@ -15527,8 +16136,8 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
       rowspan: column.rowSpan > 1 ? column.rowSpan : null
     };
     const thOns = {
-      click: evnt => $xeTable.triggerHeaderCellClickEvent(evnt, params),
-      dblclick: evnt => $xeTable.triggerHeaderCellDblclickEvent(evnt, params)
+      click: evnt => $xeTable.triggerHeaderCellClickEvent(evnt, cellParams),
+      dblclick: evnt => $xeTable.triggerHeaderCellDblclickEvent(evnt, cellParams)
     };
     // 虚拟滚动不支持动态高度
     if (scrollXLoad && !hasEllipsis) {
@@ -15537,11 +16146,11 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const isColDragCell = columnOpts.drag && columnDragOpts.trigger === 'cell';
     let isDisabledDrag = false;
     if (isColDragCell) {
-      isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
+      isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(cellParams));
     }
     // 按下事件处理
     if (mouseConfig || isColDragCell) {
-      thOns.mousedown = evnt => $xeTable.triggerHeaderCellMousedownEvent(evnt, params);
+      thOns.mousedown = evnt => $xeTable.triggerHeaderCellMousedownEvent(evnt, cellParams);
     }
     // 拖拽列事件
     if (columnOpts.drag) {
@@ -15559,6 +16168,12 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
       isVNPreEmptyStatus = true;
     }
+    const tcStyle = {};
+    if (hasEllipsis) {
+      tcStyle.height = `${currCellHeight}px`;
+    } else {
+      tcStyle.minHeight = `${currCellHeight}px`;
+    }
     return h('th', {
       class: ['vxe-header--column', colid, {
         [`col--${headAlign}`]: headAlign,
@@ -15569,15 +16184,16 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
         'col--ellipsis': hasEllipsis,
         'fixed--width': !isAutoCellWidth,
         'fixed--hidden': fixedHiddenColumn,
+        'is--padding': isPadding,
         'is--sortable': column.sortable,
         'col--filter': !!filters,
         'is--filter-active': hasFilter,
         'is--drag-active': !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
         'is--drag-disabled': isDisabledDrag,
         'col--current': currentColumn === column
-      }, getClass(headerClassName, params), getClass(headerCellClassName, params)],
+      }, getClass(headerClassName, cellParams), getClass(headerCellClassName, cellParams)],
       attrs: thAttrs,
-      style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle : undefined,
+      style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle) ? headerCellStyle(cellParams) : headerCellStyle : undefined,
       on: thOns,
       key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
     }, [h('div', {
@@ -15585,18 +16201,24 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
         'c--title': showTitle,
         'c--tooltip': showTooltip,
         'c--ellipsis': showEllipsis
-      }]
-    }, isVNPreEmptyStatus || isOptimizeMode && fixedHiddenColumn ? [] : column.renderHeader(h, params)),
+      }],
+      style: tcStyle
+    }, isVNPreEmptyStatus || isOptimizeMode && fixedHiddenColumn ? [] : [h('div', {
+      attrs: {
+        colid
+      },
+      class: 'vxe-cell--wrapper'
+    }, column.renderHeader(h, cellParams))]),
     /**
     * 列宽拖动
     */
     !fixedHiddenColumn && showResizable ? h('div', {
-      class: ['vxe-resizable', {
+      class: ['vxe-cell--col-resizable', {
         'is--line': !border || border === 'none'
       }],
       on: {
-        mousedown: evnt => _vm.resizeMousedownEvent(evnt, params),
-        dblclick: evnt => $xeTable.handleResizeDblclickEvent(evnt, params)
+        mousedown: evnt => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
+        dblclick: evnt => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
       }
     }) : header_renderEmptyElement($xeTable)]);
   });
@@ -15616,6 +16238,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
     headerRowStyle
   } = tableProps;
   const {
+    isColLoading,
     isDragColMove
   } = tableReactData;
   return headerGroups.map((cols, $rowIndex) => {
@@ -15625,7 +16248,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
       fixed: fixedType,
       type: cellType
     };
-    if (columnOpts.drag && columnDragOpts.animation) {
+    if (!isColLoading && columnOpts.drag && columnDragOpts.animation) {
       return h('transition-group', {
         key: $rowIndex,
         props: {
@@ -15725,6 +16348,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
       headerColumn
     } = this;
     const {
+      mouseConfig,
       showHeaderOverflow: allColumnHeaderOverflow,
       spanMethod,
       footerSpanMethod
@@ -15739,6 +16363,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
       visibleColumn,
       fullColumnIdData
     } = tableInternalData;
+    const mouseOpts = $xeTable.computeMouseOpts;
     let renderHeaderList = headerColumn;
     let renderColumnList = tableColumn;
     let isOptimizeMode = false;
@@ -15833,14 +16458,21 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
      */
     h('thead', {
       ref: 'refHeaderTHead'
-    }, renderHeads(h, this, isGroup, isOptimizeMode, renderHeaderList))]),
-    /**
-     * 其他
-     */
-    h('div', {
-      ref: 'refHeaderBorderRepair',
-      class: 'vxe-table--header-border-line'
-    })])]);
+    }, renderHeads(h, this, isGroup, isOptimizeMode, renderHeaderList)), mouseConfig && mouseOpts.area ? h('div', {
+      class: 'vxe-table--cell-area'
+    }, [h('span', {
+      class: 'vxe-table--cell-main-area'
+    }), h('span', {
+      class: 'vxe-table--cell-copy-area'
+    }), h('span', {
+      class: 'vxe-table--cell-extend-area'
+    }), h('span', {
+      class: 'vxe-table--cell-multi-area'
+    }), h('span', {
+      class: 'vxe-table--cell-active-area'
+    }), h('span', {
+      class: 'vxe-table--cell-col-status-area'
+    })]) : header_renderEmptyElement($xeTable)])])]);
   },
   methods: {
     uploadColumn() {
@@ -15848,156 +16480,6 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
         $parent: $xetable
       } = this;
       this.headerColumn = $xetable.isGroup ? convertHeaderColumnToRows(this.tableGroupColumn) : [];
-    },
-    resizeMousedownEvent(evnt, params) {
-      const _vm = this;
-      const props = _vm;
-      const $xeTable = this.$parent;
-      const tableReactData = $xeTable;
-      const tableInternalData = $xeTable;
-      const {
-        column
-      } = params;
-      const {
-        fixedType
-      } = props;
-      const {
-        scrollbarHeight
-      } = tableReactData;
-      const {
-        elemStore,
-        visibleColumn
-      } = tableInternalData;
-      const resizableOpts = $xeTable.computeResizableOpts;
-      const tableEl = $xeTable.$refs.refElem;
-      const leftContainerElem = $xeTable.$refs.refLeftContainer;
-      const rightContainerElem = $xeTable.$refs.refRightContainer;
-      const resizeBarElem = $xeTable.$refs.refCellResizeBar;
-      const resizeTipElem = $xeTable.$refs.refCellResizeTip;
-      const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
-      const {
-        clientX: dragClientX
-      } = evnt;
-      const wrapperElem = _vm.$el;
-      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, tableEl);
-      const dragBtnWidth = dragBtnElem.clientWidth;
-      const dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
-      const minInterval = getColReMinWidth(cellParams) - dragBtnOffsetWidth; // 列之间的最小间距
-      let dragMinLeft = pos.left - cell.clientWidth + dragBtnWidth + minInterval;
-      let dragPosLeft = pos.left + dragBtnOffsetWidth;
-      const domMousemove = document.onmousemove;
-      const domMouseup = document.onmouseup;
-      const isLeftFixed = fixedType === 'left';
-      const isRightFixed = fixedType === 'right';
-      // 计算左右侧固定列偏移量
-      let fixedOffsetWidth = 0;
-      if (isLeftFixed || isRightFixed) {
-        const siblingProp = isLeftFixed ? 'nextElementSibling' : 'previousElementSibling';
-        let tempCellElem = cell[siblingProp];
-        while (tempCellElem) {
-          if (hasClass(tempCellElem, 'fixed--hidden')) {
-            break;
-          } else if (!hasClass(tempCellElem, 'col--group')) {
-            fixedOffsetWidth += tempCellElem.offsetWidth;
-          }
-          tempCellElem = tempCellElem[siblingProp];
-        }
-        if (isRightFixed && rightContainerElem) {
-          dragPosLeft = rightContainerElem.offsetLeft + fixedOffsetWidth;
-        }
-      }
-      // 处理拖动事件
-      const updateEvent = function (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);
-      $xeTable.closeMenu();
     }
   }
 });
@@ -16006,6 +16488,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
 
 
 
+
 const footer_renderType = 'footer';
 const {
   renderer: footer_renderer,
@@ -16045,6 +16528,8 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     fixedType
   } = props;
   const {
+    resizable: allResizable,
+    border,
     footerCellClassName,
     footerCellStyle,
     footerAlign: allFooterAlign,
@@ -16064,7 +16549,14 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     scrollXStore
   } = tableInternalData;
   const tooltipOpts = $xeTable.computeTooltipOpts;
+  const {
+    isAllColumnDrag
+  } = $xeTable.resizableOpts;
   const columnOpts = $xeTable.computeColumnOpts;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+  const cellOpts = $xeTable.computeCellOpts;
+  const footerCellOpts = $xeTable.computeFooterCellOpts;
+  const currCellHeight = getCellHeight(footerCellOpts.height || cellOpts.height) || defaultRowHeight;
   return tableColumn.map((column, $columnIndex) => {
     const {
       type,
@@ -16075,19 +16567,22 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
       editRender,
       cellRender
     } = column;
+    const colid = column.id;
     const renderOpts = editRender || cellRender;
     const compConf = renderOpts ? footer_renderer.get(renderOpts.name) : null;
     const showAllTip = tooltipOpts.showAll;
     const isColGroup = column.children && column.children.length;
     const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
+    const isPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
     const footOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
     const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
     let showEllipsis = footOverflow === 'ellipsis';
     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);
@@ -16180,6 +16675,12 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
       isVNPreEmptyStatus = true;
     }
+    const tcStyle = {};
+    if (hasEllipsis) {
+      tcStyle.height = `${currCellHeight}px`;
+    } else {
+      tcStyle.minHeight = `${currCellHeight}px`;
+    }
     return h('td', {
       class: ['vxe-footer--column', column.id, {
         [`col--${footAlign}`]: footAlign,
@@ -16187,6 +16688,7 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
         'col--last': isLastColumn,
         'fixed--width': !isAutoCellWidth,
         'fixed--hidden': fixedHiddenColumn,
+        'is--padding': isPadding,
         'col--ellipsis': hasEllipsis,
         'col--current': currentColumn === column
       }, getClass(footerClassName, cellParams), getClass(footerCellClassName, cellParams)],
@@ -16199,8 +16701,26 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
         'c--title': showTitle,
         'c--tooltip': showTooltip,
         'c--ellipsis': showEllipsis
-      }]
-    }, isVNPreEmptyStatus ? [] : column.renderFooter(h, cellParams))]);
+      }],
+      style: tcStyle
+    }, isVNPreEmptyStatus ? [] : [h('div', {
+      attrs: {
+        colid
+      },
+      class: 'vxe-cell--wrapper'
+    }, column.renderFooter(h, cellParams))]),
+    /**
+     * 列宽拖动
+     */
+    !fixedHiddenColumn && showResizable && isAllColumnDrag ? h('div', {
+      class: ['vxe-cell--col-resizable', {
+        'is--line': !border || border === 'none'
+      }],
+      on: {
+        mousedown: evnt => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
+        dblclick: evnt => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
+      }
+    }) : footer_renderEmptyElement($xeTable)]);
   });
 }
 function footer_renderHeads(h, _vm, renderColumnList) {
@@ -16217,6 +16737,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
     footerRowStyle
   } = tableProps;
   const {
+    isColLoading,
     isDragColMove
   } = tableReactData;
   const columnOpts = $xeTable.computeColumnOpts;
@@ -16231,7 +16752,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
       fixed: fixedType,
       type: footer_renderType
     };
-    if (columnOpts.drag && columnDragOpts.animation) {
+    if (!isColLoading && columnOpts.drag && columnDragOpts.animation) {
       return h('transition-group', {
         key: $rowIndex,
         props: {
@@ -16457,10 +16978,10 @@ const {
     type: [Boolean, String],
     default: () => props_getConfig().table.border
   },
-  // 单元格是否有边距
+  // 已废弃，被 cell-config.padding 替换
   padding: {
     type: Boolean,
-    default: () => props_getConfig().table.padding
+    default: null
   },
   // 是否圆角边框
   round: {
@@ -16509,12 +17030,18 @@ const {
     type: Boolean,
     default: () => props_getConfig().table.highlightHoverRow
   },
-  // 已废弃，被 column-config.isCurrent 替换
+  /**
+   * （即将废弃）是否要高亮当前选中列
+   * @deprecated
+   */
   highlightCurrentColumn: {
     type: Boolean,
     default: () => props_getConfig().table.highlightCurrentColumn
   },
-  // 已废弃，被 column-config.isHover 替换
+  /**
+   * （即将废弃）鼠标移到列是否要高亮显示
+   * @deprecated
+   */
   highlightHoverColumn: {
     type: Boolean,
     default: () => props_getConfig().table.highlightHoverColumn
@@ -16606,6 +17133,10 @@ const {
   columnConfig: Object,
   // 单元格配置信息
   cellConfig: Object,
+  // 表头单元格配置信息
+  headerCellConfig: Object,
+  // 表尾单元格配置信息
+  footerCellConfig: Object,
   // 行配置信息
   rowConfig: Object,
   // 已废弃，被 rowDragConfig 替换
@@ -19398,6 +19929,8 @@ const {
      * 快捷菜单事件处理
      */
     handleGlobalContextmenuEvent(evnt) {
+      const $xeTable = this;
+      const internalData = $xeTable;
       const {
         $refs,
         tId,
@@ -19418,7 +19951,7 @@ const {
           evnt.preventDefault();
           return;
         }
-        if (this._keyCtx) {
+        if (internalData._keyCtx) {
           const type = 'body';
           const params = {
             type,
@@ -19736,6 +20269,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         parent: parentRow,
         level: parentLevel + 1,
         height: 0,
+        resizeHeight: 0,
         oTop: 0
       };
       fullDataRowIdData[rowid] = rest;
@@ -19760,6 +20294,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         parent: null,
         level: 0,
         height: 0,
+        resizeHeight: 0,
         oTop: 0
       };
       fullDataRowIdData[rowid] = rest;
@@ -19818,6 +20353,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           parent: null,
           level: 0,
           height: 0,
+          resizeHeight: 0,
           oTop: 0
         };
         fullDataRowIdData[rowid] = rest;
@@ -19855,6 +20391,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             parent: null,
             level: 0,
             height: 0,
+            resizeHeight: 0,
             oTop: 0
           };
           fullDataRowIdData[rowid] = rest;
@@ -19915,6 +20452,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
               parent: parentRow,
               level: parentLevel + 1,
               height: 0,
+              resizeHeight: 0,
               oTop: 0
             };
             fullDataRowIdData[rowid] = rest;
@@ -19989,7 +20527,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     const rowid = getRowid($xeTable, newRow);
     insertMaps[rowid] = newRow;
   });
-  $xeTable.cacheRowMap();
+  $xeTable.cacheRowMap(false);
   $xeTable.updateScrollYStatus();
   $xeTable.handleTableData(treeConfig && transform);
   if (!(treeConfig && transform)) {
@@ -20201,7 +20739,7 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
         }
       });
       $xeTable.updateFooter();
-      $xeTable.cacheRowMap();
+      $xeTable.cacheRowMap(false);
       $xeTable.handleTableData(treeConfig && transform);
       if (!(treeConfig && transform)) {
         $xeTable.updateAfterDataIndex();
@@ -21575,7 +22113,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 = [];
@@ -21596,11 +22148,11 @@ 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) {
-              item[fields[colIndex]] = getTxtCellValue(val, vMaps);
+              item[fields[colIndex]] = getTxtCellValue(val.trim(), vMaps);
             }
           });
           rows.push(item);
@@ -21613,13 +22165,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');
@@ -21632,7 +22184,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');
@@ -21655,7 +22207,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');
@@ -21667,7 +22219,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) {
@@ -21689,60 +22241,62 @@ function parseXML(columns, content) {
     rows
   };
 }
-/**
- * 检查导入的列是否完整
- * @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);
-}
-function handleImport($xetable, content, opts) {
+function handleImport($xeTable, content, opts) {
+  const internalData = $xeTable;
   const {
     tableFullColumn,
     _importResolve,
     _importReject
-  } = $xetable;
+  } = internalData;
   let rest = {
     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 => {
+    $xeTable.createData(rows).then(data => {
       let loadRest;
       if (opts.mode === 'insert' || opts.mode === 'insertBottom') {
-        loadRest = $xetable.insertAt(data, -1);
+        loadRest = $xeTable.insertAt(data, -1);
       }
       if (opts.mode === 'insertTop') {
-        loadRest = $xetable.insert(data);
+        loadRest = $xeTable.insert(data);
       } else {
-        loadRest = $xetable.reloadData(data);
+        loadRest = $xeTable.reloadData(data);
       }
       if (opts.message !== false) {
         // 检测弹窗模块
@@ -21975,6 +22529,43 @@ function readLocalFile(options = {}) {
     fileInput.click();
   });
 }
+function handleFilterColumns(exportOpts, column, columns) {
+  return columns.some(item => {
+    if (isColumnInfo(item)) {
+      return column.id === item.id;
+    } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(item)) {
+      return column.field === item;
+    } else {
+      const colid = item.id || item.colId;
+      const type = item.type;
+      const field = item.field;
+      if (colid) {
+        return column.id === colid;
+      } else if (field && type) {
+        return column.field === field && column.type === type;
+      } else if (field) {
+        return column.field === field;
+      } else if (type) {
+        return column.type === type;
+      }
+    }
+    return false;
+  });
+}
+function handleFilterFields(exportOpts, column, includeFields, excludeFields) {
+  if (excludeFields) {
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(excludeFields, column.field)) {
+      return false;
+    }
+  }
+  if (includeFields) {
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(includeFields, column.field)) {
+      return true;
+    }
+    return false;
+  }
+  return exportOpts.original ? column.field : defaultFilterExportColumn(column);
+}
 function handleExportAndPrint($xeTable, options, isPrint) {
   const props = $xeTable;
   const reactData = $xeTable;
@@ -22019,7 +22610,9 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   const checkMethod = customOpts.checkMethod;
   const exportColumns = collectColumn.slice(0);
   const {
-    columns
+    columns,
+    excludeFields,
+    includeFields
   } = defOpts;
   // 处理类型
   const typeList = types.map(value => {
@@ -22043,33 +22636,19 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   // 默认选中
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(exportColumns, (column, index, items, path, parent) => {
     const isColGroup = column.children && column.children.length;
-    if (isColGroup || defaultFilterExportColumn(column)) {
-      column.checked = columns ? columns.some(item => {
-        if (isColumnInfo(item)) {
-          return column.id === item.id;
-        } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(item)) {
-          return column.field === item;
-        } else {
-          const colid = item.id || item.colId;
-          const type = item.type;
-          const field = item.field;
-          if (colid) {
-            return column.id === colid;
-          } else if (field && type) {
-            return column.field === field && column.type === type;
-          } else if (field) {
-            return column.field === field;
-          } else if (type) {
-            return column.type === type;
-          }
-        }
-        return false;
-      }) : column.visible;
-      column.halfChecked = false;
-      column.disabled = parent && parent.disabled || (checkMethod ? !checkMethod({
-        column
-      }) : false);
+    let isChecked = false;
+    if (columns && columns.length) {
+      isChecked = handleFilterColumns(defOpts, column, columns);
+    } else if (excludeFields || includeFields) {
+      isChecked = handleFilterFields(defOpts, column, includeFields, excludeFields);
+    } else {
+      isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
     }
+    column.checked = isChecked;
+    column.halfChecked = false;
+    column.disabled = parent && parent.disabled || (checkMethod ? !checkMethod({
+      column
+    }) : false);
   });
   // 更新条件
   Object.assign(exportStore, {
@@ -22691,6 +23270,7 @@ const convertToRows = originColumns => {
 
 
 
+
 function getTargetOffset(target, container) {
   let offsetTop = 0;
   let offsetLeft = 0;
@@ -22716,37 +23296,72 @@ function getTargetOffset(target, container) {
   };
 }
 function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offsetClientTop, moveRange) {
+  const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
+  const {
+    showOverflow
+  } = props;
+  const {
+    fullAllDataRowIdData,
+    isResizeCellHeight
+  } = internalData;
+  const rowOpts = $xeTable.computeRowOpts;
+  const cellOpts = $xeTable.computeCellOpts;
+  const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+  const {
+    row
+  } = params;
   let countHeight = 0;
   let rangeRows = [];
   let moveSize = 0;
   const isDown = moveRange > 0;
   const {
-    scrollYLoad,
-    rowHeight
+    scrollYLoad
   } = reactData;
   const {
     afterFullData
   } = internalData;
+  if (isDown) {
+    moveSize = offsetClientTop + moveRange;
+  } else {
+    moveSize = trRect.height - offsetClientTop + Math.abs(moveRange);
+  }
   if (scrollYLoad) {
-    if (isDown) {
-      moveSize = offsetClientTop + moveRange;
-    } else {
-      moveSize = trRect.height - offsetClientTop + Math.abs(moveRange);
-    }
-    const _rowIndex = $xeTable.getVTRowIndex(params.row);
-    if (isDown) {
-      rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / rowHeight));
+    const _rowIndex = $xeTable.getVTRowIndex(row);
+    const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
+    if (!isCustomCellHeight && showOverflow) {
+      if (isDown) {
+        rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / defaultRowHeight));
+      } else {
+        rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / defaultRowHeight), _rowIndex + 1);
+      }
     } else {
-      rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / rowHeight), _rowIndex + 1);
+      if (isDown) {
+        for (let i = _rowIndex; i < afterFullData.length; i++) {
+          const item = afterFullData[i];
+          const rowid = $xeTable.getRowid(item);
+          const rowRest = fullAllDataRowIdData[rowid] || {};
+          countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.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 || rowRest.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);
@@ -22924,21 +23539,31 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
     },
     handleCheckboxRangeEvent(evnt, params) {
       const $xeTable = this;
+      const internalData = $xeTable;
+      const {
+        elemStore
+      } = internalData;
+      const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+      const leftScrollElem = getRefElem(elemStore['left-body-scroll']);
+      const rightScrollElem = getRefElem(elemStore['right-body-scroll']);
       const {
         column,
         cell
       } = params;
       if (column.type === 'checkbox') {
-        const {
-          $el,
-          elemStore
-        } = this;
+        let bodyWrapperElem = bodyScrollElem;
+        if (leftScrollElem && column.fixed === 'left') {
+          bodyWrapperElem = leftScrollElem;
+        } else if (rightScrollElem && column.fixed === 'right') {
+          bodyWrapperElem = rightScrollElem;
+        }
+        if (!bodyWrapperElem) {
+          return;
+        }
+        const el = $xeTable.$refs.refElem;
         const disX = evnt.clientX;
         const disY = evnt.clientY;
-        const bodyWrapperElem = elemStore[`${column.fixed || 'main'}-body-wrapper`] || elemStore['main-body-wrapper'];
         const checkboxRangeElem = bodyWrapperElem.querySelector('.vxe-table--checkbox-range');
-        const domMousemove = document.onmousemove;
-        const domMouseup = document.onmouseup;
         const trElem = cell.parentNode;
         const selectRecords = this.getCheckboxRecords();
         let lastRangeRows = [];
@@ -23049,7 +23674,7 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
             }
           }, 50);
         };
-        addClass($el, 'drag--range');
+        addClass(el, 'drag--range');
         document.onmousemove = evnt => {
           evnt.preventDefault();
           evnt.stopPropagation();
@@ -23079,10 +23704,10 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
         };
         document.onmouseup = evnt => {
           stopMouseScroll();
-          removeClass($el, 'drag--range');
+          removeClass(el, 'drag--range');
           checkboxRangeElem.removeAttribute('style');
-          document.onmousemove = domMousemove;
-          document.onmouseup = domMouseup;
+          document.onmousemove = null;
+          document.onmouseup = null;
           triggerEvent('end', evnt);
         };
         triggerEvent('start', evnt);
@@ -24202,7 +24827,7 @@ const table_renderDragTip = (h, $xeTable) => {
   }
   return table_renderEmptyElement($xeTable);
 };
-function handleUupdateResize(_vm) {
+function handleUpdateResize(_vm) {
   const {
     $el
   } = _vm;
@@ -24350,8 +24975,7 @@ function renderBody(h, $xeTable) {
     const xID = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId();
     return {
       xID,
-      tId: `${external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId()}`,
-      isCalcColumn: false,
+      tId: xID,
       // 低性能的静态列
       staticColumns: [],
       // 渲染的列分组
@@ -24562,15 +25186,17 @@ function renderBody(h, $xeTable) {
         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,
       reScrollFlag: 0,
       reLayoutFlag: 0,
       footFlag: 0
@@ -24677,7 +25303,7 @@ function renderBody(h, $xeTable) {
       const $xeTable = this;
       const vSize = $xeTable.computeSize;
       const rowHeightMaps = $xeTable.computeRowHeightMaps;
-      return rowHeightMaps[vSize || 'default'];
+      return rowHeightMaps[vSize || 'default'] || 18;
     },
     columnOpts() {
       return this.computeColumnOpts;
@@ -24686,7 +25312,19 @@ function renderBody(h, $xeTable) {
       return Object.assign({}, table_getConfig().table.columnConfig, this.columnConfig);
     },
     computeCellOpts() {
-      return Object.assign({}, table_getConfig().table.cellConfig, this.cellConfig);
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.cellConfig, props.cellConfig);
+    },
+    computeHeaderCellOpts() {
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.headerCellConfig, props.headerCellConfig);
+    },
+    computeFooterCellOpts() {
+      const $xeTable = this;
+      const props = $xeTable;
+      return Object.assign({}, table_getConfig().table.footerCellConfig, props.footerCellConfig);
     },
     rowOpts() {
       return this.computeRowOpts;
@@ -24743,6 +25381,20 @@ function renderBody(h, $xeTable) {
         ...this.tooltipOpts
       };
     },
+    computeTableTipConfig() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        tooltipStore
+      } = reactData;
+      const tooltipOpts = $xeTable.computeTooltipOpts;
+      return Object.assign({}, tooltipOpts, tooltipStore.currOpts);
+    },
+    computeValidTipConfig() {
+      const $xeTable = this;
+      const tooltipOpts = $xeTable.computeTooltipOpts;
+      return Object.assign({}, tooltipOpts);
+    },
     validTipOpts() {
       return Object.assign({
         isArrow: false
@@ -24799,23 +25451,55 @@ function renderBody(h, $xeTable) {
       return Object.assign({}, table_getConfig().table.fnrConfig, this.fnrConfig);
     },
     headerCtxMenu() {
-      const headerOpts = this.ctxMenuOpts.header;
+      return this.computeHeaderMenu;
+    },
+    computeHeaderMenu() {
+      const $xeTable = this;
+      const menuOpts = $xeTable.computeMenuOpts;
+      const headerOpts = menuOpts.header;
       return headerOpts && headerOpts.options ? headerOpts.options : [];
     },
     bodyCtxMenu() {
-      const bodyOpts = this.ctxMenuOpts.body;
+      return this.computeBodyMenu;
+    },
+    computeBodyMenu() {
+      const $xeTable = this;
+      const menuOpts = $xeTable.computeMenuOpts;
+      const bodyOpts = menuOpts.body;
       return bodyOpts && bodyOpts.options ? bodyOpts.options : [];
     },
     footerCtxMenu() {
-      const footerOpts = this.ctxMenuOpts.footer;
+      return this.computeFooterMenu;
+    },
+    computeFooterMenu() {
+      const $xeTable = this;
+      const menuOpts = $xeTable.computeMenuOpts;
+      const footerOpts = menuOpts.footer;
       return footerOpts && footerOpts.options ? footerOpts.options : [];
     },
     isCtxMenu() {
-      return !!((this.contextMenu || this.menuConfig) && isEnableConf(this.ctxMenuOpts) && (this.headerCtxMenu.length || this.bodyCtxMenu.length || this.footerCtxMenu.length));
+      return this.computeIsMenu;
+    },
+    computeIsMenu() {
+      const $xeTable = this;
+      const props = $xeTable;
+      const menuOpts = $xeTable.computeMenuOpts;
+      const headerMenu = $xeTable.computeHeaderMenu;
+      const bodyMenu = $xeTable.computeBodyMenu;
+      const footerMenu = $xeTable.computeFooterMenu;
+      return !!((props.contextMenu || props.menuConfig) && isEnableConf(menuOpts) && (headerMenu.length || bodyMenu.length || footerMenu.length));
     },
     ctxMenuList() {
+      return this.computeMenuList;
+    },
+    computeMenuList() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        ctxMenuStore
+      } = reactData;
       const rest = [];
-      this.ctxMenuStore.list.forEach(list => {
+      ctxMenuStore.list.forEach(list => {
         list.forEach(item => {
           rest.push(item);
         });
@@ -25028,7 +25712,7 @@ function renderBody(h, $xeTable) {
       if (value && value.length >= 50000) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
-      this.loadTableData(value || []).then(() => {
+      this.loadTableData(value || [], true).then(() => {
         this.inited = true;
         this.initStatus = true;
         if (!initStatus) {
@@ -25096,10 +25780,10 @@ function renderBody(h, $xeTable) {
     },
     syncResize(value) {
       if (value) {
-        handleUupdateResize(this);
+        handleUpdateResize(this);
         this.$nextTick(() => {
-          handleUupdateResize(this);
-          setTimeout(() => handleUupdateResize(this));
+          handleUpdateResize(this);
+          setTimeout(() => handleUpdateResize(this));
         });
       }
     },
@@ -25211,11 +25895,14 @@ function renderBody(h, $xeTable) {
       if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
         warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
       }
+      if (treeConfig && !treeOpts.transform && this.stripe) {
+        warnLog('vxe.error.noTree', ['stripe']);
+      }
       if (this.showFooter && !(this.footerMethod || this.footerData)) {
         warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
       }
-      if (treeConfig && !treeOpts.transform && this.stripe) {
-        warnLog('vxe.error.noTree', ['stripe']);
+      if (rowOpts.height) {
+        warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
       }
       if (this.tooltipOpts.enabled) {
         warnLog('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll']);
@@ -25362,7 +26049,7 @@ function renderBody(h, $xeTable) {
       endIndex: 1,
       visibleSize: 0
     });
-    this.loadTableData(data).then(() => {
+    this.loadTableData(data, true).then(() => {
       if (data && data.length) {
         this.inited = true;
         this.initStatus = true;
@@ -25485,7 +26172,6 @@ function renderBody(h, $xeTable) {
       editRules
     } = props;
     const {
-      isCalcColumn,
       isGroup,
       overflowX,
       overflowY,
@@ -25495,15 +26181,15 @@ function renderBody(h, $xeTable) {
       initStore,
       columnStore,
       filterStore,
-      customStore,
-      tooltipStore
+      customStore
     } = reactData;
     const {
       leftList,
       rightList
     } = columnStore;
     const loadingSlot = slots.loading;
-    const tooltipOpts = $xeTable.computeTooltipOpts;
+    const tableTipConfig = $xeTable.computeTableTipConfig;
+    const validTipConfig = $xeTable.computeValidTipConfig;
     const validOpts = $xeTable.computeValidOpts;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const treeOpts = $xeTable.computeTreeOpts;
@@ -25515,7 +26201,7 @@ function renderBody(h, $xeTable) {
     const areaOpts = $xeTable.computeAreaOpts;
     const loadingOpts = $xeTable.computeLoadingOpts;
     const isMenu = $xeTable.computeIsMenu;
-    const currLoading = reactData.isLoading || loading;
+    const currLoading = reactData.isColLoading || reactData.isRowLoading || loading;
     const resizableOpts = $xeTable.computeResizableOpts;
     const isArea = mouseConfig && mouseOpts.area;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
@@ -25536,7 +26222,6 @@ function renderBody(h, $xeTable) {
         '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,
@@ -25545,7 +26230,6 @@ function renderBody(h, $xeTable) {
         '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,
@@ -25593,11 +26277,21 @@ function renderBody(h, $xeTable) {
      * 列宽线
      */
     h('div', {
-      key: 'cl',
-      ref: 'refCellResizeBar',
-      class: 'vxe-table--resizable-bar'
+      key: 'tcl',
+      ref: 'refColResizeBar',
+      class: 'vxe-table--resizable-col-bar'
+    }, resizableOpts.showDragTip ? [h('div', {
+      ref: 'refColResizeTip',
+      class: 'vxe-table--resizable-number-tip'
+    })] : []),
+    /**
+     * 行高线
+     */
+    h('div', {
+      key: 'trl',
+      ref: 'refRowResizeBar',
+      class: 'vxe-table--resizable-row-bar'
     }, resizableOpts.showDragTip ? [h('div', {
-      ref: 'refCellResizeTip',
       class: 'vxe-table--resizable-number-tip'
     })] : []),
     /**
@@ -25698,8 +26392,13 @@ function renderBody(h, $xeTable) {
      */
     VxeUITooltipComponent ? h(VxeUITooltipComponent, {
       key: 'btp',
-      ref: 'tooltip',
-      props: Object.assign({}, tooltipOpts, tooltipStore.currOpts)
+      ref: 'refTooltip',
+      props: {
+        theme: tableTipConfig.theme,
+        enterable: tableTipConfig.enterable,
+        enterDelay: tableTipConfig.enterDelay,
+        leaveDelay: tableTipConfig.leaveDelay
+      }
     }) : table_renderEmptyElement($xeTable),
     /**
      * 校验提示
@@ -25710,9 +26409,12 @@ function renderBody(h, $xeTable) {
       class: [{
         'old-cell-valid': editRules && table_getConfig().cellVaildMode === 'obsolete'
       }, 'vxe-table--valid-error'],
-      props: validOpts.message === 'tooltip' || tableData.length === 1 ? Object.assign({
-        isArrow: false
-      }, tooltipOpts) : {}
+      props: {
+        theme: validTipConfig.theme,
+        enterable: validTipConfig.enterable,
+        enterDelay: validTipConfig.enterDelay,
+        leaveDelay: validTipConfig.leaveDelay
+      }
     }) : table_renderEmptyElement($xeTable)])]);
   },
   methods: methods
@@ -29367,7 +30069,8 @@ const Toolbar = VxeToolbar;
       customRestore: '恢复默认',
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
-      resizeColTip: '{0} 像素'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',