vxe-table 3.15.10 → 3.15.12

package/lib/table/src/methods.js

@@ -8505,10 +8505,10 @@ const Methods = {
       if (!actived.args || evnt.currentTarget !== actived.args.cell) {
         if (editOpts.mode === 'row') {
           checkValidate($xeTable, 'blur').catch(e => e).then(() => {
-            this.handleEdit(params, evnt).then(() => checkValidate($xeTable, 'change')).catch(e => e);
+            $xeTable.handleEdit(params, evnt).then(() => checkValidate($xeTable, 'change')).catch(e => e);
           });
         } else if (editOpts.mode === 'cell') {
-          this.handleEdit(params, evnt).then(() => checkValidate($xeTable, 'change')).catch(e => e);
+          $xeTable.handleEdit(params, evnt).then(() => checkValidate($xeTable, 'change')).catch(e => e);
         }
       }
     }
@@ -9505,9 +9505,7 @@ const Methods = {
   },
   sort(sortConfs, sortOrder) {
     const $xeTable = this;
-    const {
-      sortOpts
-    } = this;
+    const sortOpts = $xeTable.computeSortOpts;
     const {
       multiple,
       remote,
@@ -9527,7 +9525,7 @@ const Methods = {
     if (sortConfs.length) {
       let firstSortColumn;
       if (!multiple) {
-        clearAllSort(this);
+        clearAllSort($xeTable);
       }
       (multiple ? sortConfs : [sortConfs[0]]).forEach((confs, index) => {
         let {
@@ -9536,14 +9534,14 @@ const Methods = {
         } = confs;
         let column = field;
         if (_xeUtils.default.isString(field)) {
-          column = this.getColumnByField(field);
+          column = $xeTable.getColumnByField(field);
         }
         if (column && (column.sortable || column.remoteSort)) {
           if (!firstSortColumn) {
             firstSortColumn = column;
           }
-          if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(this, column);
+          if (orders && orders.indexOf(order) === -1) {
+            order = getNextSortOrder($xeTable, column);
           }
           if (column.order !== order) {
             column.order = order;
@@ -9553,14 +9551,15 @@ const Methods = {
       });
       // 如果是服务端排序，则跳过本地排序处理
       if (!remote || firstSortColumn && firstSortColumn.remoteSort) {
-        this.handleTableData(true);
+        $xeTable.handleTableData(true);
       }
-      return this.$nextTick().then(() => {
-        this.updateCellAreas();
+      return $xeTable.$nextTick().then(() => {
+        updateRowOffsetTop($xeTable);
+        $xeTable.updateCellAreas();
         return updateStyle($xeTable);
       });
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   setSort(sortConfs, isUpdate) {
     const $xeTable = this;
@@ -9592,7 +9591,7 @@ const Methods = {
           firstColumn = column;
         }
         if (column && column.sortable) {
-          if (orders.indexOf(order) === -1) {
+          if (orders && orders.indexOf(order) === -1) {
             order = getNextSortOrder($xeTable, column);
           }
           if (column.order !== order) {
@@ -9608,6 +9607,7 @@ const Methods = {
         $xeTable.handleColumnSortEvent(new Event('click'), firstColumn);
       }
       return $xeTable.$nextTick().then(() => {
+        updateRowOffsetTop($xeTable);
         $xeTable.updateCellAreas();
         return updateStyle($xeTable);
       });
@@ -9621,21 +9621,22 @@ const Methods = {
    */
   clearSort(fieldOrColumn) {
     const $xeTable = this;
-    const {
-      sortOpts
-    } = this;
+    const sortOpts = $xeTable.computeSortOpts;
     if (fieldOrColumn) {
-      const column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
+      const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
       if (column) {
         column.order = null;
       }
     } else {
-      clearAllSort(this);
+      clearAllSort($xeTable);
     }
     if (!sortOpts.remote) {
-      this.handleTableData(true);
+      $xeTable.handleTableData(true);
     }
-    return this.$nextTick().then(() => updateStyle($xeTable));
+    return $xeTable.$nextTick().then(() => {
+      updateRowOffsetTop($xeTable);
+      return updateStyle($xeTable);
+    });
   },
   // 在 v3 中废弃
   getSortColumn() {
@@ -11211,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();
   },
   /**
    * 如果有滚动条，则滚动到对应的行
@@ -11267,6 +11258,7 @@ const Methods = {
    */
   scrollToRow(row, fieldOrColumn) {
     const $xeTable = this;
+    const props = $xeTable;
     const reactData = $xeTable;
     const {
       isAllOverflow,
@@ -11275,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) {