vxe-table 3.20.6 → 3.20.8

package/es/table/src/methods.js

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils';
-import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, scrollTopTo, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement } from '../../ui/src/dom';
+import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, wheelScrollLeftTo, wheelScrollTopTo, 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 Cell from './cell';
@@ -1838,32 +1838,46 @@ function handleVirtualYVisible($xeTable) {
     }
     return { toVisibleIndex: 0, visibleSize: 6 };
 }
-function 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;
+function 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
@@ -1876,7 +1890,7 @@ function buildMergeData(mergeConfigs) {
             }
         }
     }
-    return mergeMaps;
+    return { mergeMaps, mergeRowMaps, mergeColMaps };
 }
 function handleBodyMerge($xeTable, merges) {
     const internalData = $xeTable;
@@ -3510,7 +3524,7 @@ function loadScrollXData($xeTable) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { isScrollXBig } = reactData;
-    const { mergeBodyList, mergeFooterList, scrollXStore } = internalData;
+    const { mergeBodyList, mergeFooterList, mergeBodyColMaps, scrollXStore } = internalData;
     const { preloadSize, startIndex, endIndex, offsetSize } = scrollXStore;
     const { toVisibleIndex, visibleSize } = handleVirtualXVisible($xeTable);
     const offsetItem = {
@@ -3519,7 +3533,7 @@ function loadScrollXData($xeTable) {
     };
     scrollXStore.visibleStartIndex = toVisibleIndex - 1;
     scrollXStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-    calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), offsetItem, 'col');
+    calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), mergeBodyColMaps, offsetItem, 'col');
     const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
     if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
         if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
@@ -3741,7 +3755,7 @@ function loadScrollYData($xeTable) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { isAllOverflow, isScrollYBig } = reactData;
-    const { mergeBodyList, scrollYStore } = internalData;
+    const { mergeBodyList, mergeBodyRowMaps, scrollYStore } = internalData;
     const { preloadSize, startIndex, endIndex, offsetSize } = scrollYStore;
     const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
     const { toVisibleIndex, visibleSize } = handleVirtualYVisible($xeTable);
@@ -3751,7 +3765,7 @@ function loadScrollYData($xeTable) {
     };
     scrollYStore.visibleStartIndex = toVisibleIndex - 1;
     scrollYStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-    calculateMergerOffsetIndex(mergeBodyList, offsetItem, 'row');
+    calculateMergerOffsetIndex(mergeBodyList, mergeBodyRowMaps, offsetItem, 'row');
     const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
     if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
         if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
@@ -3909,11 +3923,6 @@ const getWheelSpeed = (lastScrollTime) => {
     }
     return multiple;
 };
-const wheelScrollLeftTo = (scrollLeft, cb) => {
-    requestAnimationFrame(() => {
-        cb(scrollLeft);
-    });
-};
 const syncGanttScrollTop = ($xeTable, scrollTop) => {
     const internalData = $xeTable;
     const $xeGanttView = internalData.xeGanttView;
@@ -4383,6 +4392,13 @@ const tableMethods = {
             updateAfterFullData($xeTable);
             // 如果为虚拟树，将树结构拍平
             fullList = handleVirtualTreeToList($xeTable);
+            // 更新数据后清除合并缓存，涉及分组、筛选、排序等
+            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 = {};
@@ -7382,6 +7398,17 @@ const tableMethods = {
         handleResizeEvent($xeTable);
         $xeTable.updateCellAreas();
     },
+    handleUpdateHeaderMerge() {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { mergeHeaderList } = internalData;
+        const { mergeMaps, mergeRowMaps, mergeColMaps } = buildMergeData(mergeHeaderList);
+        internalData.mergeHeaderCellMaps = mergeMaps;
+        internalData.mergeHeaderRowMaps = mergeRowMaps;
+        internalData.mergeHeaderColMaps = mergeColMaps;
+        reactData.mergeHeadFlag++;
+    },
     /**
      * 处理合并
      */
@@ -7390,23 +7417,21 @@ const tableMethods = {
         const reactData = $xeTable;
         const internalData = $xeTable;
         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 $xeTable = this;
-        const reactData = $xeTable;
-        const internalData = $xeTable;
-        const { mergeHeaderList } = internalData;
-        internalData.mergeHeaderCellMaps = buildMergeData(mergeHeaderList);
-        reactData.mergeHeadFlag++;
-    },
     handleUpdateFooterMerge() {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
         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() {
@@ -11540,8 +11565,8 @@ const tableMethods = {
         if (isRollX) {
             evnt.preventDefault();
             internalData.inWheelScroll = true;
-            if (browseObj.firefox || browseObj.safari) {
-                const currLeftNum = scrollLeft;
+            wheelScrollLeftTo(scrollLeft, (offsetLeft) => {
+                const currLeftNum = offsetLeft;
                 setScrollLeft(xHandleEl, currLeftNum);
                 setScrollLeft(bodyScrollElem, currLeftNum);
                 setScrollLeft(headerScrollElem, currLeftNum);
@@ -11553,28 +11578,13 @@ const tableMethods = {
                     type: 'table',
                     fixed: ''
                 });
-            }
-            else {
-                wheelScrollLeftTo(scrollLeft, (offsetLeft) => {
-                    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();
-            if (browseObj.firefox || browseObj.safari) {
-                const currTopNum = scrollTop;
+            wheelScrollTopTo(scrollTop, (offsetTop) => {
+                const currTopNum = offsetTop;
+                internalData.inWheelScroll = true;
                 setScrollTop(yHandleEl, currTopNum);
                 setScrollTop(bodyScrollElem, currTopNum);
                 setScrollTop(leftScrollElem, currTopNum);
@@ -11588,26 +11598,7 @@ const tableMethods = {
                     type: 'table',
                     fixed: ''
                 });
-            }
-            else {
-                scrollTopTo(scrollTop - currScrollTop, (offsetTop) => {
-                    const currTopNum = bodyScrollElem.scrollTop + offsetTop;
-                    internalData.inWheelScroll = true;
-                    setScrollTop(yHandleEl, currTopNum);
-                    setScrollTop(bodyScrollElem, currTopNum);
-                    setScrollTop(leftScrollElem, currTopNum);
-                    setScrollTop(rightScrollElem, currTopNum);
-                    setScrollTop(rowExpandEl, currTopNum);
-                    syncGanttScrollTop($xeTable, currTopNum);
-                    if (scrollYLoad) {
-                        $xeTable.triggerScrollYEvent(evnt);
-                    }
-                    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, bodyScrollElem.scrollLeft, {
-                        type: 'table',
-                        fixed: ''
-                    });
-                });
-            }
+            });
         }
     },
     triggerVirtualScrollXEvent(evnt) {
@@ -12261,6 +12252,8 @@ const tableMethods = {
         internalData.mergeBodyList = [];
         internalData.mergeBodyMaps = {};
         internalData.mergeBodyCellMaps = {};
+        internalData.mergeBodyRowMaps = {};
+        internalData.mergeBodyColMaps = {};
         reactData.mergeBodyFlag++;
         return $xeTable.$nextTick().then(() => {
             return updateStyle($xeTable);
@@ -12304,6 +12297,8 @@ const tableMethods = {
         internalData.mergeHeaderList = [];
         internalData.mergeHeaderMaps = {};
         internalData.mergeHeaderCellMaps = {};
+        internalData.mergeHeaderRowMaps = {};
+        internalData.mergeBodyColMaps = {};
         reactData.mergeHeadFlag++;
         return $xeTable.$nextTick().then(() => {
             return updateStyle($xeTable);
@@ -12367,6 +12362,8 @@ const tableMethods = {
         internalData.mergeFooterList = [];
         internalData.mergeFooterMaps = {};
         internalData.mergeFooterCellMaps = {};
+        internalData.mergeFooterRowMaps = {};
+        internalData.mergeFooterColMaps = {};
         reactData.mergeFootFlag++;
         return $xeTable.$nextTick().then(() => {
             return updateStyle($xeTable);

package/es/table/src/table.js

@@ -29,6 +29,8 @@ function handleUpdateMergeBodyCells($xeTable, merges) {
     internalData.mergeBodyList = [];
     internalData.mergeBodyMaps = {};
     internalData.mergeBodyCellMaps = {};
+    internalData.mergeBodyRowMaps = {};
+    internalData.mergeBodyColMaps = {};
     $xeTable.setMergeCells(merges);
 }
 function handleUpdateMergeHeaderCells($xeTable, merges) {
@@ -36,6 +38,8 @@ function handleUpdateMergeHeaderCells($xeTable, merges) {
     internalData.mergeHeaderList = [];
     internalData.mergeHeaderMaps = {};
     internalData.mergeHeaderCellMaps = {};
+    internalData.mergeHeaderRowMaps = {};
+    internalData.mergeBodyColMaps = {};
     $xeTable.setMergeHeaderCells(merges);
 }
 function handleUpdateMergeFooterCells($xeTable, merges) {
@@ -43,6 +47,8 @@ function handleUpdateMergeFooterCells($xeTable, merges) {
     internalData.mergeFooterList = [];
     internalData.mergeFooterMaps = {};
     internalData.mergeFooterCellMaps = {};
+    internalData.mergeFooterRowMaps = {};
+    internalData.mergeFooterColMaps = {};
     $xeTable.setMergeFooterCells(merges);
 }
 function handleKeyField($xeTable) {
@@ -57,7 +63,7 @@ function updateColumnAllOverflow($xeTable) {
     const internalData = $xeTable;
     const { showOverflow } = props;
     const { isGroup } = reactData;
-    const { tableFullColumn, collectColumn } = internalData;
+    const { fullAllDataRowIdData, tableFullColumn, collectColumn } = internalData;
     let isAllOverflow = !!showOverflow;
     const handleFunc = (column) => {
         if (isAllOverflow && column.showOverflow === false) {
@@ -70,6 +76,9 @@ function updateColumnAllOverflow($xeTable) {
     else {
         tableFullColumn.forEach(handleFunc);
     }
+    XEUtils.each(fullAllDataRowIdData, (rowRest) => {
+        rowRest.height = 0;
+    });
     reactData.isAllOverflow = isAllOverflow;
 }
 /**
@@ -1013,7 +1022,10 @@ export default {
                 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;
                     }
                 }

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 = "3.20.6";
+export const version = "3.20.8";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/dom.js

@@ -184,25 +184,24 @@ export function triggerEvent(targetElem, type) {
 export function isNodeElement(elem) {
     return elem && elem.nodeType === 1;
 }
-export function scrollTopTo(diffNum, cb) {
-    const duration = Math.abs(diffNum);
-    const startTime = performance.now();
-    let countTop = 0;
-    const step = (timestamp) => {
-        let progress = (timestamp - startTime) / duration;
-        if (progress < 0) {
-            progress = 0;
-        }
-        else if (progress > 1) {
-            progress = 1;
-        }
-        const easedProgress = Math.pow(progress, 2);
-        const offsetTop = Math.floor((diffNum * easedProgress)) - countTop;
-        countTop += offsetTop;
+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);
-        if (progress < 1) {
-            requestAnimationFrame(step);
-        }
-    };
-    requestAnimationFrame(step);
+        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${"3.20.6"}`;
+const version = `table v${"3.20.8"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);