vxe-table 3.12.0-beta.1 → 3.12.0-beta.11

package/es/table/src/body.js

@@ -48,12 +48,12 @@ function renderLine(h, _vm, $xetable, params) {
 /**
  * 渲染列
  */
-function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
-    const { $listeners: tableListeners, fullAllDataRowIdData, afterFullData, tableData, height, columnKey, overflowX, sYOpts, scrollXLoad, scrollYLoad, highlightCurrentRow, showOverflow: allColumnOverflow, isAllOverflow, align: allAlign, currentColumn, cellClassName: allCellClassName, cellStyle, mergeList, spanMethod, radioOpts, checkboxOpts, expandOpts, treeOpts, tooltipOpts, mouseConfig, editConfig, editOpts, editRules, validOpts, editStore, tooltipConfig, rowOpts, columnOpts, mouseOpts, areaOpts, validErrorMaps } = $xetable;
-    const rowDragOpts = $xetable.computeRowDragOpts;
+function renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
+    const { $listeners: tableListeners, fullAllDataRowIdData, afterFullData, tableData, height, columnKey, overflowX, sYOpts, scrollXLoad, scrollYLoad, highlightCurrentRow, showOverflow: allColumnOverflow, isAllOverflow, align: allAlign, currentColumn, cellClassName: allCellClassName, cellStyle, mergeList, spanMethod, radioOpts, checkboxOpts, expandOpts, treeOpts, tooltipOpts, mouseConfig, editConfig, editOpts, editRules, validOpts, editStore, tooltipConfig, rowOpts, columnOpts, mouseOpts, areaOpts, validErrorMaps } = $xeTable;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
     const { disabledMethod: dragDisabledMethod } = rowDragOpts;
     const { selectCellToRow } = areaOpts;
-    const cellOpts = $xetable.computeCellOpts;
+    const cellOpts = $xeTable.computeCellOpts;
     const { type, cellRender, editRender, align, showOverflow, className, treeNode, slots } = column;
     const { verticalAlign } = cellOpts;
     const { actived } = editStore;
@@ -64,8 +64,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     const compCellClassName = compConf ? (compConf.tableCellClassName || compConf.cellClassName) : '';
     const compCellStyle = compConf ? (compConf.tableCellStyle || compConf.cellStyle) : '';
     const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
-    const columnIndex = $xetable.getColumnIndex(column);
-    const _columnIndex = $xetable.getVTColumnIndex(column);
+    const columnIndex = $xeTable.getColumnIndex(column);
+    const _columnIndex = $xeTable.getVTColumnIndex(column);
     const isEdit = isEnableConf(editRender);
     let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
     const cellOverflow = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? allColumnOverflow : showOverflow;
@@ -84,19 +84,19 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     const bindMouseenter = tableListeners['cell-mouseenter'];
     const bindMouseleave = tableListeners['cell-mouseleave'];
     const triggerDblclick = (editRender && editConfig && editOpts.trigger === 'dblclick');
-    const params = { $table: $xetable, $grid: $xetable.$xegrid, isEdit: false, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items };
-    let isColDragCell = false;
+    const params = { $table: $xeTable, $grid: $xeTable.$xegrid, isEdit: false, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items };
+    let isRowDragCell = false;
     let isDisabledDrag = false;
     if (rowOpts.drag) {
-        isColDragCell = rowDragOpts.trigger === 'row' || (column.dragSort && rowDragOpts.trigger === 'cell');
+        isRowDragCell = rowDragOpts.trigger === 'row' || (column.dragSort && rowDragOpts.trigger === 'cell');
     }
-    if (isColDragCell) {
+    if (isRowDragCell) {
         isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
     }
     // hover 进入事件
     if (showTitle || showTooltip || showAllTip || bindMouseenter || tooltipConfig) {
         tdOns.mouseenter = (evnt) => {
-            if (isVMScrollProcess($xetable)) {
+            if (isVMScrollProcess($xeTable)) {
                 return;
             }
             if (showTitle) {
@@ -104,33 +104,37 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
             }
             else if (showTooltip || showAllTip) {
                 // 如果配置了显示 tooltip
-                $xetable.triggerBodyTooltipEvent(evnt, params);
+                $xeTable.triggerBodyTooltipEvent(evnt, params);
             }
             if (bindMouseenter) {
-                $xetable.emitEvent('cell-mouseenter', Object.assign({ cell: evnt.currentTarget }, params), evnt);
+                $xeTable.emitEvent('cell-mouseenter', Object.assign({ cell: evnt.currentTarget }, params), evnt);
             }
         };
     }
     // hover 退出事件
     if (showTooltip || showAllTip || bindMouseleave || tooltipConfig) {
         tdOns.mouseleave = (evnt) => {
-            if (isVMScrollProcess($xetable)) {
+            if (isVMScrollProcess($xeTable)) {
                 return;
             }
             if (showTooltip || showAllTip) {
-                $xetable.handleTargetLeaveEvent(evnt);
+                $xeTable.handleTargetLeaveEvent(evnt);
             }
             if (bindMouseleave) {
-                $xetable.emitEvent('cell-mouseleave', Object.assign({ cell: evnt.currentTarget }, params), evnt);
+                $xeTable.emitEvent('cell-mouseleave', Object.assign({ cell: evnt.currentTarget }, params), evnt);
             }
         };
     }
     // 按下事件处理
-    if (isColDragCell || checkboxOpts.range || mouseConfig) {
+    if (isRowDragCell || checkboxOpts.range || mouseConfig) {
         tdOns.mousedown = (evnt) => {
-            $xetable.triggerCellMousedownEvent(evnt, params);
+            $xeTable.triggerCellMousedownEvent(evnt, params);
         };
     }
+    // 拖拽列事件
+    if (isRowDragCell) {
+        tdOns.mouseup = $xeTable.triggerCellMouseupEvent;
+    }
     // 点击事件处理
     if ((rowOpts.isCurrent || highlightCurrentRow) ||
         tableListeners['cell-click'] ||
@@ -140,13 +144,13 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
         (checkboxOpts.trigger === 'row' || (column.type === 'checkbox' && checkboxOpts.trigger === 'cell')) ||
         (treeOpts.trigger === 'row' || (column.treeNode && treeOpts.trigger === 'cell'))) {
         tdOns.click = (evnt) => {
-            $xetable.triggerCellClickEvent(evnt, params);
+            $xeTable.triggerCellClickEvent(evnt, params);
         };
     }
     // 双击事件处理
     if (triggerDblclick || tableListeners['cell-dblclick']) {
         tdOns.dblclick = (evnt) => {
-            $xetable.triggerCellDblclickEvent(evnt, params);
+            $xeTable.triggerCellDblclickEvent(evnt, params);
         };
     }
     // 合并行或列
@@ -186,7 +190,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     }
     // 如果编辑列开启显示状态
     if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
-        isDirty = $xetable.isUpdateByRow(row, column.field);
+        isDirty = $xeTable.isUpdateByRow(row, column.field);
     }
     const tdVNs = [];
     if (fixedHiddenColumn && (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
@@ -203,7 +207,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     }
     else {
         // 渲染单元格
-        tdVNs.push(...renderLine(h, _vm, $xetable, params), h('div', {
+        tdVNs.push(...renderLine(h, _vm, $xeTable, params), h('div', {
             class: ['vxe-cell', {
                     'c--title': showTitle,
                     'c--tooltip': showTooltip,
@@ -213,7 +217,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
                 maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
             },
             attrs: {
-                title: showTitle ? $xetable.getCellLabel(row, column) : null
+                title: showTitle ? $xeTable.getCellLabel(row, column) : null
             }
         }, column.renderCell(h, params)));
         if (showValidTip && errorValidItem) {
@@ -232,7 +236,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
                     class: `vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-${validOpts.theme || 'normal'}`
                 }, [
                     validSlot
-                        ? $xetable.callSlot(validSlot, validParams, h)
+                        ? $xeTable.callSlot(validSlot, validParams, h)
                         : [
                             h('span', {
                                 class: 'vxe-cell--valid-error-msg'
@@ -274,7 +278,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
                 'col--ellipsis': hasEllipsis,
                 'fixed--width': !isAutoCellWidth,
                 'fixed--hidden': fixedHiddenColumn,
-                'is--drag-cell': isColDragCell,
+                'is--drag-cell': isRowDragCell,
                 'is--drag-disabled': isDisabledDrag,
                 'col--dirty': isDirty,
                 'col--active': editConfig && isEdit && (actived.row === row && (actived.column === column || editOpts.mode === 'row')),
@@ -500,7 +504,7 @@ export default {
         const { tId, $scopedSlots } = $xeTable;
         const { fixedColumn, fixedType, tableColumn } = props;
         const { showOverflow: allColumnOverflow, spanMethod, footerSpanMethod, mouseConfig } = tableProps;
-        const { tableData, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn, dragRow, dragCol } = tableReactData;
+        const { isGroup, tableData, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn, dragRow, dragCol } = tableReactData;
         const { visibleColumn, fullAllDataRowIdData, fullColumnIdData } = tableInternalData;
         const rowOpts = $xeTable.computeRowOpts;
         const sYOpts = $xeTable.computeSYOpts;
@@ -547,7 +551,7 @@ export default {
                 }
             }
         }
-        if (!fixedType) {
+        if (!fixedType && !isGroup) {
             // 列拖拽
             if (scrollXLoad && dragCol) {
                 if (renderColumnList.length > 2) {

package/es/table/src/footer.js

@@ -220,7 +220,7 @@ export default {
         const { fixedType, fixedColumn, tableColumn } = props;
         const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps;
         const { visibleColumn, fullColumnIdData } = tableInternalData;
-        const { scrollXLoad, scrollYLoad, scrollbarWidth, dragCol } = tableReactData;
+        const { isGroup, scrollXLoad, scrollYLoad, scrollbarWidth, dragCol } = tableReactData;
         let renderColumnList = tableColumn;
         // 如果是使用优化模式
         if (fixedType) {
@@ -238,7 +238,7 @@ export default {
                 renderColumnList = visibleColumn;
             }
         }
-        if (!fixedType) {
+        if (!fixedType && !isGroup) {
             // 列拖拽
             if (scrollXLoad && dragCol) {
                 if (renderColumnList.length > 2) {

package/es/table/src/header.js

@@ -228,7 +228,7 @@ export default {
             }
             renderHeaderList = [renderColumnList];
         }
-        if (!fixedType) {
+        if (!fixedType && !isGroup) {
             // 列拖拽
             if (scrollXLoad && dragCol) {
                 if (renderColumnList.length > 2) {

package/es/table/src/methods.js

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils';
-import { tpImg, browse, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, isNodeElement } from '../../ui/src/dom';
+import { browse, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, isNodeElement } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
@@ -66,9 +66,10 @@ function handleReserveRow(_vm, reserveRowMap) {
     });
     return reserveList;
 }
-function handleVirtualXVisible(_vm) {
-    const { $refs, visibleColumn } = _vm;
-    const { tableBody } = $refs;
+function handleVirtualXVisible($xeTable) {
+    const internalData = $xeTable;
+    const { visibleColumn } = internalData;
+    const tableBody = $xeTable.$refs.tableBody;
     const tableBodyElem = tableBody ? tableBody.$el : null;
     if (tableBodyElem) {
         const { scrollLeft, clientWidth } = tableBodyElem;
@@ -99,8 +100,8 @@ const computeRowHeight = ($xeTable) => {
     const tableBody = $xeTable.$refs.tableBody;
     const tableBodyElem = tableBody ? tableBody.$el : null;
     const vSize = $xeTable.computeSize;
-    const rowHeightMaps = $xeTable.rowHeightMaps;
-    let rowHeight = 0;
+    const rowHeightMaps = $xeTable.computeRowHeightMaps;
+    let rowHeight = 24;
     if (showOverflow) {
         if (tableBodyElem) {
             const tableHeaderElem = tableHeader ? tableHeader.$el : null;
@@ -120,8 +121,9 @@ const computeRowHeight = ($xeTable) => {
     return rowHeight;
 };
 function handleVirtualYVisible($xeTable) {
-    const { $refs, scrollYStore, afterFullData, fullAllDataRowIdData } = $xeTable;
-    const tableBody = $refs.tableBody;
+    const internalData = $xeTable;
+    const { scrollYStore, afterFullData, fullAllDataRowIdData } = internalData;
+    const tableBody = $xeTable.$refs.tableBody;
     const tableBodyElem = tableBody ? tableBody.$el : null;
     const { rowHeight } = scrollYStore;
     if (tableBodyElem) {
@@ -133,11 +135,11 @@ function handleVirtualYVisible($xeTable) {
         for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
             const row = afterFullData[rIndex];
             const rowid = getRowid($xeTable, row);
-            const rest = fullAllDataRowIdData[rowid];
-            if (!rest) {
+            const rowRest = fullAllDataRowIdData[rowid];
+            if (!rowRest) {
                 break;
             }
-            offsetTop += rest.height || rowHeight;
+            offsetTop += rowRest.height || rowHeight;
             if (toVisibleIndex === -1 && scrollTop < offsetTop) {
                 toVisibleIndex = rIndex;
             }
@@ -333,6 +335,19 @@ function getOrderField(_vm, column) {
         return cellValue;
     };
 }
+function clearDragStatus($xeTable) {
+    const reactData = $xeTable;
+    const { dragRow, dragCol } = reactData;
+    if (dragRow || dragCol) {
+        clearColDropOrigin($xeTable);
+        clearRowDropOrigin($xeTable);
+        hideDropTip($xeTable);
+        reactData.dragRow = null;
+        reactData.dragCol = null;
+        reactData.isDragColMove = false;
+        reactData.isDragRowMove = false;
+    }
+}
 function clearRowDropOrigin($xeTable) {
     const el = $xeTable.$el;
     if (el) {
@@ -516,7 +531,9 @@ const handleScrollToRowColumn = ($xeTable, fieldOrColumn, row) => {
     return $xeTable.$nextTick();
 };
 function handleRecalculateLayout($xeTable, reFull) {
+    const internalData = $xeTable;
     const el = $xeTable.$refs.refElem;
+    internalData.reRunTime = Date.now();
     if (!el || !el.clientWidth) {
         return $xeTable.$nextTick();
     }
@@ -722,7 +739,6 @@ const Methods = {
         editStore.removeList = [];
         editStore.removeMaps = {};
         const sYLoad = this.updateScrollYStatus(fullData);
-        this.scrollYLoad = sYLoad;
         this.isDragRowMove = false;
         // 全量数据
         this.tableFullData = fullData;
@@ -2691,27 +2707,34 @@ const Methods = {
      * 刷新布局
      */
     recalculate(reFull) {
+        const $xeTable = this;
+        const internalData = $xeTable;
         return new Promise(resolve => {
-            const $xeTable = this;
-            const internalData = $xeTable;
-            const { rceTimeout } = internalData;
+            const { rceTimeout, reRunTime } = internalData;
+            const resizeOpts = $xeTable.computeResizeOpts;
+            const refreshDelay = resizeOpts.refreshDelay || 20;
             const el = $xeTable.$refs.refElem;
             if (el && el.clientWidth) {
                 $xeTable.autoCellWidth();
             }
             if (rceTimeout) {
                 clearTimeout(rceTimeout);
-                $xeTable.$nextTick(() => {
-                    resolve();
-                });
+                if (reRunTime && reRunTime + (refreshDelay - 5) < Date.now()) {
+                    resolve(handleRecalculateLayout($xeTable, !!reFull));
+                }
+                else {
+                    $xeTable.$nextTick(() => {
+                        resolve();
+                    });
+                }
             }
             else {
                 resolve(handleRecalculateLayout($xeTable, !!reFull));
             }
             internalData.rceTimeout = setTimeout(() => {
                 internalData.rceTimeout = undefined;
-                resolve(handleRecalculateLayout($xeTable, !!reFull));
-            }, 20);
+                handleRecalculateLayout($xeTable, !!reFull);
+            }, refreshDelay);
         });
     },
     calcCellWidth() {
@@ -5048,7 +5071,7 @@ const Methods = {
         const { editStore, editConfig, editOpts } = this;
         const { actived } = editStore;
         const cell = evnt.currentTarget;
-        params.cell = cell;
+        params = Object.assign({ cell }, params);
         if (isEnableConf(editConfig) && editOpts.trigger === 'dblclick') {
             if (!actived.args || evnt.currentTarget !== actived.args.cell) {
                 if (editOpts.mode === 'row') {
@@ -5196,14 +5219,16 @@ const Methods = {
             $xeTable.closeMenu();
         }
     },
+    triggerCellMouseupEvent() {
+        const $xeTable = this;
+        clearDragStatus($xeTable);
+    },
     /**
      * 行拖拽
      */
     handleRowDragDragstartEvent(evnt) {
         if (evnt.dataTransfer) {
-            const img = new Image();
-            img.src = tpImg;
-            evnt.dataTransfer.setDragImage(img, 0, 0);
+            evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
         }
     },
     handleRowDragDragendEvent(evnt) {
@@ -5448,23 +5473,24 @@ const Methods = {
     },
     handleCellDragMouseupEvent() {
         const $xeTable = this;
-        const reactData = $xeTable;
-        clearRowDropOrigin($xeTable);
-        hideDropTip($xeTable);
-        reactData.dragRow = null;
-        reactData.dragCol = null;
-        reactData.isDragRowMove = false;
+        clearDragStatus($xeTable);
     },
     /**
      * 列拖拽
      */
     handleHeaderCellDragDragstartEvent(evnt) {
         if (evnt.dataTransfer) {
-            const img = new Image();
-            img.src = tpImg;
-            evnt.dataTransfer.setDragImage(img, 0, 0);
+            evnt.dataTransfer.setDragImage(getTpImg(), 0, 0);
         }
     },
+    handleColDragSwapColumn() {
+        const $xeTable = this;
+        $xeTable.handleUpdateColumn();
+        $xeTable.parseColumns(false).then(() => {
+            $xeTable.updateCellAreas();
+            $xeTable.saveCustomStore('update:sort');
+        });
+    },
     handleColDragSwapEvent(evnt, isSyncColumn, dragCol, prevDragCol, prevDragPos, prevDragToChild) {
         const $xeTable = this;
         const props = $xeTable;
@@ -5608,11 +5634,7 @@ const Methods = {
                         }
                     }, evnt);
                     if (isSyncColumn) {
-                        $xeTable.handleUpdateColumn();
-                        $xeTable.parseColumns(false).then(() => {
-                            $xeTable.updateCellAreas();
-                            return $xeTable.saveCustomStore('update:sort');
-                        });
+                        $xeTable.handleColDragSwapColumn();
                     }
                 }).catch(() => {
                 });
@@ -6803,12 +6825,14 @@ const Methods = {
     scrollXEvent(evnt) {
         const $xeTable = this;
         const internalData = $xeTable;
-        const { inFooterScroll, inBodyScroll, lastScrollTop } = internalData;
-        if (inFooterScroll) {
-            return;
-        }
-        if (inBodyScroll) {
-            return;
+        const { intoRunScroll, inFooterScroll, inBodyScroll, lastScrollTop } = internalData;
+        if (!intoRunScroll) {
+            if (inFooterScroll) {
+                return;
+            }
+            if (inBodyScroll) {
+                return;
+            }
         }
         const tableHeader = $xeTable.$refs.tableHeader;
         const tableBody = $xeTable.$refs.tableBody;
@@ -6839,12 +6863,14 @@ const Methods = {
     scrollYEvent(evnt) {
         const $xeTable = this;
         const internalData = $xeTable;
-        const { inFooterScroll, inBodyScroll, lastScrollLeft } = internalData;
-        if (inFooterScroll) {
-            return;
-        }
-        if (inBodyScroll) {
-            return;
+        const { intoRunScroll, inFooterScroll, inBodyScroll, lastScrollLeft } = internalData;
+        if (!intoRunScroll) {
+            if (inFooterScroll) {
+                return;
+            }
+            if (inBodyScroll) {
+                return;
+            }
         }
         const tableBody = $xeTable.$refs.tableBody;
         const leftBody = $xeTable.$refs.leftBody;
@@ -6961,7 +6987,6 @@ const Methods = {
         const $xeTable = this;
         const props = $xeTable;
         const { showOverflow } = props;
-        // this.tableColumn = []
         return $xeTable.$nextTick().then(() => {
             $xeTable.handleTableColumn();
             calcCellHeight($xeTable);
@@ -7014,7 +7039,6 @@ const Methods = {
     },
     updateScrollYData() {
         const $xeTable = this;
-        // this.tableData = []
         return $xeTable.$nextTick().then(() => {
             $xeTable.handleTableData();
             calcCellHeight($xeTable);
@@ -7083,6 +7107,7 @@ const Methods = {
      */
     scrollTo(scrollLeft, scrollTop) {
         const $xeTable = this;
+        const internalData = $xeTable;
         const { $refs } = this;
         const { tableBody, tableHeader, leftBody, rightBody, tableFooter } = $refs;
         const tableBodyElem = tableBody ? tableBody.$el : null;
@@ -7090,6 +7115,7 @@ const Methods = {
         const rightBodyElem = rightBody ? rightBody.$el : null;
         const tableHeaderElem = tableHeader ? tableHeader.$el : null;
         const tableFooterElem = tableFooter ? tableFooter.$el : null;
+        internalData.intoRunScroll = true;
         if (XEUtils.isNumber(scrollLeft)) {
             const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
             if (xHandleEl) {
@@ -7113,7 +7139,14 @@ const Methods = {
             }
         }
         if (this.scrollXLoad || this.scrollYLoad) {
-            return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 30));
+            return new Promise(resolve => {
+                setTimeout(() => {
+                    $xeTable.$nextTick(() => {
+                        internalData.intoRunScroll = false;
+                        resolve();
+                    });
+                });
+            });
         }
         return this.$nextTick();
     },
@@ -7173,10 +7206,15 @@ const Methods = {
      */
     clearScroll() {
         const $xeTable = this;
-        const { $refs, scrollXStore, scrollYStore } = $xeTable;
-        const { tableBody, tableHeader, leftBody, rightBody, tableFooter } = $refs;
-        const tableBodyElem = tableBody ? tableBody.$el : null;
+        const internalData = $xeTable;
+        const { scrollXStore, scrollYStore } = internalData;
+        const tableBody = $xeTable.$refs.tableBody;
+        const tableHeader = $xeTable.$refs.tableHeader;
+        const tableFooter = $xeTable.$refs.tableFooter;
+        const leftBody = $xeTable.$refs.leftBody;
+        const rightBody = $xeTable.$refs.rightBody;
         const leftBodyElem = leftBody ? leftBody.$el : null;
+        const tableBodyElem = tableBody ? tableBody.$el : null;
         const rightBodyElem = rightBody ? rightBody.$el : null;
         const tableHeaderElem = tableHeader ? tableHeader.$el : null;
         const tableFooterElem = tableFooter ? tableFooter.$el : null;

package/es/table/src/table.js

@@ -1,5 +1,6 @@
 import XEUtils from 'xe-utils';
 import { getFuncText, isEnableConf } from '../../ui/src/utils';
+import { initTpImg } from '../../ui/src/dom';
 import { VxeUI } from '../../ui';
 import methods from './methods';
 import TableBodyComponent from './body';
@@ -474,6 +475,9 @@ export default {
             return 0;
         },
         rowHeightMaps() {
+            return this.computeRowHeightMaps;
+        },
+        computeRowHeightMaps() {
             return {
                 default: 48,
                 medium: 44,
@@ -1075,6 +1079,12 @@ export default {
     mounted() {
         const $xeTable = this;
         const props = $xeTable;
+        const columnOpts = $xeTable.computeColumnOpts;
+        const rowOpts = $xeTable.computeRowOpts;
+        const customOpts = $xeTable.computeCustomOpts;
+        if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
+            initTpImg();
+        }
         if (process.env.NODE_ENV === 'development') {
             const { $listeners } = this;
             if (!this.menuConfig && ($listeners['menu-click'] || $listeners['cell-menu'] || $listeners['header-cell-menu'] || $listeners['footer-cell-menu'])) {
@@ -1105,18 +1115,11 @@ export default {
             });
         }
         if (this.autoResize) {
-            const handleWrapperResize = this.resizeOpts.refreshDelay ? XEUtils.throttle(() => this.recalculate(true), this.resizeOpts.refreshDelay, { leading: true, trailing: true }) : null;
-            const resizeObserver = globalResize.create(handleWrapperResize
-                ? () => {
-                    if (this.autoResize) {
-                        handleWrapperResize();
-                    }
+            const resizeObserver = globalResize.create(() => {
+                if (this.autoResize) {
+                    this.recalculate(true);
                 }
-                : () => {
-                    if (this.autoResize) {
-                        this.recalculate(true);
-                    }
-                });
+            });
             resizeObserver.observe(this.$el);
             resizeObserver.observe(this.getParentElem());
             this.$resize = resizeObserver;

package/es/table/src/util.js

@@ -66,14 +66,19 @@ const lineOffsetSizes = {
     small: 2,
     medium: 1
 };
-export function restoreScrollLocation(_vm, scrollLeft, scrollTop) {
-    return _vm.clearScroll().then(() => {
+export function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
+    const internalData = $xeTable;
+    return $xeTable.clearScroll().then(() => {
         if (scrollLeft || scrollTop) {
             // 重置最后滚动状态
-            _vm.lastScrollLeft = 0;
-            _vm.lastScrollTop = 0;
+            internalData.lastScrollLeft = 0;
+            internalData.lastScrollTop = 0;
+            internalData.inVirtualScroll = false;
+            internalData.inBodyScroll = false;
+            internalData.inFooterScroll = false;
+            internalData.bodyScrollType = '';
             // 还原滚动状态
-            return _vm.scrollTo(scrollLeft, scrollTop);
+            return $xeTable.scrollTo(scrollLeft, scrollTop);
         }
     });
 }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.12.0-beta.1";
+export const version = "3.12.0-beta.11";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -31,7 +31,7 @@ VxeUI.setConfig({
         //   keyField: '_X_ROW_KEY' // 行数据的唯一主键字段名
         // },
         resizeConfig: {
-        // refreshDelay: 250
+        // refreshDelay: 20
         },
         resizableConfig: {
             dragMode: 'auto',

package/es/ui/src/dom.js

@@ -1,7 +1,20 @@
 import XEUtils from 'xe-utils';
 const reClsMap = {};
 export const browse = XEUtils.browse();
-export const tpImg = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
+let tpImgEl;
+export function initTpImg() {
+    if (!tpImgEl) {
+        tpImgEl = new Image();
+        tpImgEl.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
+    }
+    return tpImgEl;
+}
+export function getTpImg() {
+    if (!tpImgEl) {
+        return initTpImg();
+    }
+    return tpImgEl;
+}
 export function getPropClass(property, params) {
     return property ? XEUtils.isFunction(property) ? property(params) : property : '';
 }

package/es/ui/src/log.js

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