vxe-table 3.15.11 → 3.15.12

package/lib/table/src/methods.js

@@ -11212,54 +11212,44 @@ const Methods = {
    */
   scrollTo(scrollLeft, scrollTop) {
     const $xeTable = this;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
-      $refs
-    } = this;
-    const {
-      refTableBody,
-      refTableHeader,
-      leftBody,
-      rightBody,
-      refTableFooter
-    } = $refs;
-    const tableBodyElem = refTableBody ? refTableBody.$el : null;
-    const leftBodyElem = leftBody ? leftBody.$el : null;
-    const rightBodyElem = rightBody ? rightBody.$el : null;
-    const tableHeaderElem = refTableHeader ? refTableHeader.$el : null;
-    const tableFooterElem = refTableFooter ? refTableFooter.$el : null;
+      elemStore
+    } = internalData;
+    const headerScrollElem = (0, _util.getRefElem)(elemStore['main-header-scroll']);
+    const bodyScrollElem = (0, _util.getRefElem)(elemStore['main-body-scroll']);
+    const footerScrollElem = (0, _util.getRefElem)(elemStore['main-footer-scroll']);
+    const leftScrollElem = (0, _util.getRefElem)(elemStore['left-body-scroll']);
+    const rightScrollElem = (0, _util.getRefElem)(elemStore['right-body-scroll']);
+    const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
+    const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
     internalData.intoRunScroll = true;
     if (_xeUtils.default.isNumber(scrollLeft)) {
-      const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
-      if (xHandleEl) {
-        (0, _dom.setScrollLeft)(xHandleEl, scrollLeft);
-      } else {
-        (0, _dom.setScrollLeft)(tableBodyElem, scrollLeft);
-        (0, _dom.setScrollLeft)(tableHeaderElem, scrollLeft);
-        (0, _dom.setScrollLeft)(tableFooterElem, scrollLeft);
-      }
+      (0, _dom.setScrollLeft)(xHandleEl, scrollLeft);
+      (0, _dom.setScrollLeft)(bodyScrollElem, scrollLeft);
+      (0, _dom.setScrollLeft)(headerScrollElem, scrollLeft);
+      (0, _dom.setScrollLeft)(footerScrollElem, scrollLeft);
+      loadScrollXData($xeTable);
     }
     if (_xeUtils.default.isNumber(scrollTop)) {
-      const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
-      if (yHandleEl) {
-        (0, _dom.setScrollTop)(yHandleEl, scrollTop);
-      } else {
-        (0, _dom.setScrollTop)(tableBodyElem, scrollTop);
-        (0, _dom.setScrollTop)(leftBodyElem, scrollTop);
-        (0, _dom.setScrollTop)(rightBodyElem, scrollTop);
-      }
+      (0, _dom.setScrollTop)(yHandleEl, scrollTop);
+      (0, _dom.setScrollTop)(bodyScrollElem, scrollTop);
+      (0, _dom.setScrollTop)(leftScrollElem, scrollTop);
+      (0, _dom.setScrollTop)(rightScrollElem, scrollTop);
+      loadScrollYData($xeTable);
     }
-    if (this.scrollXLoad || this.scrollYLoad) {
+    if (reactData.scrollXLoad || reactData.scrollYLoad) {
       return new Promise(resolve => {
         setTimeout(() => {
           $xeTable.$nextTick(() => {
             internalData.intoRunScroll = false;
             resolve();
           });
-        });
+        }, 30);
       });
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   /**
    * 如果有滚动条，则滚动到对应的行
@@ -11268,6 +11258,7 @@ const Methods = {
    */
   scrollToRow(row, fieldOrColumn) {
     const $xeTable = this;
+    const props = $xeTable;
     const reactData = $xeTable;
     const {
       isAllOverflow,
@@ -11276,10 +11267,10 @@ const Methods = {
     } = reactData;
     const rest = [];
     if (row) {
-      if (this.treeConfig) {
-        rest.push(this.scrollToTreeRow(row));
+      if (props.treeConfig) {
+        rest.push($xeTable.scrollToTreeRow(row));
       } else {
-        rest.push((0, _util.rowToVisible)(this, row));
+        rest.push((0, _util.rowToVisible)($xeTable, row));
       }
     }
     if (fieldOrColumn) {