vxe-table 3.10.8 → 3.10.9

package/es/table/src/methods.js

@@ -1806,80 +1806,132 @@ const Methods = {
      * 设置为固定列
      */
     setColumnFixed(fieldOrColumn, fixed) {
-        const { isMaxFixedColumn, columnOpts } = this;
-        const column = handleFieldOrColumn(this, fieldOrColumn);
-        const targetColumn = getRootColumn(this, column);
-        if (targetColumn && targetColumn.fixed !== fixed) {
-            // 是否超过最大固定列数量
-            if (!targetColumn.fixed && isMaxFixedColumn) {
-                if (VxeUI.modal) {
-                    VxeUI.modal.message({
-                        status: 'error',
-                        content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
-                    });
+        const $xeTable = this;
+        let status = false;
+        const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        const columnOpts = $xeTable.computeColumnOpts;
+        const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
+        for (let i = 0; i < cols.length; i++) {
+            const item = cols[i];
+            const column = handleFieldOrColumn($xeTable, item);
+            const targetColumn = getRootColumn($xeTable, column);
+            if (targetColumn && targetColumn.fixed !== fixed) {
+                // 是否超过最大固定列数量
+                if (!targetColumn.fixed && isMaxFixedColumn) {
+                    if (VxeUI.modal) {
+                        VxeUI.modal.message({
+                            status: 'error',
+                            content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
+                        });
+                    }
+                    return $xeTable.$nextTick();
+                }
+                XEUtils.eachTree([targetColumn], (column) => {
+                    column.fixed = fixed;
+                });
+                $xeTable.saveCustomStore('update:fixed');
+                if (!status) {
+                    status = true;
                 }
-                return this.$nextTick();
             }
-            XEUtils.eachTree([targetColumn], (column) => {
-                column.fixed = fixed;
-            });
-            this.saveCustomStore('update:fixed');
-            return this.refreshColumn();
         }
-        return this.$nextTick();
+        if (status) {
+            return $xeTable.refreshColumn();
+        }
+        return $xeTable.$nextTick();
     },
     /**
      * 取消指定固定列
      */
     clearColumnFixed(fieldOrColumn) {
-        const column = handleFieldOrColumn(this, fieldOrColumn);
-        const targetColumn = getRootColumn(this, column);
-        if (targetColumn && targetColumn.fixed) {
-            XEUtils.eachTree([targetColumn], (column) => {
-                column.fixed = null;
-            });
-            this.saveCustomStore('update:fixed');
-            return this.refreshColumn();
+        const $xeTable = this;
+        let status = false;
+        const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach(item => {
+            const column = handleFieldOrColumn($xeTable, item);
+            const targetColumn = getRootColumn($xeTable, column);
+            if (targetColumn && targetColumn.fixed) {
+                XEUtils.eachTree([targetColumn], (column) => {
+                    column.fixed = null;
+                });
+                $xeTable.saveCustomStore('update:fixed');
+                if (!status) {
+                    status = true;
+                }
+            }
+        });
+        if (status) {
+            return $xeTable.refreshColumn();
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     /**
      * 隐藏指定列
      */
     hideColumn(fieldOrColumn) {
-        const column = handleFieldOrColumn(this, fieldOrColumn);
-        if (column && column.visible) {
-            column.visible = false;
-            return this.handleCustom();
+        const $xeTable = this;
+        let status = false;
+        const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach(item => {
+            const column = handleFieldOrColumn($xeTable, item);
+            if (column && column.visible) {
+                column.visible = false;
+                if (!status) {
+                    status = true;
+                }
+            }
+        });
+        if (status) {
+            return $xeTable.handleCustom();
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     /**
      * 显示指定列
      */
     showColumn(fieldOrColumn) {
-        const column = handleFieldOrColumn(this, fieldOrColumn);
-        if (column && !column.visible) {
-            column.visible = true;
-            return this.handleCustom();
+        const $xeTable = this;
+        let status = false;
+        const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach(item => {
+            const column = handleFieldOrColumn($xeTable, item);
+            if (column && !column.visible) {
+                column.visible = true;
+                if (!status) {
+                    status = true;
+                }
+            }
+        });
+        if (status) {
+            return $xeTable.handleCustom();
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     setColumnWidth(fieldOrColumn, width) {
-        const column = handleFieldOrColumn(this, fieldOrColumn);
-        if (column) {
-            const colWidth = XEUtils.toInteger(width);
-            let rdWidth = colWidth;
-            if (isScale(width)) {
-                const { tableBody } = this.$refs;
-                const tableBodyElem = tableBody ? tableBody.$el : null;
-                const bodyWidth = tableBodyElem ? tableBodyElem.clientWidth - 1 : 0;
-                rdWidth = Math.floor(colWidth * bodyWidth);
+        const $xeTable = this;
+        let status = false;
+        const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach(item => {
+            const column = handleFieldOrColumn($xeTable, item);
+            if (column) {
+                const colWidth = XEUtils.toInteger(width);
+                let rdWidth = colWidth;
+                if (isScale(width)) {
+                    const tableBody = $xeTable.$refs.tableBody;
+                    const bodyElem = tableBody ? tableBody.$el : null;
+                    const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0;
+                    rdWidth = Math.floor(colWidth * bodyWidth);
+                }
+                column.resizeWidth = rdWidth;
+                if (!status) {
+                    status = true;
+                }
             }
-            column.resizeWidth = rdWidth;
-            return this.refreshColumn();
+        });
+        if (status) {
+            return $xeTable.refreshColumn();
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     getColumnWidth(fieldOrColumn) {
         const column = handleFieldOrColumn(this, fieldOrColumn);
@@ -5632,7 +5684,7 @@ const Methods = {
         }
         this.closeTooltip();
     },
-    handleScrollEvent(evnt, isRollY, isRollX, params) {
+    handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
         const $xeTable = this;
         const props = $xeTable;
         const { highlightHoverRow } = props;
@@ -5657,10 +5709,32 @@ const Methods = {
         const bodyWidth = bodyElem ? bodyElem.clientWidth : 0;
         const scrollHeight = bodyElem ? bodyElem.scrollHeight : 0;
         const scrollWidth = bodyElem ? bodyElem.scrollWidth : 0;
-        const evntParams = Object.assign({ bodyHeight,
+        let isTop = false;
+        let isBottom = false;
+        let isLeft = false;
+        let isRight = false;
+        if (isRollX) {
+            isLeft = scrollLeft <= 0;
+            if (!isTop) {
+                isRight = scrollLeft + bodyWidth >= scrollWidth;
+            }
+            $xeTable.checkScrolling();
+        }
+        else {
+            isTop = scrollTop <= 0;
+            if (!isTop) {
+                isBottom = scrollTop + bodyHeight >= scrollHeight;
+            }
+        }
+        const evntParams = Object.assign({ scrollTop,
+            scrollLeft,
+            bodyHeight,
             bodyWidth,
             scrollHeight,
-            scrollWidth, isX: isRollX, isY: isRollY }, params);
+            scrollWidth, isX: isRollX, isY: isRollY, isTop,
+            isBottom,
+            isLeft,
+            isRight }, params);
         $xeTable.dispatchEvent('scroll', evntParams, evnt);
     },
     /**
@@ -5705,11 +5779,9 @@ const Methods = {
         $xeTable.lastScrollTime = Date.now();
         $xeTable.handleSyncScrollX(scrollLeft);
         $xeTable.triggerScrollXEvent(evnt);
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
             type: 'table',
-            fixed: '',
-            scrollTop,
-            scrollLeft
+            fixed: ''
         });
     },
     debounceScrollYCalculate: XEUtils.debounce(function () {
@@ -5739,11 +5811,9 @@ const Methods = {
         $xeTable.lastScrollTime = Date.now();
         $xeTable.handleSyncScrollY(scrollTop);
         $xeTable.triggerScrollYEvent(evnt);
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
             type: 'table',
-            fixed: '',
-            scrollTop,
-            scrollLeft
+            fixed: ''
         });
     },
     /**
@@ -5939,16 +6009,35 @@ const Methods = {
      * @param {Number} scrollTop 上距离
      */
     scrollTo(scrollLeft, scrollTop) {
+        const $xeTable = this;
         const { $refs } = this;
-        const { tableBody, rightBody, tableFooter } = $refs;
+        const { tableBody, tableHeader, leftBody, rightBody, tableFooter } = $refs;
         const tableBodyElem = tableBody ? tableBody.$el : null;
+        const leftBodyElem = leftBody ? leftBody.$el : null;
         const rightBodyElem = rightBody ? rightBody.$el : null;
+        const tableHeaderElem = tableHeader ? tableHeader.$el : null;
         const tableFooterElem = tableFooter ? tableFooter.$el : null;
         if (XEUtils.isNumber(scrollLeft)) {
-            setScrollLeft(tableFooterElem || tableBodyElem, scrollLeft);
+            const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
+            if (xHandleEl) {
+                setScrollLeft(xHandleEl, scrollLeft);
+            }
+            else {
+                setScrollLeft(tableBodyElem, scrollLeft);
+                setScrollLeft(tableHeaderElem, scrollLeft);
+                setScrollLeft(tableFooterElem, scrollLeft);
+            }
         }
         if (XEUtils.isNumber(scrollTop)) {
-            setScrollTop(rightBodyElem || tableBodyElem, scrollTop);
+            const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
+            if (yHandleEl) {
+                setScrollTop(yHandleEl, scrollTop);
+            }
+            else {
+                setScrollTop(tableBodyElem, scrollTop);
+                setScrollTop(leftBodyElem, scrollTop);
+                setScrollTop(rightBodyElem, scrollTop);
+            }
         }
         if (this.scrollXLoad || this.scrollYLoad) {
             return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 50));

package/es/ui/index.js

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

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.10.8";
+const version = "3.10.9";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2769,7 +2769,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.10.8"}`;
+const log_version = `table v${"3.10.9"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6947,85 +6947,132 @@ const Methods = {
    * 设置为固定列
    */
   setColumnFixed(fieldOrColumn, fixed) {
-    const {
-      isMaxFixedColumn,
-      columnOpts
-    } = this;
-    const column = handleFieldOrColumn(this, fieldOrColumn);
-    const targetColumn = getRootColumn(this, column);
-    if (targetColumn && targetColumn.fixed !== fixed) {
-      // 是否超过最大固定列数量
-      if (!targetColumn.fixed && isMaxFixedColumn) {
-        if (core_.VxeUI.modal) {
-          core_.VxeUI.modal.message({
-            status: 'error',
-            content: methods_getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
-          });
+    const $xeTable = this;
+    let status = false;
+    const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+    const columnOpts = $xeTable.computeColumnOpts;
+    const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn;
+    for (let i = 0; i < cols.length; i++) {
+      const item = cols[i];
+      const column = handleFieldOrColumn($xeTable, item);
+      const targetColumn = getRootColumn($xeTable, column);
+      if (targetColumn && targetColumn.fixed !== fixed) {
+        // 是否超过最大固定列数量
+        if (!targetColumn.fixed && isMaxFixedColumn) {
+          if (core_.VxeUI.modal) {
+            core_.VxeUI.modal.message({
+              status: 'error',
+              content: methods_getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
+            });
+          }
+          return $xeTable.$nextTick();
+        }
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
+          column.fixed = fixed;
+        });
+        $xeTable.saveCustomStore('update:fixed');
+        if (!status) {
+          status = true;
         }
-        return this.$nextTick();
       }
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
-        column.fixed = fixed;
-      });
-      this.saveCustomStore('update:fixed');
-      return this.refreshColumn();
     }
-    return this.$nextTick();
+    if (status) {
+      return $xeTable.refreshColumn();
+    }
+    return $xeTable.$nextTick();
   },
   /**
    * 取消指定固定列
    */
   clearColumnFixed(fieldOrColumn) {
-    const column = handleFieldOrColumn(this, fieldOrColumn);
-    const targetColumn = getRootColumn(this, column);
-    if (targetColumn && targetColumn.fixed) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
-        column.fixed = null;
-      });
-      this.saveCustomStore('update:fixed');
-      return this.refreshColumn();
+    const $xeTable = this;
+    let status = false;
+    const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+    cols.forEach(item => {
+      const column = handleFieldOrColumn($xeTable, item);
+      const targetColumn = getRootColumn($xeTable, column);
+      if (targetColumn && targetColumn.fixed) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
+          column.fixed = null;
+        });
+        $xeTable.saveCustomStore('update:fixed');
+        if (!status) {
+          status = true;
+        }
+      }
+    });
+    if (status) {
+      return $xeTable.refreshColumn();
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   /**
    * 隐藏指定列
    */
   hideColumn(fieldOrColumn) {
-    const column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column && column.visible) {
-      column.visible = false;
-      return this.handleCustom();
+    const $xeTable = this;
+    let status = false;
+    const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+    cols.forEach(item => {
+      const column = handleFieldOrColumn($xeTable, item);
+      if (column && column.visible) {
+        column.visible = false;
+        if (!status) {
+          status = true;
+        }
+      }
+    });
+    if (status) {
+      return $xeTable.handleCustom();
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   /**
    * 显示指定列
    */
   showColumn(fieldOrColumn) {
-    const column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column && !column.visible) {
-      column.visible = true;
-      return this.handleCustom();
+    const $xeTable = this;
+    let status = false;
+    const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+    cols.forEach(item => {
+      const column = handleFieldOrColumn($xeTable, item);
+      if (column && !column.visible) {
+        column.visible = true;
+        if (!status) {
+          status = true;
+        }
+      }
+    });
+    if (status) {
+      return $xeTable.handleCustom();
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   setColumnWidth(fieldOrColumn, width) {
-    const column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column) {
-      const colWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(width);
-      let rdWidth = colWidth;
-      if (isScale(width)) {
-        const {
-          tableBody
-        } = this.$refs;
-        const tableBodyElem = tableBody ? tableBody.$el : null;
-        const bodyWidth = tableBodyElem ? tableBodyElem.clientWidth - 1 : 0;
-        rdWidth = Math.floor(colWidth * bodyWidth);
+    const $xeTable = this;
+    let status = false;
+    const cols = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+    cols.forEach(item => {
+      const column = handleFieldOrColumn($xeTable, item);
+      if (column) {
+        const colWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(width);
+        let rdWidth = colWidth;
+        if (isScale(width)) {
+          const tableBody = $xeTable.$refs.tableBody;
+          const bodyElem = tableBody ? tableBody.$el : null;
+          const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0;
+          rdWidth = Math.floor(colWidth * bodyWidth);
+        }
+        column.resizeWidth = rdWidth;
+        if (!status) {
+          status = true;
+        }
       }
-      column.resizeWidth = rdWidth;
-      return this.refreshColumn();
+    });
+    if (status) {
+      return $xeTable.refreshColumn();
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   getColumnWidth(fieldOrColumn) {
     const column = handleFieldOrColumn(this, fieldOrColumn);
@@ -11507,7 +11554,7 @@ const Methods = {
     }
     this.closeTooltip();
   },
-  handleScrollEvent(evnt, isRollY, isRollX, params) {
+  handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
     const $xeTable = this;
     const props = $xeTable;
     const {
@@ -11534,13 +11581,35 @@ const Methods = {
     const bodyWidth = bodyElem ? bodyElem.clientWidth : 0;
     const scrollHeight = bodyElem ? bodyElem.scrollHeight : 0;
     const scrollWidth = bodyElem ? bodyElem.scrollWidth : 0;
+    let isTop = false;
+    let isBottom = false;
+    let isLeft = false;
+    let isRight = false;
+    if (isRollX) {
+      isLeft = scrollLeft <= 0;
+      if (!isTop) {
+        isRight = scrollLeft + bodyWidth >= scrollWidth;
+      }
+      $xeTable.checkScrolling();
+    } else {
+      isTop = scrollTop <= 0;
+      if (!isTop) {
+        isBottom = scrollTop + bodyHeight >= scrollHeight;
+      }
+    }
     const evntParams = {
+      scrollTop,
+      scrollLeft,
       bodyHeight,
       bodyWidth,
       scrollHeight,
       scrollWidth,
       isX: isRollX,
       isY: isRollY,
+      isTop,
+      isBottom,
+      isLeft,
+      isRight,
       ...params
     };
     $xeTable.dispatchEvent('scroll', evntParams, evnt);
@@ -11598,11 +11667,9 @@ const Methods = {
     $xeTable.lastScrollTime = Date.now();
     $xeTable.handleSyncScrollX(scrollLeft);
     $xeTable.triggerScrollXEvent(evnt);
-    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
       type: 'table',
-      fixed: '',
-      scrollTop,
-      scrollLeft
+      fixed: ''
     });
   },
   debounceScrollYCalculate: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().debounce(function () {
@@ -11638,11 +11705,9 @@ const Methods = {
     $xeTable.lastScrollTime = Date.now();
     $xeTable.handleSyncScrollY(scrollTop);
     $xeTable.triggerScrollYEvent(evnt);
-    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
       type: 'table',
-      fixed: '',
-      scrollTop,
-      scrollLeft
+      fixed: ''
     });
   },
   /**
@@ -11889,22 +11954,41 @@ const Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo(scrollLeft, scrollTop) {
+    const $xeTable = this;
     const {
       $refs
     } = this;
     const {
       tableBody,
+      tableHeader,
+      leftBody,
       rightBody,
       tableFooter
     } = $refs;
     const tableBodyElem = tableBody ? tableBody.$el : null;
+    const leftBodyElem = leftBody ? leftBody.$el : null;
     const rightBodyElem = rightBody ? rightBody.$el : null;
+    const tableHeaderElem = tableHeader ? tableHeader.$el : null;
     const tableFooterElem = tableFooter ? tableFooter.$el : null;
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
-      setScrollLeft(tableFooterElem || tableBodyElem, scrollLeft);
+      const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
+      if (xHandleEl) {
+        setScrollLeft(xHandleEl, scrollLeft);
+      } else {
+        setScrollLeft(tableBodyElem, scrollLeft);
+        setScrollLeft(tableHeaderElem, scrollLeft);
+        setScrollLeft(tableFooterElem, scrollLeft);
+      }
     }
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollTop)) {
-      setScrollTop(rightBodyElem || tableBodyElem, scrollTop);
+      const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
+      if (yHandleEl) {
+        setScrollTop(yHandleEl, scrollTop);
+      } else {
+        setScrollTop(tableBodyElem, scrollTop);
+        setScrollTop(leftBodyElem, scrollTop);
+        setScrollTop(rightBodyElem, scrollTop);
+      }
     }
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 50));
@@ -13046,11 +13130,9 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
           setScrollTop(leftElem, scrollTop);
           setScrollTop(rightElem, scrollTop);
         }
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: renderType,
-          fixed: fixedType,
-          scrollTop,
-          scrollLeft
+          fixed: fixedType
         });
       }
       if (xHandleEl) {
@@ -13060,11 +13142,9 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         $xeTable.lastScrollLeft = scrollLeft;
         setScrollLeft(headerElem, scrollLeft);
         setScrollLeft(footerElem, scrollLeft);
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: renderType,
-          fixed: fixedType,
-          scrollTop,
-          scrollLeft
+          fixed: fixedType
         });
       }
     },
@@ -13918,11 +13998,9 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         $xeTable.lastScrollTime = Date.now();
         setScrollLeft(headerElem, scrollLeft);
         setScrollLeft(bodyElem, scrollLeft);
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: footer_renderType,
-          fixed: fixedType,
-          scrollTop,
-          scrollLeft
+          fixed: fixedType
         });
       }
     }