vxe-table 3.12.0-beta.7 → 3.12.0-beta.8

package/lib/table/src/methods.js

@@ -86,14 +86,12 @@ function handleReserveRow(_vm, reserveRowMap) {
   });
   return reserveList;
 }
-function handleVirtualXVisible(_vm) {
+function handleVirtualXVisible($xeTable) {
+  const internalData = $xeTable;
   const {
-    $refs,
     visibleColumn
-  } = _vm;
-  const {
-    tableBody
-  } = $refs;
+  } = internalData;
+  const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   if (tableBodyElem) {
     const {
@@ -135,8 +133,8 @@ const computeRowHeight = $xeTable => {
   const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   const vSize = $xeTable.computeSize;
-  const rowHeightMaps = $xeTable.rowHeightMaps;
-  let rowHeight = 0;
+  const rowHeightMaps = $xeTable.computeRowHeightMaps;
+  let rowHeight = 24;
   if (showOverflow) {
     if (tableBodyElem) {
       const tableHeaderElem = tableHeader ? tableHeader.$el : null;
@@ -156,13 +154,13 @@ const computeRowHeight = $xeTable => {
   return rowHeight;
 };
 function handleVirtualYVisible($xeTable) {
+  const internalData = $xeTable;
   const {
-    $refs,
     scrollYStore,
     afterFullData,
     fullAllDataRowIdData
-  } = $xeTable;
-  const tableBody = $refs.tableBody;
+  } = internalData;
+  const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   const {
     rowHeight
@@ -179,11 +177,11 @@ function handleVirtualYVisible($xeTable) {
     for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
       const row = afterFullData[rIndex];
       const rowid = (0, _util.getRowid)($xeTable, row);
-      const rest = fullAllDataRowIdData[rowid];
-      if (!rest) {
+      const rowRest = fullAllDataRowIdData[rowid];
+      if (!rowRest) {
         break;
       }
-      offsetTop += rest.height || rowHeight;
+      offsetTop += rowRest.height || rowHeight;
       if (toVisibleIndex === -1 && scrollTop < offsetTop) {
         toVisibleIndex = rIndex;
       }
@@ -870,7 +868,6 @@ const Methods = {
     editStore.removeList = [];
     editStore.removeMaps = {};
     const sYLoad = this.updateScrollYStatus(fullData);
-    this.scrollYLoad = sYLoad;
     this.isDragRowMove = false;
     // 全量数据
     this.tableFullData = fullData;
@@ -8091,15 +8088,18 @@ const Methods = {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
+      intoRunScroll,
       inFooterScroll,
       inBodyScroll,
       lastScrollTop
     } = internalData;
-    if (inFooterScroll) {
-      return;
-    }
-    if (inBodyScroll) {
-      return;
+    if (!intoRunScroll) {
+      if (inFooterScroll) {
+        return;
+      }
+      if (inBodyScroll) {
+        return;
+      }
     }
     const tableHeader = $xeTable.$refs.tableHeader;
     const tableBody = $xeTable.$refs.tableBody;
@@ -8133,15 +8133,18 @@ const Methods = {
     const $xeTable = this;
     const internalData = $xeTable;
     const {
+      intoRunScroll,
       inFooterScroll,
       inBodyScroll,
       lastScrollLeft
     } = internalData;
-    if (inFooterScroll) {
-      return;
-    }
-    if (inBodyScroll) {
-      return;
+    if (!intoRunScroll) {
+      if (inFooterScroll) {
+        return;
+      }
+      if (inBodyScroll) {
+        return;
+      }
     }
     const tableBody = $xeTable.$refs.tableBody;
     const leftBody = $xeTable.$refs.leftBody;
@@ -8293,7 +8296,6 @@ const Methods = {
     const {
       showOverflow
     } = props;
-    // this.tableColumn = []
     return $xeTable.$nextTick().then(() => {
       $xeTable.handleTableColumn();
       calcCellHeight($xeTable);
@@ -8359,7 +8361,6 @@ const Methods = {
   },
   updateScrollYData() {
     const $xeTable = this;
-    // this.tableData = []
     return $xeTable.$nextTick().then(() => {
       $xeTable.handleTableData();
       calcCellHeight($xeTable);
@@ -8437,6 +8438,7 @@ const Methods = {
    */
   scrollTo(scrollLeft, scrollTop) {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
       $refs
     } = this;
@@ -8452,6 +8454,7 @@ const Methods = {
     const rightBodyElem = rightBody ? rightBody.$el : null;
     const tableHeaderElem = tableHeader ? tableHeader.$el : null;
     const tableFooterElem = tableFooter ? tableFooter.$el : null;
+    internalData.intoRunScroll = true;
     if (_xeUtils.default.isNumber(scrollLeft)) {
       const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
       if (xHandleEl) {
@@ -8473,7 +8476,14 @@ const Methods = {
       }
     }
     if (this.scrollXLoad || this.scrollYLoad) {
-      return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 30));
+      return new Promise(resolve => {
+        setTimeout(() => {
+          $xeTable.$nextTick(() => {
+            internalData.intoRunScroll = false;
+            resolve();
+          });
+        });
+      });
     }
     return this.$nextTick();
   },
@@ -8538,20 +8548,18 @@ const Methods = {
    */
   clearScroll() {
     const $xeTable = this;
+    const internalData = $xeTable;
     const {
-      $refs,
       scrollXStore,
       scrollYStore
-    } = $xeTable;
-    const {
-      tableBody,
-      tableHeader,
-      leftBody,
-      rightBody,
-      tableFooter
-    } = $refs;
-    const tableBodyElem = tableBody ? tableBody.$el : null;
+    } = internalData;
+    const tableBody = $xeTable.$refs.tableBody;
+    const tableHeader = $xeTable.$refs.tableHeader;
+    const tableFooter = $xeTable.$refs.tableFooter;
+    const leftBody = $xeTable.$refs.leftBody;
+    const rightBody = $xeTable.$refs.rightBody;
     const leftBodyElem = leftBody ? leftBody.$el : null;
+    const tableBodyElem = tableBody ? tableBody.$el : null;
     const rightBodyElem = rightBody ? rightBody.$el : null;
     const tableHeaderElem = tableHeader ? tableHeader.$el : null;
     const tableFooterElem = tableFooter ? tableFooter.$el : null;