vxe-table 4.10.6-beta.25 → 4.10.6-beta.27

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.6-beta.25";
+const version = "4.10.6-beta.27";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3577,7 +3577,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.6-beta.25"}`;
+const log_version = `table v${"4.10.6-beta.27"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3666,6 +3666,8 @@ class ColumnInfo {
       footerClassName: _vm.footerClassName,
       formatter: formatter,
       footerFormatter: _vm.footerFormatter,
+      padding: _vm.padding,
+      verticalAlign: _vm.verticalAlign,
       sortable: _vm.sortable,
       sortBy: _vm.sortBy,
       sortType: _vm.sortType,
@@ -4120,6 +4122,12 @@ function getRefElem(refEl) {
   }
   return null;
 }
+function getCellHeight(height) {
+  if (height === 'unset') {
+    return 0;
+  }
+  return height || 0;
+}
 /**
  * 列宽拖动最大宽度
  * @param params
@@ -4480,7 +4488,7 @@ function rowToVisible($xeTable, row) {
           return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * defaultRowHeight);
         }
         let scrollTop = 0;
-        const rowRest = fullAllDataRowIdData[rowid];
+        const rowRest = fullAllDataRowIdData[rowid] || {};
         const rHeight = rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
         for (let i = 0; i < afterFullData.length; i++) {
           const currRow = afterFullData[i];
@@ -4488,8 +4496,8 @@ function rowToVisible($xeTable, row) {
           if (currRow === row || currRowid === rowid) {
             break;
           }
-          const rowRest = fullAllDataRowIdData[currRowid];
-          scrollTop += rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
+          const currRowRest = fullAllDataRowIdData[currRowid] || {};
+          scrollTop += currRowRest.resizeHeight || currRowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
         }
         if (scrollTop < bodyScrollTop) {
           return $xeTable.scrollTo(null, scrollTop - leftFixedWidth - 1);
@@ -4852,18 +4860,6 @@ function renderTitleContent(params, content) {
     ...ons
   }, getSlotVNs(content))];
 }
-function formatFooterLabel(footerFormatter, params) {
-  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerFormatter)) {
-    return `${footerFormatter(params)}`;
-  }
-  const isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerFormatter);
-  const gFormatOpts = isArr ? cell_formats.get(footerFormatter[0]) : cell_formats.get(footerFormatter);
-  const footerFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
-  if (footerFormatMethod) {
-    return `${isArr ? footerFormatMethod(params, ...footerFormatter.slice(1)) : footerFormatMethod(params)}`;
-  }
-  return '';
-}
 function getFooterContent(params) {
   const {
     $table,
@@ -4883,35 +4879,38 @@ function getFooterContent(params) {
   if (footerSlot) {
     return $table.callSlot(footerSlot, params);
   }
+  let itemValue = '';
+  // 兼容老模式
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(items)) {
+    itemValue = items[_columnIndex];
+  } else {
+    itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+  }
+  const footParams = Object.assign(params, {
+    itemValue
+  });
+  if (footerFormatter) {
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerFormatter)) {
+      return `${footerFormatter(footParams)}`;
+    }
+    const isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerFormatter);
+    const gFormatOpts = isArr ? cell_formats.get(footerFormatter[0]) : cell_formats.get(footerFormatter);
+    const footerFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
+    if (footerFormatMethod) {
+      return `${isArr ? footerFormatMethod(footParams, ...footerFormatter.slice(1)) : footerFormatMethod(footParams)}`;
+    }
+    return '';
+  }
   if (renderOpts) {
     const compConf = cell_renderer.get(renderOpts.name);
     if (compConf) {
       const rtFooter = compConf.renderTableFooter || compConf.renderFooter;
       if (rtFooter) {
-        return getSlotVNs(rtFooter(renderOpts, params));
+        return getSlotVNs(rtFooter(renderOpts, footParams));
       }
     }
   }
-  let itemValue = '';
-  // 兼容老模式
-  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(items)) {
-    itemValue = items[_columnIndex];
-    return [footerFormatter ? formatFooterLabel(footerFormatter, {
-      itemValue,
-      column,
-      row,
-      items,
-      _columnIndex
-    }) : formatText(itemValue, 1)];
-  }
-  itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
-  return [footerFormatter ? formatFooterLabel(footerFormatter, {
-    itemValue,
-    column,
-    row,
-    items,
-    _columnIndex
-  }) : formatText(itemValue, 1)];
+  return [formatText(itemValue, 1)];
 }
 function getDefaultCellLabel(params) {
   const {
@@ -5937,6 +5936,16 @@ const columnProps = {
   formatter: [Function, Array, String],
   // 格式化表尾显示内容
   footerFormatter: [Function, Array, String],
+  // 是否显示间距
+  padding: {
+    type: Boolean,
+    default: null
+  },
+  // 垂直对齐方式
+  verticalAlign: {
+    type: String,
+    default: null
+  },
   // 是否允许排序
   sortable: Boolean,
   // 自定义排序的属性
@@ -6259,7 +6268,6 @@ const renderType = 'body';
       const {
         columnKey,
         height,
-        showOverflow: allColumnOverflow,
         cellClassName: allCellClassName,
         cellStyle,
         align: allAlign,
@@ -6317,10 +6325,12 @@ const renderType = 'body';
         className,
         treeNode,
         rowResize,
+        padding,
+        verticalAlign,
         slots
       } = column;
       const {
-        verticalAlign
+        verticalAlign: allVerticalAlign
       } = cellOpts;
       const {
         actived
@@ -6337,16 +6347,17 @@ const renderType = 'body';
       const isEdit = isEnableConf(editRender);
       const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
       let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
-      const isPadding = allPadding === null ? cellOpts.padding : allPadding;
-      const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? allColumnOverflow : showOverflow;
+      const 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 || resizeHeight > 0;
+      const hasEllipsis = isAllOverflow || showTitle || showTooltip || showEllipsis;
+      const isRsHeight = resizeHeight > 0;
       let isDirty;
       const tdOns = {};
       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 tdAttrs = {
@@ -6496,13 +6507,13 @@ const renderType = 'body';
         isVNPreEmptyStatus = true;
       }
       const tcStyle = {};
-      if (hasEllipsis) {
+      if (scrollYLoad || hasEllipsis || isRsHeight) {
         tcStyle.height = `${cellHeight}px`;
       } else {
         tcStyle.minHeight = `${cellHeight}px`;
       }
       const tdVNs = [];
-      if (fixedHiddenColumn && (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
+      if (fixedHiddenColumn && isAllOverflow) {
         tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           key: 'tc',
           class: ['vxe-cell', {
@@ -6564,19 +6575,17 @@ const renderType = 'body';
         }));
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
-        class: ['vxe-body--column', colid, {
-          [`col--${cellAlign}`]: cellAlign,
-          [`col--vertical-${verticalAlign}`]: verticalAlign,
-          [`col--${type}`]: type,
+        class: ['vxe-body--column', colid, cellVerticalAlign ? `col--vertical-${cellVerticalAlign}` : '', cellAlign ? `col--${cellAlign}` : '', type ? `col--${type}` : '', {
           'col--last': isLastColumn,
           'col--tree-node': treeNode,
           'col--edit': isEdit,
           'col--ellipsis': hasEllipsis,
+          'col--rs-height': isRsHeight,
           'col--to-row': showAreaRowStatus,
           'col--auto-height': isVNAutoHeight,
           'fixed--width': !isAutoCellWidth,
           'fixed--hidden': fixedHiddenColumn,
-          'is--padding': isPadding,
+          'is--padding': isCellPadding,
           'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
           'is--drag-disabled': isDisabledDrag,
           'col--dirty': isDirty,
@@ -6597,7 +6606,6 @@ const renderType = 'body';
         highlightHoverRow,
         rowClassName,
         rowStyle,
-        showOverflow: allColumnOverflow,
         editConfig,
         treeConfig
       } = tableProps;
@@ -6606,6 +6614,7 @@ const renderType = 'body';
         treeExpandedMaps,
         scrollXLoad,
         scrollYLoad,
+        isAllOverflow,
         rowExpandedMaps,
         expandColumn,
         selectRadioRow,
@@ -6743,7 +6752,7 @@ const renderType = 'body';
           const {
             showOverflow
           } = expandColumn;
-          const hasEllipsis = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? allColumnOverflow : showOverflow;
+          const hasEllipsis = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? isAllOverflow : showOverflow;
           const expandParams = {
             $table: $xeTable,
             seq,
@@ -6831,7 +6840,6 @@ const renderType = 'body';
         tableColumn
       } = props;
       const {
-        showOverflow: allColumnOverflow,
         spanMethod,
         footerSpanMethod,
         mouseConfig
@@ -6862,7 +6870,7 @@ const renderType = 'body';
       let renderColumnList = tableColumn;
       let isOptimizeMode = false;
       // 如果是使用优化模式
-      if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+      if (scrollXLoad || scrollYLoad || isAllOverflow) {
         if (expandColumn || spanMethod || footerSpanMethod) {
           // 如果不支持优化模式
         } else {
@@ -6944,7 +6952,7 @@ const renderType = 'body';
           $xeTable.triggerBodyScrollEvent(evnt, fixedType);
         }
       };
-      if (leftFixedWidth || rightFixedWidth) {
+      if (scrollYLoad || leftFixedWidth || rightFixedWidth) {
         ons.onWheel = $xeTable.triggerBodyWheelEvent;
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -7112,7 +7120,7 @@ const header_renderType = 'header';
       const cellOpts = computeCellOpts.value;
       const defaultRowHeight = computeDefaultRowHeight.value;
       const headerCellOpts = computeHeaderCellOpts.value;
-      const currCellHeight = headerCellOpts.height || cellOpts.height || defaultRowHeight;
+      const currCellHeight = getCellHeight(headerCellOpts.height || cellOpts.height) || defaultRowHeight;
       const {
         disabledMethod: dragDisabledMethod,
         isCrossDrag,
@@ -7466,6 +7474,7 @@ const header_renderType = 'header';
 
 
 
+
 const {
   renderer: footer_renderer,
   renderEmptyElement: footer_renderEmptyElement
@@ -7565,7 +7574,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
       const defaultRowHeight = computeDefaultRowHeight.value;
       const cellOpts = computeCellOpts.value;
       const footerCellOpts = computeFooterCellOpts.value;
-      const currCellHeight = footerCellOpts.height || cellOpts.height || defaultRowHeight;
+      const currCellHeight = getCellHeight(footerCellOpts.height || cellOpts.height) || defaultRowHeight;
       return tableColumn.map((column, $columnIndex) => {
         const {
           type,
@@ -11154,14 +11163,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     };
     const computeRowHeight = () => {
       const {
-        showOverflow
-      } = props;
+        isAllOverflow
+      } = reactData;
       const tableHeader = refTableHeader.value;
       const tableBody = refTableBody.value;
       const tableBodyElem = tableBody ? tableBody.$el : null;
       const defaultRowHeight = computeDefaultRowHeight.value;
       let rowHeight = 0;
-      if (showOverflow) {
+      if (isAllOverflow) {
         if (tableBodyElem) {
           const tableHeaderElem = tableHeader ? tableHeader.$el : null;
           let firstTrElem;
@@ -11184,8 +11193,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     };
     const handleVirtualYVisible = currScrollTop => {
       const {
-        showOverflow
-      } = props;
+        isAllOverflow
+      } = reactData;
       const {
         elemStore,
         isResizeCellHeight,
@@ -11204,15 +11213,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         let offsetTop = 0;
         let visibleSize = 0;
         const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
-        if (!isCustomCellHeight && showOverflow) {
+        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.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
+            const rowRest = fullAllDataRowIdData[rowid] || {};
+            offsetTop += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
             if (toVisibleIndex === -1 && scrollTop < offsetTop) {
               toVisibleIndex = rIndex;
             }
@@ -11785,26 +11794,20 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     };
     const calcCellAutoHeight = (rowRest, wrapperEl) => {
       const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
-      let topBottomPadding = 0;
-      const firstCellEl = cellElemList[0];
-      if (firstCellEl && firstCellEl.parentElement) {
-        const cellStyle = getComputedStyle(firstCellEl.parentElement);
-        topBottomPadding = Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingTop) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingBottom));
-      }
-      let colHeight = rowRest.height - topBottomPadding;
+      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, Math.ceil(cellHeight));
+        colHeight = Math.max(colHeight - topBottomPadding, Math.ceil(cellHeight));
       }
-      return colHeight + topBottomPadding;
+      return colHeight;
     };
     const calcCellHeight = () => {
-      const {
-        showOverflow
-      } = props;
       const {
         tableData,
+        isAllOverflow,
         scrollYLoad,
         scrollXLoad
       } = reactData;
@@ -11813,14 +11816,16 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = internalData;
       const defaultRowHeight = computeDefaultRowHeight.value;
       const el = refElem.value;
-      if (!showOverflow && scrollYLoad && el) {
+      if (!isAllOverflow && scrollYLoad && el) {
+        el.setAttribute('data-calc-row', 'Y');
         tableData.forEach(row => {
           const rowid = getRowid($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid];
           if (rowRest) {
-            const height = calcCellAutoHeight(rowRest, el);
-            rowRest.height = Math.max(defaultRowHeight, scrollXLoad ? Math.max(rowRest.height, height) : height);
+            const reHeight = calcCellAutoHeight(rowRest, el);
+            rowRest.height = Math.max(defaultRowHeight, scrollXLoad ? Math.max(rowRest.height, reHeight) : reHeight);
           }
+          el.removeAttribute('data-calc-row');
         });
         reactData.calcCellHeightFlag++;
       }
@@ -12197,7 +12202,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const updateStyle = () => {
       const {
         border,
-        showOverflow: allColumnOverflow,
         showHeaderOverflow: allColumnHeaderOverflow,
         showFooterOverflow: allColumnFooterOverflow,
         mouseConfig,
@@ -12418,7 +12422,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             let renderColumnList = tableColumn;
             let isOptimizeMode = false;
             // 如果是使用优化模式
-            if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+            if (scrollXLoad || scrollYLoad || isAllOverflow) {
               if (expandColumn || spanMethod || footerSpanMethod) {
                 // 如果不支持优化模式
               } else {
@@ -12502,7 +12506,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 } else if (layout === 'footer') {
                   cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showFooterOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
                 } else {
-                  cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? allColumnOverflow : showOverflow;
+                  cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? isAllOverflow : showOverflow;
                 }
                 const showEllipsis = cellOverflow === 'ellipsis';
                 const showTitle = cellOverflow === 'title';
@@ -13205,8 +13209,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const loadTableData = (datas, isReset) => {
       const {
         keepSource,
-        treeConfig,
-        showOverflow
+        treeConfig
       } = props;
       const {
         editStore,
@@ -13219,7 +13222,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         lastScrollTop
       } = internalData;
       const treeOpts = computeTreeOpts.value;
-      const rowOpts = computeRowOpts.value;
       const {
         transform
       } = treeOpts;
@@ -13280,32 +13282,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       internalData.tableSynchData = datas;
       if (isReset) {
         internalData.isResizeCellHeight = false;
+        reactData.rowExpandedMaps = {};
+        reactData.rowExpandLazyLoadedMaps = {};
+        reactData.treeExpandedMaps = {};
+        reactData.treeExpandLazyLoadedMaps = {};
       }
       // 克隆原数据，用于显示编辑状态，与编辑值做对比
       if (keepSource) {
         tablePrivateMethods.cacheSourceMap(fullData);
       }
-      if (sYLoad) {
-        if (showOverflow) {
-          if (!rowOpts.height) {
-            const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
-            if (errColumn) {
-              errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
-            }
-          }
-        }
-        if (true) {
-          if (!(props.height || props.maxHeight)) {
-            errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-          }
-          // if (!props.showOverflow) {
-          //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-          // }
-          if (props.spanMethod) {
-            warnLog('vxe.error.scrollErrProp', ['table.span-method']);
-          }
-        }
-      }
       if ($xeTable.clearCellAreas && props.mouseConfig) {
         $xeTable.clearCellAreas();
         $xeTable.clearCopyCellArea();
@@ -13324,6 +13309,27 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         if (sYLoad) {
           scrollYStore.endIndex = scrollYStore.visibleSize;
         }
+        if (sYLoad) {
+          // if (showOverflow) {
+          //   if (!rowOpts.height) {
+          //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+          //     if (errColumn) {
+          //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+          //     }
+          //   }
+          // }
+          if (true) {
+            if (!(props.height || props.maxHeight)) {
+              errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+            }
+            // if (!props.showOverflow) {
+            //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+            // }
+            if (props.spanMethod) {
+              warnLog('vxe.error.scrollErrProp', ['table.span-method']);
+            }
+          }
+        }
         handleReserveStatus();
         tablePrivateMethods.checkSelectionStatus();
         return new Promise(resolve => {
@@ -13774,10 +13780,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
      */
     const loadScrollYData = scrollTop => {
       const {
-        showOverflow
-      } = props;
-      const {
-        mergeList
+        mergeList,
+        isAllOverflow
       } = reactData;
       const {
         scrollYStore
@@ -13788,7 +13792,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         endIndex,
         offsetSize
       } = scrollYStore;
-      const autoOffsetYSize = showOverflow ? offsetSize : offsetSize + 1;
+      const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
       const {
         toVisibleIndex,
         visibleSize
@@ -15041,7 +15045,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (rowRest) {
             const resizeHeight = rowRest.resizeHeight;
             if (resizeHeight || isFull) {
-              const currCellHeight = resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+              const currCellHeight = resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
               rest[rowid] = currCellHeight;
             }
           }
@@ -15092,8 +15096,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const defaultRowHeight = computeDefaultRowHeight.value;
         const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowOrId) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
         const rowRest = fullAllDataRowIdData[rowid];
-        const currCellHeight = rowRest ? rowRest.resizeHeight : cellOpts.height || rowOpts.height || defaultRowHeight;
-        return currCellHeight;
+        if (rowRest) {
+          return rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+        }
+        return 0;
       },
       /**
        * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
@@ -16364,9 +16370,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        */
       scrollToRow(row, fieldOrColumn) {
         const {
-          showOverflow
-        } = props;
-        const {
+          isAllOverflow,
           scrollYLoad,
           scrollXLoad
         } = reactData;
@@ -16383,7 +16387,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
         return Promise.all(rest).then(() => {
           if (row) {
-            if (!showOverflow && (scrollYLoad || scrollXLoad)) {
+            if (!isAllOverflow && (scrollYLoad || scrollXLoad)) {
               calcCellHeight();
               calcCellWidth();
             }
@@ -17995,6 +17999,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             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');
@@ -18004,8 +18009,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           document.onmousemove = null;
           document.onmouseup = null;
           resizeBarElem.style.display = 'none';
-          reactData.isDragResize = false;
           internalData._lastResizeTime = Date.now();
+          setTimeout(() => {
+            reactData.isDragResize = false;
+          }, 50);
           const resizeWidth = resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
           const resizeParams = {
             ...params,
@@ -18041,6 +18048,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } = resizableOpts;
         const el = refElem.value;
         if (isDblclickAutoWidth && el) {
+          evnt.stopPropagation();
+          evnt.preventDefault();
           const {
             fullColumnIdData
           } = internalData;
@@ -18127,7 +18136,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           return;
         }
         const defaultRowHeight = computeDefaultRowHeight.value;
-        const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+        const currCellHeight = rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
         const tableRect = tableEl.getBoundingClientRect();
         const trRect = trEl.getBoundingClientRect();
         const targetOffsetY = dragClientY - trRect.y - trEl.clientHeight;
@@ -18169,6 +18178,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             resizeTipElem.style.left = `${resizeBarLeft}px`;
             resizeTipElem.style.top = `${resizeBarTop}px`;
           }
+          reactData.isDragResize = true;
         };
         reactData.isDragResize = true;
         addClass(tableEl, 'row-drag--resize');
@@ -18178,8 +18188,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           document.onmousemove = null;
           document.onmouseup = null;
           resizeBarElem.style.display = 'none';
-          reactData.isDragResize = false;
           internalData._lastResizeTime = Date.now();
+          setTimeout(() => {
+            reactData.isDragResize = false;
+          }, 50);
           if (resizeHeight !== currCellHeight) {
             const resizeParams = {
               ...params,
@@ -18205,9 +18217,17 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         } = resizableOpts;
         const el = refElem.value;
         if (isDblclickAutoHeight && el) {
+          evnt.stopPropagation();
+          evnt.preventDefault();
+          const {
+            editStore
+          } = reactData;
           const {
             fullAllDataRowIdData
           } = internalData;
+          const {
+            actived
+          } = editStore;
           const {
             row
           } = params;
@@ -18216,19 +18236,28 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (!rowRest) {
             return;
           }
-          const resizeHeight = calcCellAutoHeight(rowRest, el);
-          const resizeParams = {
-            ...params,
-            resizeHeight,
-            resizeRow: row
+          const handleRsHeight = () => {
+            el.setAttribute('data-calc-row', 'Y');
+            const resizeHeight = calcCellAutoHeight(rowRest, el);
+            el.removeAttribute('data-calc-row');
+            const resizeParams = {
+              ...params,
+              resizeHeight,
+              resizeRow: row
+            };
+            reactData.isDragResize = false;
+            internalData._lastResizeTime = Date.now();
+            if ($xeTable.handleRowResizeDblclickCellAreaEvent) {
+              $xeTable.handleRowResizeDblclickCellAreaEvent(evnt, resizeParams);
+            } else {
+              rowRest.resizeHeight = resizeHeight;
+              handleUpdateRowResize(evnt, resizeParams);
+            }
           };
-          reactData.isDragResize = false;
-          internalData._lastResizeTime = Date.now();
-          if ($xeTable.handleRowResizeDblclickCellAreaEvent) {
-            $xeTable.handleRowResizeDblclickCellAreaEvent(evnt, resizeParams);
+          if (actived.row || actived.column) {
+            $xeTable.clearEdit().then(handleRsHeight);
           } else {
-            rowRest.resizeHeight = resizeHeight;
-            handleUpdateRowResize(evnt, resizeParams);
+            handleRsHeight();
           }
         }
       },
@@ -18716,11 +18745,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           internalData.tooltipTimeout = setTimeout(() => {
             $tooltip = refTooltip.value;
             if ($tooltip && $tooltip.isActived && !$tooltip.isActived()) {
-              tableMethods.closeTooltip();
+              $xeTable.closeTooltip();
             }
           }, tooltipOpts.leaveDelay);
         } else {
-          tableMethods.closeTooltip();
+          $xeTable.closeTooltip();
         }
       },
       triggerHeaderCellClickEvent(evnt, params) {
@@ -18765,8 +18794,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           editConfig
         } = props;
         const {
-          editStore
+          editStore,
+          isDragResize
         } = reactData;
+        if (isDragResize) {
+          return;
+        }
         const expandOpts = computeExpandOpts.value;
         const editOpts = computeEditOpts.value;
         const treeOpts = computeTreeOpts.value;
@@ -18876,8 +18909,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           editConfig
         } = props;
         const {
-          editStore
+          editStore,
+          isDragResize
         } = reactData;
+        if (isDragResize) {
+          return;
+        }
         const editOpts = computeEditOpts.value;
         const {
           actived
@@ -20214,9 +20251,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       },
       triggerBodyWheelEvent(evnt) {
         const {
+          target,
           deltaY,
           deltaX
         } = evnt;
+        if (target && /^textarea$/i.test(target.tagName)) {
+          return;
+        }
         const {
           highlightHoverRow
         } = src_props;
@@ -20451,9 +20492,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       // 更新纵向 Y 可视渲染上下剩余空间大小
       updateScrollYSpace() {
         const {
-          showOverflow
-        } = props;
-        const {
+          isAllOverflow,
           scrollYLoad
         } = reactData;
         const {
@@ -20475,21 +20514,21 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         let ySpaceHeight = 0;
         if (scrollYLoad) {
           const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
-          if (!isCustomCellHeight && showOverflow) {
+          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];
-              ySpaceHeight += rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
+              const rowRest = fullAllDataRowIdData[rowid] || {};
+              ySpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
             }
             for (let i = 0; i < startIndex; i++) {
               const row = afterFullData[i];
               const rowid = getRowid($xeTable, row);
-              const rowRest = fullAllDataRowIdData[rowid];
-              topSpaceHeight += rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
+              const rowRest = fullAllDataRowIdData[rowid] || {};
+              topSpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
             }
           }
         } else {
@@ -20520,13 +20559,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       },
       updateScrollXData() {
         const {
-          showOverflow
-        } = props;
+          isAllOverflow
+        } = reactData;
         handleTableColumn();
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           handleTableColumn();
           $xeTable.updateScrollXSpace();
-          if (!showOverflow) {
+          if (!isAllOverflow) {
             $xeTable.updateScrollYSpace();
           }
         });
@@ -21115,7 +21154,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       if (value && value.length >= 50000) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
-      loadTableData(value, false).then(() => {
+      loadTableData(value, true).then(() => {
         const {
           scrollXLoad,
           scrollYLoad,