vxe-table 3.11.5 → 3.11.6-beta.1

package/es/table/src/methods.js

@@ -7,8 +7,8 @@ import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible,
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI;
-const isWebkit = browse['-webkit'] && !browse.edge;
-const debounceScrollYDuration = browse.msie ? 80 : 20;
+// const isWebkit = browse['-webkit'] && !browse.edge
+// const debounceScrollYDuration = browse.msie ? 80 : 20
 const customStorageKey = 'VXE_CUSTOM_STORE';
 // 获取所有的列，排除分组
 const getColumnList = (columns) => {
@@ -95,25 +95,28 @@ function handleVirtualXVisible(_vm) {
     return { toVisibleIndex: 0, visibleSize: 6 };
 }
 const computeRowHeight = ($xeTable) => {
-    const { $refs, computeSize } = $xeTable;
-    const tableHeader = $refs.tableHeader;
-    const tableBody = $refs.tableBody;
+    const props = $xeTable;
+    const { showOverflow } = props;
+    const tableHeader = $xeTable.$refs.tableHeader;
+    const tableBody = $xeTable.$refs.tableBody;
     const tableBodyElem = tableBody ? tableBody.$el : null;
-    const vSize = computeSize;
+    const vSize = $xeTable.computeSize;
     const rowHeightMaps = $xeTable.rowHeightMaps;
     let rowHeight = 0;
-    if (tableBodyElem) {
-        const tableHeaderElem = tableHeader ? tableHeader.$el : null;
-        let firstTrElem;
-        firstTrElem = tableBodyElem.querySelector('tr');
-        if (!firstTrElem && tableHeaderElem) {
-            firstTrElem = tableHeaderElem.querySelector('tr');
-        }
-        if (firstTrElem) {
-            rowHeight = firstTrElem.clientHeight;
-        }
-        if (!rowHeight) {
-            rowHeight = rowHeightMaps[vSize || 'default'];
+    if (showOverflow) {
+        if (tableBodyElem) {
+            const tableHeaderElem = tableHeader ? tableHeader.$el : null;
+            let firstTrElem;
+            firstTrElem = tableBodyElem.querySelector('tr');
+            if (!firstTrElem && tableHeaderElem) {
+                firstTrElem = tableHeaderElem.querySelector('tr');
+            }
+            if (firstTrElem) {
+                rowHeight = firstTrElem.clientHeight;
+            }
+            if (!rowHeight) {
+                rowHeight = rowHeightMaps[vSize || 'default'];
+            }
         }
     }
     return rowHeight;
@@ -271,20 +274,42 @@ function calcTableHeight(_vm, key) {
     return num;
 }
 const calcCellHeight = ($xeTable) => {
-    const { tableData, scrollYLoad, fullAllDataRowIdData } = $xeTable;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const { showOverflow } = props;
+    const { tableData, scrollXLoad, scrollYLoad } = reactData;
+    const { fullAllDataRowIdData } = internalData;
     const el = $xeTable.$el;
-    if (scrollYLoad && el) {
+    if (!showOverflow && (scrollXLoad || scrollYLoad) && el) {
+        let paddingTop = 0;
+        let paddingBottom = 0;
+        let calcPadding = false;
         tableData.forEach((row) => {
             const rowid = getRowid($xeTable, row);
-            const rest = fullAllDataRowIdData[rowid];
+            const rowRest = fullAllDataRowIdData[rowid];
             const trList = el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`);
-            if (rest && trList.length) {
+            if (rowRest && trList.length) {
                 let height = 0;
                 for (let i = 0; i < trList.length; i++) {
                     const trEl = trList[i];
-                    height = Math.max(height, trEl.offsetHeight);
+                    const tdList = trEl.children;
+                    for (let j = 0; j < tdList.length; j++) {
+                        const tdEl = tdList[j];
+                        const cellElem = tdEl.querySelector('.vxe-cell');
+                        if (!calcPadding) {
+                            paddingTop = XEUtils.toNumber(getComputedStyle(tdEl).paddingTop);
+                            paddingBottom = XEUtils.toNumber(getComputedStyle(tdEl).paddingBottom);
+                            calcPadding = true;
+                        }
+                        let cellHeight = paddingTop + paddingBottom;
+                        if (cellElem) {
+                            cellHeight += cellElem.offsetHeight;
+                        }
+                        height = Math.max(height, cellHeight);
+                    }
                 }
-                rest.height = height;
+                rowRest.height = height;
             }
         });
     }
@@ -449,6 +474,47 @@ const handleScrollToRowColumn = ($xeTable, fieldOrColumn, row) => {
     }
     return $xeTable.$nextTick();
 };
+function handleRecalculateLayout($xeTable, reFull) {
+    const el = $xeTable.$refs.refElem;
+    if (!el || !el.clientWidth) {
+        return $xeTable.$nextTick();
+    }
+    $xeTable.calcCellWidth();
+    $xeTable.autoCellWidth();
+    if (reFull === true) {
+        // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
+        return $xeTable.computeScrollLoad().then(() => {
+            calcCellHeight($xeTable);
+            $xeTable.calcCellWidth();
+            $xeTable.autoCellWidth();
+            return $xeTable.computeScrollLoad();
+        });
+    }
+    return $xeTable.computeScrollLoad();
+}
+function checkLastSyncScroll($xeTable, isRollX, isRollY) {
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const { scrollXLoad, scrollYLoad } = reactData;
+    const { lcsTimeout } = internalData;
+    if (lcsTimeout) {
+        clearTimeout(lcsTimeout);
+    }
+    internalData.lcsTimeout = setTimeout(() => {
+        internalData.lcsTimeout = undefined;
+        internalData.inVirtualScroll = false;
+        internalData.inBodyScroll = false;
+        internalData.bodyScrollType = '';
+        internalData.inFooterScroll = false;
+        if (isRollX && scrollXLoad) {
+            $xeTable.updateScrollXData();
+        }
+        if (isRollY && scrollYLoad) {
+            $xeTable.updateScrollYData();
+        }
+        $xeTable.updateCellAreas();
+    }, 200);
+}
 const Methods = {
     callSlot(slotFunc, params, h, vNodes) {
         if (slotFunc) {
@@ -2441,22 +2507,21 @@ const Methods = {
      * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
      */
     recalculate(reFull) {
-        const el = this.$el;
-        if (!el || !el.clientWidth) {
-            return this.$nextTick();
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { rceTimeout } = internalData;
+        if (rceTimeout) {
+            clearTimeout(rceTimeout);
         }
-        calcCellHeight(this);
-        this.calcCellWidth();
-        this.autoCellWidth();
-        if (reFull === true) {
-            // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
-            return this.computeScrollLoad().then(() => {
-                calcCellHeight(this);
-                this.autoCellWidth();
-                return this.computeScrollLoad();
-            });
+        else {
+            handleRecalculateLayout($xeTable, !!reFull);
         }
-        return this.computeScrollLoad();
+        return new Promise(resolve => {
+            internalData.rceTimeout = setTimeout(() => {
+                internalData.rceTimeout = undefined;
+                resolve(handleRecalculateLayout($xeTable, !!reFull));
+            }, 20);
+        });
     },
     calcCellWidth() {
         const $xeTable = this;
@@ -2650,12 +2715,17 @@ const Methods = {
     },
     calcCellHeight() {
         const $xeTable = this;
+        const props = $xeTable;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        const { tableData, scrollYLoad } = reactData;
+        const { showOverflow } = props;
+        const { tableData, scrollXLoad, scrollYLoad } = reactData;
         const { fullAllDataRowIdData } = internalData;
         const el = $xeTable.$el;
-        if (scrollYLoad && el) {
+        if (!showOverflow && (scrollXLoad || scrollYLoad) && el) {
+            let paddingTop = 0;
+            let paddingBottom = 0;
+            let calcPadding = false;
             tableData.forEach((row) => {
                 const rowid = getRowid($xeTable, row);
                 const rowRest = fullAllDataRowIdData[rowid];
@@ -2664,9 +2734,23 @@ const Methods = {
                     let height = 0;
                     for (let i = 0; i < trList.length; i++) {
                         const trEl = trList[i];
-                        height = Math.max(height, trEl.offsetHeight);
+                        const tdList = trEl.children;
+                        for (let j = 0; j < tdList.length; j++) {
+                            const tdEl = tdList[j];
+                            const cellElem = tdEl.querySelector('.vxe-cell');
+                            if (!calcPadding) {
+                                paddingTop = XEUtils.toNumber(getComputedStyle(tdEl).paddingTop);
+                                paddingBottom = XEUtils.toNumber(getComputedStyle(tdEl).paddingBottom);
+                                calcPadding = true;
+                            }
+                            let cellHeight = paddingTop + paddingBottom;
+                            if (cellElem) {
+                                cellHeight += cellElem.offsetHeight;
+                            }
+                            height = Math.max(height, cellHeight);
+                        }
                     }
-                    rowRest.height = height;
+                    rowRest.height = scrollXLoad ? Math.max(rowRest.height, height) : height;
                 }
             });
         }
@@ -5911,16 +5995,14 @@ const Methods = {
             scrollLeft: bodyElem.scrollLeft
         };
     },
-    /**
-     * 横向 X 可视渲染事件处理
-     */
-    triggerScrollXEvent() {
-        this.loadScrollXData();
-    },
     loadScrollXData() {
-        const { mergeList, mergeFooterList, scrollXStore } = this;
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { mergeList, mergeFooterList } = reactData;
+        const { scrollXStore } = internalData;
         const { startIndex, endIndex, offsetSize } = scrollXStore;
-        const { toVisibleIndex, visibleSize } = handleVirtualXVisible(this);
+        const { toVisibleIndex, visibleSize } = handleVirtualXVisible($xeTable);
         const offsetItem = {
             startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize),
             endIndex: toVisibleIndex + visibleSize + offsetSize
@@ -5931,10 +6013,10 @@ const Methods = {
             if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
                 scrollXStore.startIndex = offsetStartIndex;
                 scrollXStore.endIndex = offsetEndIndex;
-                this.updateScrollXData();
+                $xeTable.updateScrollXData();
             }
         }
-        this.closeTooltip();
+        $xeTable.closeTooltip();
     },
     handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
         const $xeTable = this;
@@ -5981,7 +6063,6 @@ const Methods = {
             }
             $xeTable.checkScrolling();
             internalData.lastScrollLeft = scrollLeft;
-            reactData.lastScrollTime = Date.now();
         }
         else {
             const yThreshold = $xeTable.computeScrollYThreshold;
@@ -6002,8 +6083,8 @@ const Methods = {
                 }
             }
             internalData.lastScrollTop = scrollTop;
-            reactData.lastScrollTime = Date.now();
         }
+        reactData.lastScrollTime = Date.now();
         const evntParams = Object.assign({ scrollTop,
             scrollLeft,
             bodyHeight,
@@ -6014,6 +6095,7 @@ const Methods = {
             isLeft,
             isRight,
             direction }, params);
+        checkLastSyncScroll($xeTable, isRollX, isRollY);
         if (rowOpts.isHover || highlightHoverRow) {
             $xeTable.clearHoverRow();
         }
@@ -6028,71 +6110,124 @@ 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.min(80, Math.floor(visibleSize * 3));
+        if (lxTimeout) {
+            clearTimeout(lxTimeout);
+        }
+        if (!lxRunTime || lxRunTime + fpsTime < Date.now()) {
+            internalData.lxRunTime = Date.now();
+            $xeTable.loadScrollXData();
+        }
+        internalData.lxTimeout = setTimeout(() => {
+            internalData.lxRunTime = undefined;
+            internalData.lxRunTime = undefined;
+            $xeTable.loadScrollXData();
+        }, fpsTime);
+    },
+    lazyScrollYData() {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { lyTimeout, lyRunTime, scrollYStore } = internalData;
+        const { visibleSize } = scrollYStore;
+        const fpsTime = Math.min(80, Math.floor(visibleSize * 2));
+        if (lyTimeout) {
+            clearTimeout(lyTimeout);
+        }
+        if (!lyRunTime || lyRunTime + fpsTime < Date.now()) {
+            internalData.lyRunTime = Date.now();
+            $xeTable.loadScrollYData();
+        }
+        internalData.lyTimeout = setTimeout(() => {
+            internalData.lyTimeout = undefined;
+            internalData.lyRunTime = undefined;
+            $xeTable.loadScrollYData();
+        }, fpsTime);
+    },
+    /**
+     * 横向 X 可视渲染事件处理
+     */
+    triggerScrollXEvent() {
+        const $xeTable = this;
+        const sXOpts = $xeTable.computeSXOpts;
+        if (sXOpts.immediate) {
+            $xeTable.loadScrollXData();
+        }
+        else {
+            $xeTable.lazyScrollXData();
+        }
+    },
     /**
      * 纵向 Y 可视渲染事件处理
      */
     triggerScrollYEvent() {
-        const { scrollYStore } = this;
-        const { adaptive, offsetSize, visibleSize } = scrollYStore;
-        // webkit 浏览器使用最佳的渲染方式，且最高渲染量不能大于 40 条
-        if (isWebkit && adaptive && (offsetSize * 2 + visibleSize) <= 40) {
-            this.loadScrollYData();
+        const $xeTable = this;
+        const sYOpts = $xeTable.computeSYOpts;
+        if (sYOpts.immediate) {
+            $xeTable.loadScrollYData();
         }
         else {
-            this.debounceScrollYData();
+            $xeTable.lazyScrollYData();
         }
-        this.debounceScrollYCalculate();
     },
-    debounceScrollYData: XEUtils.debounce(function () {
-        this.loadScrollYData();
-    }, debounceScrollYDuration, { leading: false, trailing: true }),
-    handleSyncScrollX(scrollLeft) {
+    scrollXEvent(evnt) {
         const $xeTable = this;
+        const internalData = $xeTable;
+        const { inFooterScroll, inBodyScroll } = internalData;
+        if (inFooterScroll) {
+            return;
+        }
+        if (inBodyScroll) {
+            return;
+        }
         const tableHeader = $xeTable.$refs.tableHeader;
         const tableBody = $xeTable.$refs.tableBody;
         const tableFooter = $xeTable.$refs.tableFooter;
         const bodyElem = tableBody.$el;
         const headerElem = tableHeader ? tableHeader.$el : null;
         const footerElem = tableFooter ? tableFooter.$el : null;
-        setScrollLeft(bodyElem, scrollLeft);
-        setScrollLeft(headerElem, scrollLeft);
-        setScrollLeft(footerElem, scrollLeft);
-    },
-    scrollXEvent(evnt) {
-        const $xeTable = this;
         const wrapperEl = evnt.currentTarget;
         const { scrollTop, scrollLeft } = wrapperEl;
         const isRollX = true;
         const isRollY = false;
-        $xeTable.handleSyncScrollX(scrollLeft);
+        internalData.inVirtualScroll = true;
+        setScrollLeft(bodyElem, scrollLeft);
+        setScrollLeft(headerElem, scrollLeft);
+        setScrollLeft(footerElem, scrollLeft);
         $xeTable.triggerScrollXEvent(evnt);
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
             type: 'table',
             fixed: ''
         });
     },
-    debounceScrollYCalculate: XEUtils.debounce(function () {
-        this.updateScrollYSpace();
-    }, 1000, { leading: false, trailing: true }),
-    handleSyncScrollY(scrollTop) {
+    scrollYEvent(evnt) {
         const $xeTable = this;
+        const internalData = $xeTable;
+        const { inFooterScroll, inBodyScroll } = internalData;
+        if (inFooterScroll) {
+            return;
+        }
+        if (inBodyScroll) {
+            return;
+        }
         const tableBody = $xeTable.$refs.tableBody;
         const leftBody = $xeTable.$refs.leftBody;
         const rightBody = $xeTable.$refs.rightBody;
         const bodyElem = tableBody.$el;
         const leftElem = leftBody ? leftBody.$el : null;
         const rightElem = rightBody ? rightBody.$el : null;
-        setScrollTop(bodyElem, scrollTop);
-        setScrollTop(leftElem, scrollTop);
-        setScrollTop(rightElem, scrollTop);
-    },
-    scrollYEvent(evnt) {
-        const $xeTable = this;
         const wrapperEl = evnt.currentTarget;
         const { scrollTop, scrollLeft } = wrapperEl;
         const isRollX = false;
         const isRollY = true;
-        $xeTable.handleSyncScrollY(scrollTop);
+        internalData.inVirtualScroll = true;
+        setScrollTop(bodyElem, scrollTop);
+        setScrollTop(leftElem, scrollTop);
+        setScrollTop(rightElem, scrollTop);
         $xeTable.triggerScrollYEvent(evnt);
         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
             type: 'table',
@@ -6103,12 +6238,19 @@ const Methods = {
      * 纵向 Y 可视渲染处理
      */
     loadScrollYData() {
-        const { mergeList, scrollYStore } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { showOverflow } = props;
+        const { mergeList } = reactData;
+        const { tableHeight, scrollYStore } = internalData;
         const { startIndex, endIndex, offsetSize } = scrollYStore;
-        const { toVisibleIndex, visibleSize } = handleVirtualYVisible(this);
+        const offsetYSize = showOverflow ? offsetSize : offsetSize + Math.min(8, Math.ceil(tableHeight / 200));
+        const { toVisibleIndex, visibleSize } = handleVirtualYVisible($xeTable);
         const offsetItem = {
-            startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize),
-            endIndex: toVisibleIndex + visibleSize + offsetSize
+            startIndex: Math.max(0, toVisibleIndex - 1 - offsetYSize),
+            endIndex: toVisibleIndex + visibleSize + offsetYSize
         };
         calculateMergerOffsetIndex(mergeList, offsetItem, 'row');
         const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
@@ -6116,50 +6258,44 @@ const Methods = {
             if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
                 scrollYStore.startIndex = offsetStartIndex;
                 scrollYStore.endIndex = offsetEndIndex;
-                this.updateScrollYData();
+                $xeTable.updateScrollYData();
             }
         }
     },
     // 计算可视渲染相关数据
     computeScrollLoad() {
         const $xeTable = this;
-        const props = $xeTable;
         return this.$nextTick().then(() => {
-            const { showOverflow } = props;
             const { sYOpts, sXOpts, scrollXLoad, scrollYLoad, scrollXStore, scrollYStore } = this;
             // 计算 X 逻辑
             if (scrollXLoad) {
-                const { visibleSize: visibleXSize } = handleVirtualXVisible(this);
-                // 动态列缓冲量
-                const bufferSize = showOverflow ? 0 : 2;
-                const offsetXSize = Math.max(bufferSize, sXOpts.oSize ? XEUtils.toNumber(sXOpts.oSize) : browse.msie ? 10 : (browse.edge ? 5 : 0));
+                const { visibleSize: visibleXSize } = handleVirtualXVisible($xeTable);
+                const offsetXSize = Math.max(0, sXOpts.oSize ? XEUtils.toNumber(sXOpts.oSize) : (browse.edge ? 5 : 0));
                 scrollXStore.offsetSize = offsetXSize;
                 scrollXStore.visibleSize = visibleXSize;
                 scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
-                this.updateScrollXData();
+                $xeTable.updateScrollXData();
             }
             else {
-                this.updateScrollXSpace();
+                $xeTable.updateScrollXSpace();
             }
             calcCellHeight(this);
             // 计算 Y 逻辑
             const rowHeight = computeRowHeight(this);
             scrollYStore.rowHeight = rowHeight;
             this.rowHeight = rowHeight;
-            const { visibleSize: visibleYSize } = handleVirtualYVisible(this);
+            const { visibleSize: visibleYSize } = handleVirtualYVisible($xeTable);
             if (scrollYLoad) {
-                // 动态高缓冲量
-                const bufferSize = showOverflow ? 0 : 2;
-                const offsetYSize = Math.max(bufferSize, sYOpts.oSize ? XEUtils.toNumber(sYOpts.oSize) : (browse.edge ? 10 : 0));
+                const offsetYSize = Math.max(0, sYOpts.oSize ? XEUtils.toNumber(sYOpts.oSize) : (browse.edge ? 10 : 0));
                 scrollYStore.offsetSize = offsetYSize;
                 scrollYStore.visibleSize = visibleYSize;
                 scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
-                this.updateScrollYData();
+                $xeTable.updateScrollYData();
             }
             else {
-                this.updateScrollYSpace();
+                $xeTable.updateScrollYSpace();
             }
-            this.$nextTick(this.updateStyle);
+            $xeTable.$nextTick(this.updateStyle);
         });
     },
     handleTableColumn() {
@@ -6175,10 +6311,17 @@ const Methods = {
         this.tableColumn = tableColumn;
     },
     updateScrollXData() {
+        const $xeTable = this;
+        const props = $xeTable;
+        const { showOverflow } = props;
         // this.tableColumn = []
-        return this.$nextTick().then(() => {
-            this.handleTableColumn();
-            this.updateScrollXSpace();
+        return $xeTable.$nextTick().then(() => {
+            $xeTable.handleTableColumn();
+            calcCellHeight($xeTable);
+            $xeTable.updateScrollXSpace();
+            if (!showOverflow) {
+                $xeTable.updateScrollYSpace();
+            }
         });
     },
     // 更新横向 X 可视渲染上下剩余空间大小
@@ -6225,10 +6368,10 @@ const Methods = {
     updateScrollYData() {
         const $xeTable = this;
         // this.tableData = []
-        return this.$nextTick().then(() => {
-            this.handleTableData();
+        return $xeTable.$nextTick().then(() => {
+            $xeTable.handleTableData();
             calcCellHeight($xeTable);
-            this.updateScrollYSpace();
+            $xeTable.updateScrollYSpace();
         });
     },
     // 更新纵向 Y 可视渲染上下剩余空间大小
@@ -6629,7 +6772,7 @@ const Methods = {
     }
 };
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
+const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,resetFilterPanel,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
     Methods[name] = function (...args) {
         if (process.env.NODE_ENV === 'development') {

package/es/table/src/table.js

@@ -1091,8 +1091,10 @@ export default {
         const VxeUILoadingComponent = VxeUI.getComponent('VxeLoading');
         const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
         const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
         const { _e, $scopedSlots, tId, isCalcColumn, tableData, tableColumn, tableGroupColumn, isGroup, loading, stripe, showHeader, height, tableBorder, treeOpts, treeConfig, mouseConfig, mouseOpts, areaOpts, computeSize, validOpts, showFooter, overflowX, overflowY, scrollXLoad, scrollYLoad, scrollbarHeight, highlightCell, highlightHoverRow, highlightHoverColumn, editConfig, validTipOpts, initStore, columnStore, filterStore, customStore, ctxMenuStore, ctxMenuOpts, footerTableData, columnOpts, rowOpts, checkboxOpts, loadingOpts, editRules } = $xeTable;
         const { leftList, rightList } = columnStore;
+        const loadingSlot = $scopedSlots.loading;
         const currLoading = this._isLoading || loading;
         const vSize = computeSize;
         const virtualScrollBars = $xeTable.computeVirtualScrollBars;
@@ -1280,8 +1282,14 @@ export default {
                         icon: loadingOpts.icon,
                         text: loadingOpts.text
                     }
-                }, this.callSlot($scopedSlots.loading, {}, h))
-                : _e(),
+                }, $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, loading: currLoading }, h))
+                : loadingSlot
+                    ? h('div', {
+                        class: ['vxe-loading--custom-wrapper', {
+                                'is--visible': currLoading
+                            }]
+                    }, $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, loading: currLoading }, h))
+                    : renderEmptyElement($xeTable),
             /**
              * 自定义列
              */
@@ -1293,7 +1301,7 @@ export default {
                         customStore
                     }
                 })
-                : _e(),
+                : renderEmptyElement($xeTable),
             /**
              * 筛选
              */