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

package/es/table/src/table.js

@@ -840,13 +840,13 @@ export default defineComponent({
             return { toVisibleIndex: 0, visibleSize: 6 };
         };
         const computeRowHeight = () => {
-            const { showOverflow } = props;
+            const { isAllOverflow } = reactData;
             const tableHeader = refTableHeader.value;
             const tableBody = refTableBody.value;
             const tableBodyElem = tableBody ? tableBody.$el : null;
             const defaultRowHeight = computeDefaultRowHeight.value;
             let rowHeight = 0;
-            if (showOverflow) {
+            if (isAllOverflow) {
                 if (tableBodyElem) {
                     const tableHeaderElem = tableHeader ? tableHeader.$el : null;
                     let firstTrElem;
@@ -869,7 +869,7 @@ export default defineComponent({
             return Math.max(18, rowHeight);
         };
         const handleVirtualYVisible = (currScrollTop) => {
-            const { showOverflow } = props;
+            const { isAllOverflow } = reactData;
             const { elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData } = internalData;
             const rowOpts = computeRowOpts.value;
             const cellOpts = computeCellOpts.value;
@@ -883,7 +883,7 @@ export default defineComponent({
                 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;
                 }
@@ -1405,12 +1405,11 @@ export default defineComponent({
             return colHeight + topBottomPadding;
         };
         const calcCellHeight = () => {
-            const { showOverflow } = props;
-            const { tableData, scrollYLoad, scrollXLoad } = reactData;
+            const { tableData, isAllOverflow, scrollYLoad, scrollXLoad } = reactData;
             const { fullAllDataRowIdData } = internalData;
             const defaultRowHeight = computeDefaultRowHeight.value;
             const el = refElem.value;
-            if (!showOverflow && scrollYLoad && el) {
+            if (!isAllOverflow && scrollYLoad && el) {
                 tableData.forEach(row => {
                     const rowid = getRowid($xeTable, row);
                     const rowRest = fullAllDataRowIdData[rowid];
@@ -1674,7 +1673,7 @@ export default defineComponent({
             updateAfterDataIndex();
         };
         const updateStyle = () => {
-            const { border, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
+            const { border, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
             const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, columnStore, editStore, isAllOverflow, expandColumn } = reactData;
             const { visibleColumn, fullColumnIdData, tableHeight, tableWidth, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
             const el = refElem.value;
@@ -1863,7 +1862,7 @@ export default defineComponent({
                         let renderColumnList = tableColumn;
                         let isOptimizeMode = false;
                         // 如果是使用优化模式
-                        if (scrollXLoad || scrollYLoad || (allColumnOverflow && isAllOverflow)) {
+                        if (scrollXLoad || scrollYLoad || isAllOverflow) {
                             if (expandColumn || spanMethod || footerSpanMethod) {
                                 // 如果不支持优化模式
                             }
@@ -1948,7 +1947,7 @@ export default defineComponent({
                                     cellOverflow = XEUtils.isUndefined(showFooterOverflow) || XEUtils.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
                                 }
                                 else {
-                                    cellOverflow = XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow) ? allColumnOverflow : showOverflow;
+                                    cellOverflow = XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow) ? isAllOverflow : showOverflow;
                                 }
                                 const showEllipsis = cellOverflow === 'ellipsis';
                                 const showTitle = cellOverflow === 'title';
@@ -2534,11 +2533,10 @@ export default defineComponent({
          * @param {Array} datas 数据
          */
         const loadTableData = (datas, isReset) => {
-            const { keepSource, treeConfig, showOverflow } = props;
+            const { keepSource, treeConfig } = props;
             const { editStore, scrollYLoad: oldScrollYLoad } = reactData;
             const { scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData;
             const treeOpts = computeTreeOpts.value;
-            const rowOpts = computeRowOpts.value;
             const { transform } = treeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             let treeData = [];
@@ -2598,32 +2596,15 @@ export default defineComponent({
             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 (process.env.NODE_ENV === 'development') {
-                    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();
@@ -2642,6 +2623,27 @@ export default defineComponent({
                 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 (process.env.NODE_ENV === 'development') {
+                        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 => {
@@ -3039,11 +3041,10 @@ export default defineComponent({
          * 纵向 Y 可视渲染处理
          */
         const loadScrollYData = (scrollTop) => {
-            const { showOverflow } = props;
-            const { mergeList } = reactData;
+            const { mergeList, isAllOverflow } = reactData;
             const { scrollYStore } = internalData;
             const { preloadSize, startIndex, endIndex, offsetSize } = scrollYStore;
-            const autoOffsetYSize = showOverflow ? offsetSize : offsetSize + 1;
+            const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
             const { toVisibleIndex, visibleSize } = handleVirtualYVisible(scrollTop);
             const offsetItem = {
                 startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize - preloadSize),
@@ -5279,8 +5280,7 @@ export default defineComponent({
              * @param {ColumnInfo} fieldOrColumn 列配置
              */
             scrollToRow(row, fieldOrColumn) {
-                const { showOverflow } = props;
-                const { scrollYLoad, scrollXLoad } = reactData;
+                const { isAllOverflow, scrollYLoad, scrollXLoad } = reactData;
                 const rest = [];
                 if (row) {
                     if (props.treeConfig) {
@@ -5295,7 +5295,7 @@ export default defineComponent({
                 }
                 return Promise.all(rest).then(() => {
                     if (row) {
-                        if (!showOverflow && (scrollYLoad || scrollXLoad)) {
+                        if (!isAllOverflow && (scrollYLoad || scrollXLoad)) {
                             calcCellHeight();
                             calcCellWidth();
                         }
@@ -8797,8 +8797,7 @@ export default defineComponent({
             },
             // 更新纵向 Y 可视渲染上下剩余空间大小
             updateScrollYSpace() {
-                const { showOverflow } = props;
-                const { scrollYLoad } = reactData;
+                const { isAllOverflow, scrollYLoad } = reactData;
                 const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData } = internalData;
                 const { startIndex } = scrollYStore;
                 const rowOpts = computeRowOpts.value;
@@ -8810,7 +8809,7 @@ export default defineComponent({
                 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);
                     }
@@ -8856,12 +8855,12 @@ export default defineComponent({
                 });
             },
             updateScrollXData() {
-                const { showOverflow } = props;
+                const { isAllOverflow } = reactData;
                 handleTableColumn();
                 return nextTick().then(() => {
                     handleTableColumn();
                     $xeTable.updateScrollXSpace();
-                    if (!showOverflow) {
+                    if (!isAllOverflow) {
                         $xeTable.updateScrollYSpace();
                     }
                 });
@@ -9474,7 +9473,7 @@ export default defineComponent({
             if (value && value.length >= 50000) {
                 warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
-            loadTableData(value, false).then(() => {
+            loadTableData(value, true).then(() => {
                 const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 internalData.inited = true;
                 internalData.initStatus = true;

package/es/ui/index.js

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

package/es/ui/src/log.js

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

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.26";
 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.26"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6259,7 +6259,6 @@ const renderType = 'body';
       const {
         columnKey,
         height,
-        showOverflow: allColumnOverflow,
         cellClassName: allCellClassName,
         cellStyle,
         align: allAlign,
@@ -6338,12 +6337,11 @@ const renderType = 'body';
       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 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';
       const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
-      // 如果表格加上 showOverflow 则不再支持列单独设置
-      const hasEllipsis = allColumnOverflow || showTitle || showTooltip || showEllipsis || resizeHeight > 0;
+      const hasEllipsis = isAllOverflow || showTitle || showTooltip || showEllipsis || resizeHeight > 0;
       let isDirty;
       const tdOns = {};
       const cellAlign = align || (compConf ? compConf.tableCellAlign : '') || allAlign;
@@ -6496,13 +6494,13 @@ const renderType = 'body';
         isVNPreEmptyStatus = true;
       }
       const tcStyle = {};
-      if (hasEllipsis) {
+      if (scrollYLoad || hasEllipsis) {
         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', {
@@ -6597,7 +6595,6 @@ const renderType = 'body';
         highlightHoverRow,
         rowClassName,
         rowStyle,
-        showOverflow: allColumnOverflow,
         editConfig,
         treeConfig
       } = tableProps;
@@ -6606,6 +6603,7 @@ const renderType = 'body';
         treeExpandedMaps,
         scrollXLoad,
         scrollYLoad,
+        isAllOverflow,
         rowExpandedMaps,
         expandColumn,
         selectRadioRow,
@@ -6743,7 +6741,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 +6829,6 @@ const renderType = 'body';
         tableColumn
       } = props;
       const {
-        showOverflow: allColumnOverflow,
         spanMethod,
         footerSpanMethod,
         mouseConfig
@@ -6862,7 +6859,7 @@ const renderType = 'body';
       let renderColumnList = tableColumn;
       let isOptimizeMode = false;
       // 如果是使用优化模式
-      if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+      if (scrollXLoad || scrollYLoad || isAllOverflow) {
         if (expandColumn || spanMethod || footerSpanMethod) {
           // 如果不支持优化模式
         } else {
@@ -11154,14 +11151,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 +11181,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     };
     const handleVirtualYVisible = currScrollTop => {
       const {
-        showOverflow
-      } = props;
+        isAllOverflow
+      } = reactData;
       const {
         elemStore,
         isResizeCellHeight,
@@ -11204,7 +11201,7 @@ 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 {
@@ -11800,11 +11797,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       return colHeight + topBottomPadding;
     };
     const calcCellHeight = () => {
-      const {
-        showOverflow
-      } = props;
       const {
         tableData,
+        isAllOverflow,
         scrollYLoad,
         scrollXLoad
       } = reactData;
@@ -11813,7 +11808,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = internalData;
       const defaultRowHeight = computeDefaultRowHeight.value;
       const el = refElem.value;
-      if (!showOverflow && scrollYLoad && el) {
+      if (!isAllOverflow && scrollYLoad && el) {
         tableData.forEach(row => {
           const rowid = getRowid($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid];
@@ -12197,7 +12192,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const updateStyle = () => {
       const {
         border,
-        showOverflow: allColumnOverflow,
         showHeaderOverflow: allColumnHeaderOverflow,
         showFooterOverflow: allColumnFooterOverflow,
         mouseConfig,
@@ -12418,7 +12412,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 +12496,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 +13199,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const loadTableData = (datas, isReset) => {
       const {
         keepSource,
-        treeConfig,
-        showOverflow
+        treeConfig
       } = props;
       const {
         editStore,
@@ -13219,7 +13212,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         lastScrollTop
       } = internalData;
       const treeOpts = computeTreeOpts.value;
-      const rowOpts = computeRowOpts.value;
       const {
         transform
       } = treeOpts;
@@ -13280,32 +13272,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 +13299,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 +13770,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
      */
     const loadScrollYData = scrollTop => {
       const {
-        showOverflow
-      } = props;
-      const {
-        mergeList
+        mergeList,
+        isAllOverflow
       } = reactData;
       const {
         scrollYStore
@@ -13788,7 +13782,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         endIndex,
         offsetSize
       } = scrollYStore;
-      const autoOffsetYSize = showOverflow ? offsetSize : offsetSize + 1;
+      const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
       const {
         toVisibleIndex,
         visibleSize
@@ -16364,9 +16358,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        */
       scrollToRow(row, fieldOrColumn) {
         const {
-          showOverflow
-        } = props;
-        const {
+          isAllOverflow,
           scrollYLoad,
           scrollXLoad
         } = reactData;
@@ -16383,7 +16375,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         }
         return Promise.all(rest).then(() => {
           if (row) {
-            if (!showOverflow && (scrollYLoad || scrollXLoad)) {
+            if (!isAllOverflow && (scrollYLoad || scrollXLoad)) {
               calcCellHeight();
               calcCellWidth();
             }
@@ -20451,9 +20443,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       // 更新纵向 Y 可视渲染上下剩余空间大小
       updateScrollYSpace() {
         const {
-          showOverflow
-        } = props;
-        const {
+          isAllOverflow,
           scrollYLoad
         } = reactData;
         const {
@@ -20475,7 +20465,7 @@ 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 {
@@ -20520,13 +20510,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 +21105,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,