vxe-table 4.18.7 → 4.18.9

package/es/table/src/table.js

@@ -1,7 +1,7 @@
 import { h, reactive, ref, provide, inject, nextTick, Teleport, onActivated, onDeactivated, onBeforeUnmount, onUnmounted, watch, computed, onMounted } from 'vue';
 import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
-import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, scrollTopTo, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement } from '../../ui/src/dom';
+import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, wheelScrollTopTo, wheelScrollLeftTo, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import { createReactData, createInternalData, getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight, getLastChildColumn } from './util';
@@ -364,6 +364,7 @@ export default defineVxeComponent({
             }
             return leftWidth;
         });
+        // 合并列是否超越冻结列
         const computeBodyMergeCoverFixed = computed(() => {
             const { columnStore, mergeBodyFlag } = reactData;
             const { mergeBodyList, visibleColumn } = internalData;
@@ -373,7 +374,10 @@ export default defineVxeComponent({
                 const lecIndex = leftList.length;
                 for (let i = 0; i < mergeBodyList.length; i++) {
                     const { col, colspan } = mergeBodyList[i];
-                    if (col < lecIndex || (col + colspan) > rscIndex) {
+                    if (col < lecIndex && col + colspan > lecIndex) {
+                        return true;
+                    }
+                    else if (col < rscIndex && col + colspan > rscIndex) {
                         return true;
                     }
                 }
@@ -970,32 +974,46 @@ export default defineVxeComponent({
             }
             return { toVisibleIndex: 0, visibleSize: 6 };
         };
-        const calculateMergerOffsetIndex = (list, offsetItem, type) => {
-            for (let mcIndex = 0, len = list.length; mcIndex < len; mcIndex++) {
-                const mergeItem = list[mcIndex];
-                const { startIndex, endIndex } = offsetItem;
-                const mergeStartIndex = mergeItem[type];
-                const mergeSpanNumber = mergeItem[type + 'span'];
-                const mergeEndIndex = mergeStartIndex + mergeSpanNumber;
-                if (mergeStartIndex < startIndex && startIndex < mergeEndIndex) {
-                    offsetItem.startIndex = mergeStartIndex;
-                }
-                if (mergeStartIndex < endIndex && endIndex < mergeEndIndex) {
-                    offsetItem.endIndex = mergeEndIndex;
-                }
-                if (offsetItem.startIndex !== startIndex || offsetItem.endIndex !== endIndex) {
-                    mcIndex = -1;
+        const calculateMergerOffsetIndex = (list, mergeMaps, offsetItem, type) => {
+            const mKey = `${offsetItem.startIndex}:${offsetItem.endIndex}`;
+            const mObj = mergeMaps[mKey];
+            // 缓存
+            if (mObj) {
+                offsetItem.startIndex = mObj.startIndex;
+                offsetItem.endIndex = mObj.endIndex;
+            }
+            else {
+                for (let mcIndex = 0, len = list.length; mcIndex < len; mcIndex++) {
+                    const mergeItem = list[mcIndex];
+                    const { startIndex, endIndex } = offsetItem;
+                    const mergeStartIndex = mergeItem[type];
+                    const mergeSpanNumber = mergeItem[type + 'span'];
+                    const mergeEndIndex = mergeStartIndex + mergeSpanNumber;
+                    if (mergeStartIndex < startIndex && startIndex < mergeEndIndex) {
+                        offsetItem.startIndex = mergeStartIndex;
+                    }
+                    if (mergeStartIndex < endIndex && endIndex < mergeEndIndex) {
+                        offsetItem.endIndex = mergeEndIndex;
+                    }
+                    if (offsetItem.startIndex !== startIndex || offsetItem.endIndex !== endIndex) {
+                        mcIndex = -1;
+                    }
                 }
+                mergeMaps[mKey] = offsetItem;
             }
         };
         function buildMergeData(mergeConfigs) {
             const mergeMaps = {};
+            const mergeRowMaps = {};
+            const mergeColMaps = {};
             if (mergeConfigs && mergeConfigs.length) {
                 for (let mIndex = 0; mIndex < mergeConfigs.length; mIndex++) {
                     const { row: _rowIndex, col: _columnIndex, rowspan: mergeRowspan, colspan: mergeColspan } = mergeConfigs[mIndex];
                     for (let i = 0; i < mergeRowspan; i++) {
+                        const currRIndex = _rowIndex + i;
                         for (let j = 0; j < mergeColspan; j++) {
-                            mergeMaps[`${_rowIndex + i}:${_columnIndex + j}`] = !i && !j
+                            const currCIndex = _columnIndex + j;
+                            mergeMaps[`${currRIndex}:${currCIndex}`] = !i && !j
                                 ? {
                                     rowspan: mergeRowspan,
                                     colspan: mergeColspan
@@ -1008,12 +1026,14 @@ export default defineVxeComponent({
                     }
                 }
             }
-            return mergeMaps;
+            return { mergeMaps, mergeRowMaps, mergeColMaps };
         }
         const handleUpdateMergeBodyCells = (merges) => {
             internalData.mergeBodyList = [];
             internalData.mergeBodyMaps = {};
             internalData.mergeBodyCellMaps = {};
+            internalData.mergeBodyRowMaps = {};
+            internalData.mergeBodyColMaps = {};
             $xeTable.setMergeCells(merges);
         };
         const handleBodyMerge = (merges) => {
@@ -1130,6 +1150,8 @@ export default defineVxeComponent({
             internalData.mergeHeaderList = [];
             internalData.mergeHeaderMaps = {};
             internalData.mergeHeaderCellMaps = {};
+            internalData.mergeHeaderRowMaps = {};
+            internalData.mergeBodyColMaps = {};
             $xeTable.setMergeHeaderCells(merges);
         };
         const handleHeaderMerge = (merges) => {
@@ -1231,6 +1253,8 @@ export default defineVxeComponent({
             internalData.mergeFooterList = [];
             internalData.mergeFooterMaps = {};
             internalData.mergeFooterCellMaps = {};
+            internalData.mergeFooterRowMaps = {};
+            internalData.mergeFooterColMaps = {};
             $xeTable.setMergeFooterCells(merges);
         };
         const handleFooterMerge = (merges) => {
@@ -2135,8 +2159,8 @@ export default defineVxeComponent({
             const treeOpts = computeTreeOpts.value;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const { transform, rowField, parentField, mapChildrenField } = treeOpts;
-            const { isEvery, remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts;
-            const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts;
+            const { isEvery, remote: allRemoteFilter, filterMethod: allFilterMethod, isDeep: isFilterDeep } = filterOpts;
+            const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological, isDeep: isSortDeep } = sortOpts;
             let tableData = [];
             let tableTree = [];
             // 处理数据
@@ -2200,7 +2224,7 @@ export default defineVxeComponent({
                         });
                         tableData = tableTree;
                     }
-                    else if (treeConfig && transform) {
+                    else if (treeConfig && transform && isFilterDeep !== false) {
                         // 筛选虚拟树
                         tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, {
                             original: true,
@@ -2226,7 +2250,7 @@ export default defineVxeComponent({
                         });
                         tableData = tableTree;
                     }
-                    else if (treeConfig && transform) {
+                    else if (treeConfig && transform && isFilterDeep !== false) {
                         // 还原虚拟树
                         tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
                             original: true,
@@ -2265,7 +2289,7 @@ export default defineVxeComponent({
                         }
                         tableData = tableTree;
                     }
-                    else if (treeConfig && transform) {
+                    else if (treeConfig && transform && isSortDeep !== false) {
                         // 虚拟树的排序
                         if (allSortMethod) {
                             const sortRests = allSortMethod({ data: tableTree, sortList: orderColumns, $table: $xeTable });
@@ -2308,7 +2332,7 @@ export default defineVxeComponent({
                     });
                     tableData = tableTree;
                 }
-                else if (treeConfig && transform) {
+                else if (treeConfig && transform && isSortDeep !== false) {
                     // 还原虚拟树
                     tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
                         original: true,
@@ -3765,7 +3789,7 @@ export default defineVxeComponent({
         };
         const loadScrollXData = () => {
             const { isScrollXBig } = reactData;
-            const { mergeBodyList, mergeFooterList, scrollXStore } = internalData;
+            const { mergeBodyList, mergeFooterList, mergeBodyRowMaps, scrollXStore } = internalData;
             const { preloadSize, startIndex, endIndex, offsetSize } = scrollXStore;
             const { toVisibleIndex, visibleSize } = handleVirtualXVisible();
             const offsetItem = {
@@ -3774,7 +3798,7 @@ export default defineVxeComponent({
             };
             scrollXStore.visibleStartIndex = toVisibleIndex - 1;
             scrollXStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-            calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), offsetItem, 'col');
+            calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), mergeBodyRowMaps, offsetItem, 'col');
             const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
             if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
                 if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
@@ -4201,7 +4225,7 @@ export default defineVxeComponent({
          */
         const loadScrollYData = () => {
             const { isAllOverflow, isScrollYBig } = reactData;
-            const { mergeBodyList, scrollYStore } = internalData;
+            const { mergeBodyList, mergeBodyColMaps, scrollYStore } = internalData;
             const { preloadSize, startIndex, endIndex, offsetSize } = scrollYStore;
             const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
             const { toVisibleIndex, visibleSize } = handleVirtualYVisible();
@@ -4211,7 +4235,7 @@ export default defineVxeComponent({
             };
             scrollYStore.visibleStartIndex = toVisibleIndex - 1;
             scrollYStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-            calculateMergerOffsetIndex(mergeBodyList, offsetItem, 'row');
+            calculateMergerOffsetIndex(mergeBodyList, mergeBodyColMaps, offsetItem, 'row');
             const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
             if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
                 if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
@@ -4359,11 +4383,6 @@ export default defineVxeComponent({
             }
             return multiple;
         };
-        const wheelScrollLeftTo = (scrollLeft, cb) => {
-            requestAnimationFrame(() => {
-                cb(scrollLeft);
-            });
-        };
         const syncGanttScrollTop = (scrollTop) => {
             const $xeGanttView = internalData.xeGanttView;
             if ($xeGanttView) {
@@ -7455,6 +7474,8 @@ export default defineVxeComponent({
                 internalData.mergeBodyList = [];
                 internalData.mergeBodyMaps = {};
                 internalData.mergeBodyCellMaps = {};
+                internalData.mergeBodyRowMaps = {};
+                internalData.mergeBodyColMaps = {};
                 reactData.mergeBodyFlag++;
                 return nextTick().then(() => {
                     return updateStyle();
@@ -7491,6 +7512,8 @@ export default defineVxeComponent({
                 internalData.mergeHeaderList = [];
                 internalData.mergeHeaderMaps = {};
                 internalData.mergeHeaderCellMaps = {};
+                internalData.mergeHeaderRowMaps = {};
+                internalData.mergeBodyColMaps = {};
                 reactData.mergeHeadFlag++;
                 return nextTick().then(() => {
                     return updateStyle();
@@ -7542,6 +7565,8 @@ export default defineVxeComponent({
                 internalData.mergeFooterList = [];
                 internalData.mergeFooterMaps = {};
                 internalData.mergeFooterCellMaps = {};
+                internalData.mergeFooterRowMaps = {};
+                internalData.mergeFooterColMaps = {};
                 reactData.mergeFootFlag++;
                 return nextTick().then(() => {
                     return updateStyle();
@@ -8783,6 +8808,13 @@ export default defineVxeComponent({
                     updateAfterFullData();
                     // 如果为虚拟树，将树结构拍平
                     fullList = handleVirtualTreeToList();
+                    // 更新数据后清除合并缓存，涉及分组、筛选、排序等
+                    internalData.mergeHeaderRowMaps = {};
+                    internalData.mergeHeaderColMaps = {};
+                    internalData.mergeBodyRowMaps = {};
+                    internalData.mergeBodyColMaps = {};
+                    internalData.mergeFooterRowMaps = {};
+                    internalData.mergeFooterColMaps = {};
                 }
                 const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
                 const visibleDataRowIdMaps = {};
@@ -9744,22 +9776,31 @@ export default defineVxeComponent({
             handleSelectRow({ row }, checked, isForce) {
                 $xeTable.handleBatchSelectRows([row], checked, isForce);
             },
+            handleUpdateHeaderMerge() {
+                const { mergeHeaderList } = internalData;
+                const { mergeMaps, mergeRowMaps, mergeColMaps } = buildMergeData(mergeHeaderList);
+                internalData.mergeHeaderCellMaps = mergeMaps;
+                internalData.mergeHeaderRowMaps = mergeRowMaps;
+                internalData.mergeHeaderColMaps = mergeColMaps;
+                reactData.mergeHeadFlag++;
+            },
             /**
              * 处理合并
              */
             handleUpdateBodyMerge() {
                 const { mergeBodyList } = internalData;
-                internalData.mergeBodyCellMaps = buildMergeData(mergeBodyList);
+                const { mergeMaps, mergeRowMaps, mergeColMaps } = buildMergeData(mergeBodyList);
+                internalData.mergeBodyCellMaps = mergeMaps;
+                internalData.mergeBodyRowMaps = mergeRowMaps;
+                internalData.mergeBodyColMaps = mergeColMaps;
                 reactData.mergeBodyFlag++;
             },
-            handleUpdateHeaderMerge() {
-                const { mergeHeaderList } = internalData;
-                internalData.mergeHeaderCellMaps = buildMergeData(mergeHeaderList);
-                reactData.mergeHeadFlag++;
-            },
             handleUpdateFooterMerge() {
                 const { mergeFooterList } = internalData;
-                internalData.mergeFooterCellMaps = buildMergeData(mergeFooterList);
+                const { mergeMaps, mergeRowMaps, mergeColMaps } = buildMergeData(mergeFooterList);
+                internalData.mergeFooterCellMaps = mergeMaps;
+                internalData.mergeFooterRowMaps = mergeRowMaps;
+                internalData.mergeFooterColMaps = mergeColMaps;
                 reactData.mergeFootFlag++;
             },
             handleAggregateSummaryData() {
@@ -11901,8 +11942,9 @@ export default defineVxeComponent({
                 if (isRollX) {
                     evnt.preventDefault();
                     internalData.inWheelScroll = true;
-                    if (browseObj.firefox || browseObj.safari) {
-                        const currLeftNum = scrollLeft;
+                    wheelScrollLeftTo(scrollLeft, (offsetLeft) => {
+                        internalData.inWheelScroll = true;
+                        const currLeftNum = offsetLeft;
                         setScrollLeft(xHandleEl, currLeftNum);
                         setScrollLeft(bodyScrollElem, currLeftNum);
                         setScrollLeft(headerScrollElem, currLeftNum);
@@ -11914,30 +11956,14 @@ export default defineVxeComponent({
                             type: 'table',
                             fixed: ''
                         });
-                    }
-                    else {
-                        wheelScrollLeftTo(scrollLeft, (offsetLeft) => {
-                            internalData.inWheelScroll = true;
-                            const currLeftNum = offsetLeft;
-                            setScrollLeft(xHandleEl, currLeftNum);
-                            setScrollLeft(bodyScrollElem, currLeftNum);
-                            setScrollLeft(headerScrollElem, currLeftNum);
-                            setScrollLeft(footerScrollElem, currLeftNum);
-                            if (scrollXLoad) {
-                                $xeTable.triggerScrollXEvent(evnt);
-                            }
-                            $xeTable.handleScrollEvent(evnt, isRollY, isRollX, bodyScrollElem.scrollTop, currLeftNum, {
-                                type: 'table',
-                                fixed: ''
-                            });
-                        });
-                    }
+                    });
                 }
                 if (isRollY) {
                     evnt.preventDefault();
                     internalData.inWheelScroll = true;
-                    if (browseObj.firefox || browseObj.safari) {
-                        const currTopNum = scrollTop;
+                    wheelScrollTopTo(scrollTop, (offsetTop) => {
+                        internalData.inWheelScroll = true;
+                        const currTopNum = offsetTop;
                         setScrollTop(yHandleEl, currTopNum);
                         setScrollTop(bodyScrollElem, currTopNum);
                         setScrollTop(leftScrollElem, currTopNum);
@@ -11947,30 +11973,11 @@ export default defineVxeComponent({
                         if (scrollYLoad) {
                             $xeTable.triggerScrollYEvent(evnt);
                         }
-                        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, bodyScrollElem.scrollLeft, {
+                        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, offsetTop, bodyScrollElem.scrollLeft, {
                             type: 'table',
                             fixed: ''
                         });
-                    }
-                    else {
-                        scrollTopTo(scrollTop - currScrollTop, (offsetTop) => {
-                            internalData.inWheelScroll = true;
-                            const currTopNum = bodyScrollElem.scrollTop + offsetTop;
-                            setScrollTop(yHandleEl, currTopNum);
-                            setScrollTop(bodyScrollElem, currTopNum);
-                            setScrollTop(leftScrollElem, currTopNum);
-                            setScrollTop(rightScrollElem, currTopNum);
-                            setScrollTop(rowExpandEl, currTopNum);
-                            syncGanttScrollTop(currTopNum);
-                            if (scrollYLoad) {
-                                $xeTable.triggerScrollYEvent(evnt);
-                            }
-                            $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, bodyScrollElem.scrollLeft, {
-                                type: 'table',
-                                fixed: ''
-                            });
-                        });
-                    }
+                    });
                 }
             },
             triggerVirtualScrollXEvent(evnt) {
@@ -13422,6 +13429,8 @@ export default defineVxeComponent({
             // const keyboardOpts = computeKeyboardOpts.value
             const rowDragOpts = computeRowDragOpts.value;
             const areaOpts = computeAreaOpts.value;
+            const sortOpts = computeSortOpts.value;
+            const filterOpts = computeFilterOpts.value;
             const { groupFields } = aggregateOpts;
             if ($xeGantt) {
                 const { refClassifyWrapperElem } = $xeGantt.getRefMaps();
@@ -13461,6 +13470,14 @@ export default defineVxeComponent({
             if (treeConfig && !treeOpts.transform && props.stripe) {
                 warnLog('vxe.error.noTree', ['stripe']);
             }
+            if (treeConfig && !treeOpts.transform) {
+                if (sortOpts.isDeep) {
+                    warnLog('vxe.error.reqSupportProp', ['transform=false', 'sort-config.isDeep=false']);
+                }
+                if (filterOpts.isDeep) {
+                    warnLog('vxe.error.reqSupportProp', ['transform=false', 'filter-config.isDeep=false']);
+                }
+            }
             if (props.showFooter && !(props.footerMethod || props.footerData)) {
                 warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
             }

package/es/table/src/util.js

@@ -87,16 +87,22 @@ export function createInternalData() {
         mergeHeaderMaps: {},
         // 已合并单元格数据集合
         mergeHeaderCellMaps: {},
+        mergeHeaderRowMaps: {},
+        mergeHeaderColMaps: {},
         // 合并单元格的数据
         mergeBodyList: [],
         mergeBodyMaps: {},
         // 已合并单元格数据集合
         mergeBodyCellMaps: {},
+        mergeBodyRowMaps: {},
+        mergeBodyColMaps: {},
         // 合并表尾的数据
         mergeFooterList: [],
         mergeFooterMaps: {},
         // 已合并表尾数据集合
         mergeFooterCellMaps: {},
+        mergeFooterRowMaps: {},
+        mergeFooterColMaps: {},
         // 已展开的行集合
         rowExpandedMaps: {},
         // 懒加载中的展开行的集合

package/es/table/style.css

@@ -2507,12 +2507,12 @@
 }
 
 /*header*/
-.vxe-table .vxe-table--header-wrapper {
-  color: var(--vxe-ui-table-header-font-color);
-}
 .vxe-table {
   /*排序*/
 }
+.vxe-table .vxe-table--header-wrapper {
+  color: var(--vxe-ui-table-header-font-color);
+}
 .vxe-table .vxe-cell--sort {
   text-align: center;
   position: relative;
@@ -2866,6 +2866,21 @@
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
   direction: ltr;
+  /*边框*/
+  /*边框线*/
+  /*树形节点*/
+  /*行分组*/
+  /*单元格高度*/
+  /*溢出列*/
+  /*展开行*/
+  /*拖拽列*/
+  /*拖拽行把柄*/
+  /*暂无数据*/
+  /*校验不通过*/
+  /*已废弃，旧的校验样式**/
+  /*单元格标记删除状态*/
+  /*单元格编辑状态*/
+  /*可编辑*/
 }
 .vxe-table--render-default .vxe-table--body-wrapper {
   background-color: var(--vxe-ui-layout-background-color);
@@ -3034,9 +3049,6 @@
 .vxe-table--render-default .vxe-body--row.row--hover.row--current > .vxe-body--column {
   background-color: var(--vxe-ui-table-row-hover-current-background-color);
 }
-.vxe-table--render-default {
-  /*边框*/
-}
 .vxe-table--render-default.border--default.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.border--full.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.border--outer.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.border--inner.sy-pos--right .vxe-table--scroll-y-top-corner {
   background-image: linear-gradient(var(--vxe-ui-table-border-color), var(--vxe-ui-table-border-color)), linear-gradient(var(--vxe-ui-table-border-color), var(--vxe-ui-table-border-color));
   background-repeat: no-repeat;
@@ -3401,9 +3413,6 @@
   width: 0;
   float: left;
 }
-.vxe-table--render-default {
-  /*边框线*/
-}
 .vxe-table--render-default .vxe-table--border-line {
   position: absolute;
   top: 0;
@@ -3414,9 +3423,6 @@
   pointer-events: none;
   border: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
-.vxe-table--render-default {
-  /*树形节点*/
-}
 .vxe-table--render-default .vxe-tree--line-wrapper {
   position: relative;
   display: block;
@@ -3463,9 +3469,6 @@
           user-select: none;
   cursor: pointer;
 }
-.vxe-table--render-default {
-  /*行分组*/
-}
 .vxe-table--render-default .vxe-row-group--node-btn:hover {
   color: var(--vxe-ui-font-color);
 }
@@ -3474,9 +3477,6 @@
   color: var(--vxe-ui-font-lighten-color);
   transition: transform 0.1s ease-in-out;
 }
-.vxe-table--render-default {
-  /*单元格高度*/
-}
 .vxe-table--render-default .vxe-body--column.col--ellipsis > .vxe-cell .vxe-row-group-cell,
 .vxe-table--render-default .vxe-body--column.col--ellipsis > .vxe-cell .vxe-tree-cell {
   overflow: hidden;
@@ -3497,9 +3497,6 @@
   flex-direction: row;
   align-items: center;
 }
-.vxe-table--render-default {
-  /*溢出列*/
-}
 .vxe-table--render-default .vxe-header--column:not(.col--active).col--ellipsis > .vxe-cell,
 .vxe-table--render-default .vxe-body--column:not(.col--active).col--ellipsis > .vxe-cell,
 .vxe-table--render-default .vxe-footer--column:not(.col--active).col--ellipsis > .vxe-cell {
@@ -3533,9 +3530,6 @@
   flex-direction: row;
   align-items: center;
 }
-.vxe-table--render-default {
-  /*展开行*/
-}
 .vxe-table--render-default .vxe-table--row-expanded-wrapper {
   position: absolute;
   top: 0;
@@ -3606,18 +3600,12 @@
   overflow: auto;
   outline: 0;
 }
-.vxe-table--render-default {
-  /*拖拽列*/
-}
 .vxe-table--render-default .vxe-table--column.col--drag-move {
   transition: transform 0.5s ease;
 }
 .vxe-table--render-default .vxe-table--column.col--drag-origin > .vxe-cell {
   opacity: 0.3;
 }
-.vxe-table--render-default {
-  /*拖拽行把柄*/
-}
 .vxe-table--render-default .vxe-cell--drag-handle {
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -3681,9 +3669,6 @@
 .vxe-table--render-default.size--mini .vxe-cell--radio {
   font-size: var(--vxe-radio-font-size-mini);
 }
-.vxe-table--render-default {
-  /*暂无数据*/
-}
 .vxe-table--render-default .vxe-table--empty-placeholder,
 .vxe-table--render-default .vxe-table--empty-block {
   color: var(--vxe-ui-input-placeholder-color);
@@ -3724,9 +3709,6 @@
 .vxe-table--render-default .vxe-body--column.col--selected {
   box-shadow: inset 0px 0px 0px 2px var(--vxe-ui-font-primary-color);
 }
-.vxe-table--render-default {
-  /*校验不通过*/
-}
 .vxe-table--render-default .vxe-body--column .vxe-cell--valid-error-tip {
   width: 100%;
   position: absolute;
@@ -3783,9 +3765,6 @@
 .vxe-table--render-default.valid-msg--full .vxe-body--row:last-child .vxe-cell--valid-error-tip {
   top: calc(100% - 1.3em);
 }
-.vxe-table--render-default {
-  /*已废弃，旧的校验样式**/
-}
 .vxe-table--render-default.old-cell-valid .vxe-body--column.col--valid-error .vxe-cell--valid-error-tip {
   width: 320px;
   position: absolute;
@@ -3813,9 +3792,6 @@
   transform: translateX(0);
   text-align: left;
 }
-.vxe-table--render-default {
-  /*单元格标记删除状态*/
-}
 .vxe-table--render-default .vxe-body--row.row--pending {
   color: var(--vxe-ui-font-disabled-color);
   opacity: 0.5;
@@ -3835,9 +3811,6 @@
   border-bottom: 1px solid var(--vxe-ui-table-validate-error-color);
   z-index: 1;
 }
-.vxe-table--render-default {
-  /*单元格编辑状态*/
-}
 .vxe-table--render-default .vxe-body--row.row--new > .vxe-body--column {
   position: relative;
 }
@@ -3864,9 +3837,6 @@
   border-color: transparent var(--vxe-ui-table-cell-dirty-update-color) transparent transparent;
   transform: rotate(45deg);
 }
-.vxe-table--render-default {
-  /*可编辑*/
-}
 .vxe-table--render-default.vxe-editable.cell--highlight .vxe-body--column.col--active {
   box-shadow: inset 0px 0px 0px 2px var(--vxe-ui-font-primary-color);
 }

package/es/ui/index.js

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

package/es/ui/src/dom.js

@@ -206,3 +206,24 @@ export function scrollTopTo(diffNum, cb) {
     };
     requestAnimationFrame(step);
 }
+let wtlFrame;
+export function wheelScrollLeftTo(scrollLeft, cb) {
+    if (wtlFrame) {
+        cancelAnimationFrame(wtlFrame);
+    }
+    wtlFrame = requestAnimationFrame(() => {
+        cb(scrollLeft);
+        wtlFrame = null;
+    });
+}
+let wtaFrame;
+export function wheelScrollTopTo(diffNum, cb) {
+    if (wtaFrame) {
+        cancelAnimationFrame(wtaFrame);
+    }
+    wtaFrame = requestAnimationFrame(() => {
+        const offsetTop = diffNum;
+        cb(offsetTop);
+        wtaFrame = null;
+    });
+}

package/es/ui/src/log.js

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