vxe-table 3.25.0-beta.5 → 3.25.0-beta.7

package/es/table/src/methods.js

@@ -4072,8 +4072,14 @@ function handleSyncScroll($xeTable, isRollX, isRollY) {
     internalData.inHeaderScroll = false;
     internalData.inBodyScroll = false;
     internalData.inFooterScroll = false;
+    internalData.isSyncGanttScrollTop = false;
     reactData.lazScrollLoading = false;
     internalData.scrollRenderType = '';
+    const $xeGanttView = internalData.xeGanttView;
+    if ($xeGanttView) {
+        const ganttInternalData = $xeGanttView.internalData;
+        ganttInternalData.isSyncTableScrollTop = false;
+    }
     let xRest = null;
     let yRest = null;
     if (!isAllOverflow) {
@@ -4152,14 +4158,15 @@ const getWheelSpeed = (lastScrollTime) => {
 };
 const syncGanttScrollTop = ($xeTable, scrollTop) => {
     const internalData = $xeTable;
+    const { isSyncGanttScrollTop } = internalData;
+    if (isSyncGanttScrollTop) {
+        return;
+    }
     const $xeGanttView = internalData.xeGanttView;
     if ($xeGanttView) {
         const ganttInternalData = $xeGanttView.internalData;
-        const { elemStore: ganttElemStore } = ganttInternalData;
-        const ganttBodyScrollElem = getRefElem(ganttElemStore['main-body-scroll']);
-        if (ganttBodyScrollElem) {
-            ganttBodyScrollElem.scrollTop = scrollTop;
-        }
+        ganttInternalData.isSyncTableScrollTop = true;
+        $xeGanttView.handleSyncScrollTop({ scrollTop });
     }
 };
 function updateHeight($xeTable) {
@@ -12349,7 +12356,10 @@ const tableMethods = {
             isLeft,
             isRight,
             direction }, params);
-        $xeTable.updateThumbOffset();
+        const isVScrollbar = $xeTable.computeIsVScrollbar;
+        if (isVScrollbar) {
+            $xeTable.updateThumbOffset();
+        }
         updateRowExpandStyle($xeTable);
         checkLastSyncScroll($xeTable, isRollX, isRollY);
         if (isRollX) {
@@ -12882,6 +12892,16 @@ const tableMethods = {
             $xeTable.updateScrollYSpace();
         });
     },
+    handleSyncScrollTop(params) {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { scrollTop } = params;
+        const { elemStore } = internalData;
+        const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
+        if (bodyScrollElem) {
+            bodyScrollElem.scrollTop = scrollTop;
+        }
+    },
     // 更新纵向 Y 可视渲染上下剩余空间大小
     updateScrollYSpace() {
         const $xeTable = this;

package/es/table/src/util.js

@@ -154,9 +154,34 @@ export function createInternalData() {
         tooltipTimeout: null,
         initStatus: false,
         isActivated: false,
+        // keyCtxTimeout: undefined,
+        // 刷新布局
         // rceTimeout: undefined,
         // rceRunTime: undefined,
         rceDelay: 0
+        // rsePending: false,
+        // 滚动属性
+        // intoRunScroll: false,
+        // inVirtualScroll: false,
+        // inWheelScroll: false,
+        // inHeaderScroll: false,
+        // inBodyScroll: false,
+        // inFooterScroll: false,
+        // scrollRenderType?: '',
+        // isSyncGanttScrollTop: false,
+        // 同步滚动
+        // lcsTimeout: undefined,
+        // lcsRunTime: undefined,
+        // 横向虚拟
+        // lxRunTime: undefined,
+        // lxTimeout: undefined,
+        // 纵向虚拟
+        // lyRunTime: undefined,
+        // lyTimeout: undefined,
+        // 动态高度
+        // chRunTime: undefined,
+        // chTimeout: undefined,
+        // isResizeCellHeight: false,
         // _sToTime: null
     };
 }

package/es/table/style.css

@@ -4073,4 +4073,7 @@ div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
 }
 .vxe-table--layout-wrapper > .vxe-scrollbar {
   position: unset;
+}
+.vxe-table--layout-wrapper > .vxe-scrollbar > .vxe-scrollbar--track-x, .vxe-table--layout-wrapper > .vxe-scrollbar > .vxe-scrollbar--track-y {
+  z-index: 7;
 }