vxe-table 4.12.0 → 4.12.1

package/es/table/module/edit/hook.js

@@ -96,8 +96,8 @@ hooks.add('tableEditModule', {
         };
         const handleInsertRowAt = (records, targetRow, isInsertNextRow) => {
             const { treeConfig } = props;
-            const { mergeList, editStore } = reactData;
-            const { tableFullTreeData, afterFullData, tableFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData;
+            const { mergeList } = reactData;
+            const { tableFullTreeData, afterFullData, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
             const { transform, rowField, mapChildrenField } = treeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -244,11 +244,11 @@ hooks.add('tableEditModule', {
                     }
                 }
             }
-            const { insertMaps } = editStore;
             newRecords.forEach(newRow => {
                 const rowid = getRowid($xeTable, newRow);
-                insertMaps[rowid] = newRow;
+                insertRowMaps[rowid] = newRow;
             });
+            reactData.insertRowFlag++;
             $xeTable.cacheRowMap(false);
             $xeTable.updateScrollYStatus();
             $xeTable.handleTableData(treeConfig && transform);
@@ -487,13 +487,12 @@ hooks.add('tableEditModule', {
             remove(rows) {
                 const { treeConfig } = props;
                 const { mergeList, editStore } = reactData;
-                const { tableFullTreeData, selectCheckboxMaps, afterFullData, tableFullData, pendingRowMaps } = internalData;
+                const { tableFullTreeData, selectCheckboxMaps, afterFullData, tableFullData, pendingRowMaps, insertRowMaps, removeRowMaps } = internalData;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const treeOpts = computeTreeOpts.value;
                 const { transform, mapChildrenField } = treeOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
-                const { actived, removeMaps } = editStore;
-                const insertDataRowMaps = Object.assign({}, editStore.insertMaps);
+                const { actived } = editStore;
                 const { checkField } = checkboxOpts;
                 let delList = [];
                 if (!rows) {
@@ -506,7 +505,7 @@ hooks.add('tableEditModule', {
                 rows.forEach((row) => {
                     if (!$xeTable.isInsertByRow(row)) {
                         const rowid = getRowid($xeTable, row);
-                        removeMaps[rowid] = row;
+                        removeRowMaps[rowid] = row;
                     }
                 });
                 // 如果绑定了多选属性，则更新状态
@@ -577,14 +576,15 @@ hooks.add('tableEditModule', {
                 // 从新增中移除已删除的数据
                 rows.forEach((row) => {
                     const rowid = getRowid($xeTable, row);
-                    if (insertDataRowMaps[rowid]) {
-                        delete insertDataRowMaps[rowid];
+                    if (insertRowMaps[rowid]) {
+                        delete insertRowMaps[rowid];
                     }
                     if (pendingRowMaps[rowid]) {
                         delete pendingRowMaps[rowid];
                     }
                 });
-                editStore.insertMaps = insertDataRowMaps;
+                reactData.removeRowFlag++;
+                reactData.insertRowFlag++;
                 reactData.pendingRowFlag++;
                 $xeTable.updateFooter();
                 $xeTable.cacheRowMap(false);
@@ -654,11 +654,9 @@ hooks.add('tableEditModule', {
              * 获取新增的临时数据
              */
             getInsertRecords() {
-                const { editStore } = reactData;
-                const { fullAllDataRowIdData } = internalData;
-                const { insertMaps } = editStore;
+                const { fullAllDataRowIdData, insertRowMaps } = internalData;
                 const insertRecords = [];
-                XEUtils.each(insertMaps, (row, rowid) => {
+                XEUtils.each(insertRowMaps, (row, rowid) => {
                     if (fullAllDataRowIdData[rowid]) {
                         insertRecords.push(row);
                     }
@@ -669,10 +667,9 @@ hooks.add('tableEditModule', {
              * 获取已删除的数据
              */
             getRemoveRecords() {
-                const { editStore } = reactData;
-                const { removeMaps } = editStore;
+                const { removeRowMaps } = internalData;
                 const removeRecords = [];
-                XEUtils.each(removeMaps, (row) => {
+                XEUtils.each(removeRowMaps, (row) => {
                     removeRecords.push(row);
                 });
                 return removeRecords;
@@ -699,7 +696,7 @@ hooks.add('tableEditModule', {
                 if (process.env.NODE_ENV === 'development') {
                     warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord']);
                 }
-                return this.getEditRecord();
+                return $xeTable.getEditRecord();
             },
             getEditRecord() {
                 const { editStore } = reactData;
@@ -727,7 +724,7 @@ hooks.add('tableEditModule', {
                 if (process.env.NODE_ENV === 'development') {
                     warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit']);
                 }
-                return this.clearEdit(row);
+                return $xeTable.clearEdit(row);
             },
             /**
              * 清除激活的编辑
@@ -751,7 +748,7 @@ hooks.add('tableEditModule', {
                     warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow']);
                 }
                 // 即将废弃
-                return this.isEditByRow(row);
+                return $xeTable.isEditByRow(row);
             },
             /**
              * 判断行是否为激活编辑状态
@@ -915,7 +912,7 @@ hooks.add('tableEditModule', {
                     if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
                         if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
                             handleClearEdit(evnt);
-                            editMethods.clearSelected();
+                            $xeTable.clearSelected();
                             if ($xeTable.clearCellAreas) {
                                 $xeTable.clearCellAreas();
                                 $xeTable.clearCopyCellArea();

package/es/table/module/validator/hook.js

@@ -85,9 +85,7 @@ hooks.add('tableValidatorModule', {
         const beginValidate = (rows, cols, cb, isFull) => {
             const validRest = {};
             const { editRules, treeConfig } = props;
-            const { editStore } = reactData;
-            const { afterFullData, pendingRowMaps } = internalData;
-            const { removeMaps } = editStore;
+            const { afterFullData, pendingRowMaps, removeRowMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const validOpts = computeValidOpts.value;
@@ -121,7 +119,7 @@ hooks.add('tableValidatorModule', {
                 const handleVaild = (row) => {
                     const rowid = getRowid($xeTable, row);
                     // 是否删除
-                    if (removeMaps[rowid]) {
+                    if (removeRowMaps[rowid]) {
                         return;
                     }
                     // 是否标记删除

package/es/table/src/body.js

@@ -414,10 +414,13 @@ export default defineComponent({
             const rows = [];
             const { handleGetRowId } = createHandleGetRowId($xeTable);
             tableData.forEach((row, $rowIndex) => {
-                const trOn = {};
+                const rowid = handleGetRowId(row);
+                const rowRest = fullAllDataRowIdData[rowid] || {};
                 let rowIndex = $rowIndex;
-                // 确保任何情况下 rowIndex 都精准指向真实 data 索引
-                rowIndex = $xeTable.getRowIndex(row);
+                let rowLevel = 0;
+                let seq = -1;
+                let _rowIndex = -1;
+                const trOn = {};
                 // 当前行事件
                 if (rowOpts.isHover || highlightHoverRow) {
                     trOn.onMouseenter = (evnt) => {
@@ -433,11 +436,6 @@ export default defineComponent({
                         $xeTable.clearHoverRow();
                     };
                 }
-                const rowid = handleGetRowId(row);
-                const rowRest = fullAllDataRowIdData[rowid] || {};
-                let rowLevel = 0;
-                let seq = -1;
-                let _rowIndex = 0;
                 if (rowRest) {
                     rowLevel = rowRest.level;
                     if (treeConfig && transform && seqMode === 'increasing') {
@@ -446,6 +444,7 @@ export default defineComponent({
                     else {
                         seq = rowRest.seq;
                     }
+                    rowIndex = rowRest.index;
                     _rowIndex = rowRest._index;
                 }
                 const params = { $table: $xeTable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex, _rowIndex };

package/es/table/src/table.js

@@ -172,9 +172,7 @@ export default defineComponent({
                 focused: {
                     row: null,
                     column: null
-                },
-                insertMaps: {},
-                removeMaps: {}
+                }
             },
             // 存放 tooltip 相关信息
             tooltipStore: {
@@ -236,6 +234,8 @@ export default defineComponent({
             treeExpandedFlag: 1,
             updateCheckboxFlag: 1,
             pendingRowFlag: 1,
+            insertRowFlag: 1,
+            removeRowFlag: 1,
             rowHeightStore: {
                 default: 48,
                 medium: 44,
@@ -335,7 +335,6 @@ export default defineComponent({
             fullDataRowIdData: {},
             fullColumnIdData: {},
             fullColumnFieldData: {},
-            // prevDragRow: null,
             // 已展开的行集合
             rowExpandedMaps: {},
             // 懒加载中的展开行的集合
@@ -348,6 +347,10 @@ export default defineComponent({
             selectCheckboxMaps: {},
             // 已标记的对象集
             pendingRowMaps: {},
+            // 已新增的临时行
+            insertRowMaps: {},
+            // 已删除行
+            removeRowMaps: {},
             inited: false,
             tooltipTimeout: null,
             initStatus: false,
@@ -418,8 +421,8 @@ export default defineComponent({
             return virtualXOpts;
         });
         const computeScrollXThreshold = computed(() => {
-            const sXOpts = computeSXOpts.value;
-            const { threshold } = sXOpts;
+            const virtualXOpts = computeVirtualXOpts.value;
+            const { threshold } = virtualXOpts;
             if (threshold) {
                 return XEUtils.toNumber(threshold);
             }
@@ -450,8 +453,8 @@ export default defineComponent({
             return !!(scrollbarOpts.y && scrollbarOpts.y.position === 'left');
         });
         const computeScrollYThreshold = computed(() => {
-            const sYOpts = computeSYOpts.value;
-            const { threshold } = sYOpts;
+            const virtualYOpts = computeVirtualYOpts.value;
+            const { threshold } = virtualYOpts;
             if (threshold) {
                 return XEUtils.toNumber(threshold);
             }
@@ -1020,14 +1023,14 @@ export default defineComponent({
         };
         const setMerges = (merges, mList, rowList) => {
             if (merges) {
-                const { treeConfig } = props;
+                // const { treeConfig } = props
                 const { visibleColumn } = internalData;
                 if (!XEUtils.isArray(merges)) {
                     merges = [merges];
                 }
-                if (treeConfig && merges.length) {
-                    errLog('vxe.error.noTree', ['merge-cells | merge-footer-items']);
-                }
+                // if (treeConfig && merges.length) {
+                //   errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
+                // }
                 merges.forEach((item) => {
                     let { row, col, rowspan, colspan } = item;
                     if (rowList && XEUtils.isNumber(row)) {
@@ -1070,14 +1073,14 @@ export default defineComponent({
         const removeMerges = (merges, mList, rowList) => {
             const rest = [];
             if (merges) {
-                const { treeConfig } = props;
+                // const { treeConfig } = props
                 const { visibleColumn } = internalData;
                 if (!XEUtils.isArray(merges)) {
                     merges = [merges];
                 }
-                if (treeConfig && merges.length) {
-                    errLog('vxe.error.noTree', ['merge-cells | merge-footer-items']);
-                }
+                // if (treeConfig && merges.length) {
+                //   errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
+                // }
                 merges.forEach((item) => {
                     let { row, col } = item;
                     if (rowList && XEUtils.isNumber(row)) {
@@ -1776,7 +1779,7 @@ export default defineComponent({
             updateAfterDataIndex();
         };
         const updateStyle = () => {
-            const { border, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
+            const { showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
             const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn } = reactData;
             const { visibleColumn, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
             const el = refElem.value;
@@ -1929,32 +1932,6 @@ export default defineComponent({
                         if (tableElem) {
                             tableElem.style.width = tWidth ? `${tWidth}px` : '';
                         }
-                        const listElem = getRefElem(elemStore[`${name}-${layout}-list`]);
-                        if (isGroup && listElem) {
-                            XEUtils.arrayEach(listElem.querySelectorAll('.col--group'), (thElem) => {
-                                const colNode = $xeTable.getColumnNode(thElem);
-                                if (colNode) {
-                                    const column = colNode.item;
-                                    const { showHeaderOverflow } = column;
-                                    const cellOverflow = XEUtils.isBoolean(showHeaderOverflow) ? showHeaderOverflow : allColumnHeaderOverflow;
-                                    const showEllipsis = cellOverflow === 'ellipsis';
-                                    const showTitle = cellOverflow === 'title';
-                                    const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
-                                    const hasEllipsis = showTitle || showTooltip || showEllipsis;
-                                    let childWidth = 0;
-                                    let countChild = 0;
-                                    if (hasEllipsis) {
-                                        XEUtils.eachTree(column.children, (item) => {
-                                            if (!item.children || !column.children.length) {
-                                                countChild++;
-                                            }
-                                            childWidth += item.renderWidth;
-                                        }, { children: 'children' });
-                                    }
-                                    thElem.style.width = hasEllipsis ? `${childWidth - countChild - (border ? 2 : 0)}px` : '';
-                                }
-                            });
-                        }
                     }
                     else if (layout === 'body') {
                         if (currScrollElem) {
@@ -2096,7 +2073,7 @@ export default defineComponent({
                         (sortConfig.multiple ? defaultSort : defaultSort.slice(0, 1)).forEach((item, index) => {
                             const { field, order } = item;
                             if (field && order) {
-                                const column = tableMethods.getColumnByField(field);
+                                const column = $xeTable.getColumnByField(field);
                                 if (column && column.sortable) {
                                     column.order = order;
                                     column.sortTime = Date.now() + index;
@@ -2104,7 +2081,7 @@ export default defineComponent({
                             }
                         });
                         if (!sortOpts.remote) {
-                            tablePrivateMethods.handleTableData(true).then(updateStyle);
+                            $xeTable.handleTableData(true).then(updateStyle);
                         }
                     }
                 }
@@ -2163,7 +2140,7 @@ export default defineComponent({
                 const expandOpts = computeExpandOpts.value;
                 const { expandAll, expandRowKeys } = expandOpts;
                 if (expandAll) {
-                    tableMethods.setAllRowExpand(true);
+                    $xeTable.setAllRowExpand(true);
                 }
                 else if (expandRowKeys) {
                     const defExpandeds = [];
@@ -2172,7 +2149,7 @@ export default defineComponent({
                             defExpandeds.push(fullDataRowIdData[rowid].row);
                         }
                     });
-                    tableMethods.setRowExpand(defExpandeds, true);
+                    $xeTable.setRowExpand(defExpandeds, true);
                 }
             }
         };
@@ -2533,13 +2510,13 @@ export default defineComponent({
         const handleDefaultMergeCells = () => {
             const { mergeCells } = props;
             if (mergeCells) {
-                tableMethods.setMergeCells(mergeCells);
+                $xeTable.setMergeCells(mergeCells);
             }
         };
         const handleDefaultMergeFooterItems = () => {
             const { mergeFooterItems } = props;
             if (mergeFooterItems) {
-                tableMethods.setMergeFooterItems(mergeFooterItems);
+                $xeTable.setMergeFooterItems(mergeFooterItems);
             }
         };
         // 计算可视渲染相关数据
@@ -2629,7 +2606,7 @@ export default defineComponent({
          */
         const loadTableData = (datas, isReset) => {
             const { keepSource, treeConfig } = props;
-            const { editStore, scrollYLoad: oldScrollYLoad } = reactData;
+            const { scrollYLoad: oldScrollYLoad } = reactData;
             const { scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData;
             const treeOpts = computeTreeOpts.value;
             const { transform } = treeOpts;
@@ -2680,8 +2657,8 @@ export default defineComponent({
             scrollXStore.endIndex = 1;
             reactData.isRowLoading = true;
             reactData.scrollVMLoading = false;
-            editStore.insertMaps = {};
-            editStore.removeMaps = {};
+            internalData.insertRowMaps = {};
+            internalData.removeRowMaps = {};
             const sYLoad = updateScrollYStatus(fullData);
             reactData.isDragColMove = false;
             reactData.isDragRowMove = false;
@@ -2703,10 +2680,10 @@ export default defineComponent({
                 $xeTable.clearCellAreas();
                 $xeTable.clearCopyCellArea();
             }
-            tableMethods.clearMergeCells();
-            tableMethods.clearMergeFooterItems();
-            tablePrivateMethods.handleTableData(true);
-            tableMethods.updateFooter();
+            $xeTable.clearMergeCells();
+            $xeTable.clearMergeFooterItems();
+            $xeTable.handleTableData(true);
+            $xeTable.updateFooter();
             return nextTick().then(() => {
                 updateHeight();
                 updateStyle();
@@ -2737,20 +2714,20 @@ export default defineComponent({
                     }
                 }
                 handleReserveStatus();
-                tablePrivateMethods.checkSelectionStatus();
+                $xeTable.checkSelectionStatus();
                 return new Promise(resolve => {
                     nextTick()
-                        .then(() => tableMethods.recalculate())
+                        .then(() => $xeTable.recalculate())
                         .then(() => {
                         let targetScrollLeft = lastScrollLeft;
                         let targetScrollTop = lastScrollTop;
-                        const sXOpts = computeSXOpts.value;
-                        const sYOpts = computeSYOpts.value;
+                        const virtualXOpts = computeVirtualXOpts.value;
+                        const virtualYOpts = computeVirtualYOpts.value;
                         // 是否在更新数据之后自动滚动重置滚动条
-                        if (sXOpts.scrollToLeftOnChange) {
+                        if (virtualXOpts.scrollToLeftOnChange) {
                             targetScrollLeft = 0;
                         }
-                        if (sYOpts.scrollToTopOnChange) {
+                        if (virtualYOpts.scrollToTopOnChange) {
                             targetScrollTop = 0;
                         }
                         reactData.isRowLoading = false;
@@ -2786,7 +2763,7 @@ export default defineComponent({
             handleDefaultTreeExpand();
             handleDefaultMergeCells();
             handleDefaultMergeFooterItems();
-            nextTick(() => setTimeout(() => tableMethods.recalculate()));
+            nextTick(() => setTimeout(() => $xeTable.recalculate()));
         };
         /**
          * 处理初始化的默认行为
@@ -2852,7 +2829,7 @@ export default defineComponent({
             const centerList = [];
             const rightList = [];
             const { isGroup, columnStore } = reactData;
-            const sXOpts = computeSXOpts.value;
+            const virtualXOpts = computeVirtualXOpts.value;
             const { collectColumn, tableFullColumn, scrollXStore, fullColumnIdData } = internalData;
             // 如果是分组表头，如果子列全部被隐藏，则根列也隐藏
             if (isGroup) {
@@ -2916,7 +2893,7 @@ export default defineComponent({
             }
             const visibleColumn = leftList.concat(centerList).concat(rightList);
             // 如果gt为0，则总是启用
-            const scrollXLoad = !!sXOpts.enabled && sXOpts.gt > -1 && (sXOpts.gt === 0 || sXOpts.gt < tableFullColumn.length);
+            const scrollXLoad = !!virtualXOpts.enabled && virtualXOpts.gt > -1 && (virtualXOpts.gt === 0 || virtualXOpts.gt < tableFullColumn.length);
             reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0;
             Object.assign(columnStore, { leftList, centerList, rightList });
             if (scrollXLoad) {
@@ -3025,12 +3002,12 @@ export default defineComponent({
         };
         const updateScrollYStatus = (fullData) => {
             const { treeConfig } = props;
-            const sYOpts = computeSYOpts.value;
+            const virtualYOpts = computeVirtualYOpts.value;
             const treeOpts = computeTreeOpts.value;
             const { transform } = treeOpts;
             const allList = fullData || internalData.tableFullData;
             // 如果gt为0，则总是启用
-            const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt < allList.length);
+            const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
             reactData.scrollYLoad = scrollYLoad;
             return scrollYLoad;
         };
@@ -3732,9 +3709,7 @@ export default defineComponent({
              */
             revertData(rows, field) {
                 const { keepSource, treeConfig } = props;
-                const { editStore } = reactData;
-                const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
-                const removeTempMaps = Object.assign({}, editStore.removeMaps);
+                const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData, removeRowMaps } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const { transform } = treeOpts;
                 const { handleGetRowId } = createHandleGetRowId($xeTable);
@@ -3770,7 +3745,9 @@ export default defineComponent({
                                         XEUtils.destructuring(row, XEUtils.clone(oRow, true));
                                     }
                                     if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
-                                        delete removeTempMaps[rowid];
+                                        if (removeRowMaps[rowid]) {
+                                            delete removeRowMaps[rowid];
+                                        }
                                         tableFullData.unshift(row);
                                         afterFullData.unshift(row);
                                         reDelFlag = true;
@@ -3782,7 +3759,7 @@ export default defineComponent({
                 }
                 if (rows) {
                     if (reDelFlag) {
-                        editStore.removeMaps = removeTempMaps;
+                        reactData.removeRowFlag++;
                         $xeTable.updateFooter();
                         $xeTable.cacheRowMap(false);
                         $xeTable.handleTableData(treeConfig && transform);
@@ -3915,22 +3892,19 @@ export default defineComponent({
              * @param {Row} row 行对象
              */
             isInsertByRow(row) {
-                const { editStore } = reactData;
                 const rowid = getRowid($xeTable, row);
-                return !!editStore.insertMaps[rowid];
+                return !!reactData.insertRowFlag && !!internalData.insertRowMaps[rowid];
             },
             isRemoveByRow(row) {
-                const { editStore } = reactData;
                 const rowid = getRowid($xeTable, row);
-                return !!editStore.removeMaps[rowid];
+                return !!reactData.removeRowFlag && !!internalData.removeRowMaps[rowid];
             },
             /**
              * 删除所有新增的临时数据
              * @returns
              */
             removeInsertRow() {
-                const { editStore } = reactData;
-                editStore.insertMaps = {};
+                internalData.insertRowMaps = {};
                 return $xeTable.remove($xeTable.getInsertRecords());
             },
             /**
@@ -3969,8 +3943,8 @@ export default defineComponent({
              * @param {Number} columnIndex 索引
              */
             getColumns(columnIndex) {
-                const columns = internalData.visibleColumn;
-                return XEUtils.isUndefined(columnIndex) ? columns.slice(0) : columns[columnIndex];
+                const { visibleColumn } = internalData;
+                return XEUtils.isUndefined(columnIndex) ? visibleColumn.slice(0) : visibleColumn[columnIndex];
             },
             /**
              * 根据列获取列的唯一主键
@@ -3984,7 +3958,7 @@ export default defineComponent({
              * @param {String} colid 列主键
              */
             getColumnById(colid) {
-                const fullColumnIdData = internalData.fullColumnIdData;
+                const { fullColumnIdData } = internalData;
                 return colid && fullColumnIdData[colid] ? fullColumnIdData[colid].column : null;
             },
             /**
@@ -3996,7 +3970,7 @@ export default defineComponent({
                 return field && fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
             },
             getParentColumn(fieldOrColumn) {
-                const fullColumnIdData = internalData.fullColumnIdData;
+                const { fullColumnIdData } = internalData;
                 const column = handleFieldOrColumn($xeTable, fieldOrColumn);
                 return column && column.parentId && fullColumnIdData[column.parentId] ? fullColumnIdData[column.parentId].column : null;
             },
@@ -8884,8 +8858,8 @@ export default defineComponent({
              * 横向 X 可视渲染事件处理
              */
             triggerScrollXEvent() {
-                const sXOpts = computeSXOpts.value;
-                if (sXOpts.immediate) {
+                const virtualXOpts = computeVirtualXOpts.value;
+                if (virtualXOpts.immediate) {
                     loadScrollXData();
                 }
                 else {
@@ -8896,8 +8870,8 @@ export default defineComponent({
              * 纵向 Y 可视渲染事件处理
              */
             triggerScrollYEvent() {
-                const sYOpts = computeSYOpts.value;
-                if (sYOpts.immediate) {
+                const virtualYOpts = computeVirtualYOpts.value;
+                if (virtualYOpts.immediate) {
                     loadScrollYData();
                 }
                 else {
@@ -9093,8 +9067,8 @@ export default defineComponent({
                     return;
                 }
                 const wheelSpeed = getWheelSpeed(reactData.lastScrollTime);
-                const deltaTop = Math.ceil((shiftKey ? deltaX : deltaY) * wheelSpeed);
-                const deltaLeft = Math.ceil((shiftKey ? deltaY : deltaX) * wheelSpeed);
+                const deltaTop = shiftKey ? 0 : Math.ceil(deltaY * wheelSpeed);
+                const deltaLeft = shiftKey ? Math.ceil((shiftKey ? (deltaY || deltaX) : deltaX) * wheelSpeed) : 0;
                 const isTopWheel = deltaTop < 0;
                 const currScrollTop = bodyScrollElem.scrollTop;
                 // 如果滚动位置已经是顶部或底部，则不需要触发
@@ -9113,6 +9087,7 @@ export default defineComponent({
                     evnt.preventDefault();
                     internalData.inWheelScroll = true;
                     wheelScrollLeftTo(scrollLeft, (offsetLeft) => {
+                        internalData.inWheelScroll = true;
                         const currLeftNum = offsetLeft;
                         setScrollLeft(xHandleEl, currLeftNum);
                         setScrollLeft(bodyScrollElem, currLeftNum);
@@ -9129,9 +9104,10 @@ export default defineComponent({
                 }
                 if (isRollY) {
                     evnt.preventDefault();
+                    internalData.inWheelScroll = true;
                     wheelScrollTopTo(scrollTop - currScrollTop, (offsetTop) => {
-                        const currTopNum = bodyScrollElem.scrollTop + offsetTop;
                         internalData.inWheelScroll = true;
+                        const currTopNum = bodyScrollElem.scrollTop + offsetTop;
                         setScrollTop(yHandleEl, currTopNum);
                         setScrollTop(bodyScrollElem, currTopNum);
                         setScrollTop(leftScrollElem, currTopNum);
@@ -10274,7 +10250,6 @@ export default defineComponent({
             nextTick(() => {
                 const { data, exportConfig, importConfig, treeConfig, showOverflow } = props;
                 const { scrollXStore, scrollYStore } = internalData;
-                const sYOpts = computeSYOpts.value;
                 const editOpts = computeEditOpts.value;
                 const treeOpts = computeTreeOpts.value;
                 const radioOpts = computeRadioOpts.value;
@@ -10400,8 +10375,7 @@ export default defineComponent({
                 Object.assign(scrollYStore, {
                     startIndex: 0,
                     endIndex: 0,
-                    visibleSize: 0,
-                    adaptive: sYOpts.adaptive !== false
+                    visibleSize: 0
                 });
                 Object.assign(scrollXStore, {
                     startIndex: 0,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.12.0";
+export const version = "4.12.1";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -193,13 +193,13 @@ VxeUI.setConfig({
             enabled: true,
             gt: 60,
             preSize: 1,
-            oSize: 2
+            oSize: 0
         },
         virtualYConfig: {
             enabled: true,
             gt: 100,
             preSize: 1,
-            oSize: 2
+            oSize: 0
         },
         scrollbarConfig: {
         // width: 0,

package/es/ui/src/log.js

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