vxe-table 3.12.2 → 3.12.3

package/lib/table/src/methods.js

@@ -260,6 +260,66 @@ function cacheColumnMap($xeTable) {
   reactData.expandColumn = expandColumn;
   reactData.isAllOverflow = isAllOverflow;
 }
+const updateScrollYStatus = ($xeTable, fullData) => {
+  const props = $xeTable;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    treeConfig
+  } = props;
+  const sYOpts = $xeTable.computeSYOpts;
+  const treeOpts = $xeTable.computeTreeOpts;
+  const {
+    transform
+  } = treeOpts;
+  const allList = fullData || internalData.tableFullData;
+  // 如果gt为0，则总是启用
+  const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt < allList.length);
+  reactData.scrollYLoad = scrollYLoad;
+  return scrollYLoad;
+};
+/**
+ * 如果为虚拟树，将树结构拍平
+ * @returns
+ */
+function handleVirtualTreeToList($xeTable) {
+  const props = $xeTable;
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    treeConfig
+  } = props;
+  const {
+    treeExpandedMaps
+  } = reactData;
+  const {
+    fullAllDataRowIdData
+  } = internalData;
+  const treeOpts = $xeTable.computeTreeOpts;
+  const childrenField = treeOpts.children || treeOpts.childrenField;
+  if (treeConfig && treeOpts.transform) {
+    const fullData = [];
+    const expandMaps = {};
+    _xeUtils.default.eachTree(internalData.afterTreeFullData, (row, index, items, path, parentRow) => {
+      const rowid = (0, _util.getRowid)($xeTable, row);
+      const parentRowid = (0, _util.getRowid)($xeTable, parentRow);
+      if (!parentRow || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          rowRest._index = fullData.length;
+        }
+        expandMaps[rowid] = 1;
+        fullData.push(row);
+      }
+    }, {
+      children: childrenField
+    });
+    internalData.afterFullData = fullData;
+    updateScrollYStatus($xeTable, fullData);
+    return fullData;
+  }
+  return internalData.afterFullData;
+}
 function computeRowHeight($xeTable) {
   const tableHeader = $xeTable.$refs.tableHeader;
   const tableBody = $xeTable.$refs.tableBody;
@@ -1277,6 +1337,7 @@ const Methods = {
     });
   },
   handleTableData(force) {
+    const $xeTable = this;
     const {
       scrollYLoad,
       scrollYStore,
@@ -1289,7 +1350,7 @@ const Methods = {
       // 更新数据，处理筛选和排序
       this.updateAfterFullData();
       // 如果为虚拟树，将树结构拍平
-      fullList = this.handleVirtualTreeToList();
+      fullList = handleVirtualTreeToList($xeTable);
     }
     const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
     tableData.forEach((row, $index) => {
@@ -1302,21 +1363,6 @@ const Methods = {
     this.tableData = tableData;
     return this.$nextTick();
   },
-  updateScrollYStatus(fullData) {
-    const {
-      treeConfig,
-      treeOpts,
-      sYOpts
-    } = this;
-    const {
-      transform
-    } = treeOpts;
-    const allList = fullData || this.tableFullData;
-    // 如果gt为0，则总是启用
-    const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt <= allList.length);
-    this.scrollYLoad = scrollYLoad;
-    return scrollYLoad;
-  },
   /**
    * 加载表格数据
    * @param {Array} datas 数据
@@ -1384,7 +1430,7 @@ const Methods = {
     editStore.insertMaps = {};
     editStore.removeList = [];
     editStore.removeMaps = {};
-    const sYLoad = this.updateScrollYStatus(fullData);
+    const sYLoad = updateScrollYStatus($xeTable, fullData);
     this.isDragRowMove = false;
     // 全量数据
     this.tableFullData = fullData;
@@ -2391,47 +2437,6 @@ const Methods = {
     }
     return rowList;
   },
-  /**
-   * 如果为虚拟树，将树结构拍平
-   * @returns
-   */
-  handleVirtualTreeToList() {
-    const $xeTable = this;
-    const internalData = $xeTable;
-    const {
-      fullAllDataRowIdData
-    } = internalData;
-    const {
-      treeOpts,
-      treeConfig,
-      treeExpandedMaps,
-      afterTreeFullData,
-      afterFullData
-    } = this;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
-    if (treeConfig && treeOpts.transform) {
-      const fullData = [];
-      const expandMaps = {};
-      _xeUtils.default.eachTree(afterTreeFullData, (row, index, items, path, parentRow) => {
-        const rowid = (0, _util.getRowid)(this, row);
-        const parentRowid = (0, _util.getRowid)(this, parentRow);
-        if (!parentRow || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
-          const rowRest = fullAllDataRowIdData[rowid];
-          if (rowRest) {
-            rowRest._index = fullData.length;
-          }
-          expandMaps[rowid] = 1;
-          fullData.push(row);
-        }
-      }, {
-        children: childrenField
-      });
-      this.afterFullData = fullData;
-      this.updateScrollYStatus(fullData);
-      return fullData;
-    }
-    return afterFullData;
-  },
   /**
    * 获取处理后全量的表格数据
    * 如果存在筛选条件，继续处理
@@ -6566,7 +6571,7 @@ const Methods = {
           reactData.isDragRowMove = true;
           $xeTable.handleTableData(treeConfig && transform);
           $xeTable.cacheRowMap();
-          $xeTable.updateScrollYStatus();
+          updateScrollYStatus($xeTable);
           if (!(treeConfig && transform)) {
             $xeTable.updateAfterDataIndex();
           }
@@ -7328,11 +7333,13 @@ const Methods = {
   },
   clearRowExpandLoaded(row) {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
     const {
-      expandOpts,
-      rowExpandLazyLoadedMaps,
       fullAllDataRowIdData
-    } = this;
+    } = internalData;
+    const expandOpts = $xeTable.computeExpandOpts;
     const {
       lazy
     } = expandOpts;
@@ -7340,13 +7347,10 @@ const Methods = {
     const rowRest = fullAllDataRowIdData[rowid];
     if (lazy && rowRest) {
       rowRest.expandLoaded = false;
-      const rowTempExpandLazyLoadedMaps = Object.assign({}, rowExpandLazyLoadedMaps);
-      if (rowTempExpandLazyLoadedMaps[rowid]) {
-        delete rowTempExpandLazyLoadedMaps[rowid];
-      }
-      this.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
+      delete rExpandLazyLoadedMaps[rowid];
     }
-    return this.$nextTick();
+    reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
+    return $xeTable.$nextTick();
   },
   /**
    * 重新懒加载展开行，并展开内容
@@ -7466,6 +7470,8 @@ const Methods = {
   },
   handleAsyncRowExpand(row) {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     return new Promise(resolve => {
       const {
         expandOpts
@@ -7475,37 +7481,36 @@ const Methods = {
       } = expandOpts;
       if (loadMethod) {
         const {
-          rowExpandLazyLoadedMaps,
           fullAllDataRowIdData
-        } = this;
+        } = internalData;
+        const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
         const rowid = (0, _util.getRowid)($xeTable, row);
         const rowRest = fullAllDataRowIdData[rowid];
-        rowExpandLazyLoadedMaps[rowid] = row;
+        rExpandLazyLoadedMaps[rowid] = row;
+        reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
         loadMethod({
           $table: $xeTable,
           row,
-          rowIndex: this.getRowIndex(row),
-          $rowIndex: this.getVMRowIndex(row)
+          rowIndex: $xeTable.getRowIndex(row),
+          $rowIndex: $xeTable.getVMRowIndex(row)
         }).then(() => {
-          const {
-            rowExpandedMaps
-          } = this;
+          const rExpandedMaps = Object.assign({}, reactData.rowExpandedMaps);
           if (rowRest) {
             rowRest.expandLoaded = true;
           }
-          rowExpandedMaps[rowid] = row;
+          rExpandedMaps[rowid] = row;
+          reactData.rowExpandedMaps = rExpandedMaps;
         }).catch(() => {
           if (rowRest) {
             rowRest.expandLoaded = false;
           }
         }).finally(() => {
-          const {
-            rowExpandLazyLoadedMaps
-          } = this;
-          if (rowExpandLazyLoadedMaps[rowid]) {
-            delete rowExpandLazyLoadedMaps[rowid];
+          const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
+          if (rExpandLazyLoadedMaps[rowid]) {
+            delete rExpandLazyLoadedMaps[rowid];
           }
-          this.$nextTick().then(() => this.recalculate()).then(() => resolve());
+          reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
+          $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => resolve());
         });
       } else {
         resolve();
@@ -7685,11 +7690,13 @@ const Methods = {
   },
   clearTreeExpandLoaded(rows) {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
     const {
-      treeOpts,
-      treeExpandedMaps,
       fullAllDataRowIdData
-    } = this;
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
     const {
       transform
     } = treeOpts;
@@ -7702,23 +7709,25 @@ const Methods = {
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
           rowRest.treeLoaded = false;
-          if (treeExpandedMaps[rowid]) {
-            delete treeExpandedMaps[rowid];
+          if (tExpandedMaps[rowid]) {
+            delete tExpandedMaps[rowid];
           }
         }
       });
     }
+    reactData.treeExpandedMaps = tExpandedMaps;
     if (transform) {
-      this.handleVirtualTreeToList();
-      return this.handleTableData();
+      handleVirtualTreeToList($xeTable);
+      return $xeTable.handleTableData();
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   /**
    * 重新懒加载树节点，并展开该节点
    * @param {Row} row 行对象
    */
   reloadTreeExpand(row) {
+    const $xeTable = this;
     const {
       treeOpts,
       treeExpandLazyLoadedMaps
@@ -7734,7 +7743,7 @@ const Methods = {
         return this.handleAsyncTreeExpandChilds(row);
       }).then(() => {
         if (transform) {
-          this.handleVirtualTreeToList();
+          handleVirtualTreeToList($xeTable);
           return this.handleTableData();
         }
       }).then(() => {
@@ -8011,8 +8020,9 @@ const Methods = {
    * @returns
    */
   handleVirtualTreeExpand(rows, expanded) {
+    const $xeTable = this;
     return this.handleBaseTreeExpand(rows, expanded).then(() => {
-      this.handleVirtualTreeToList();
+      handleVirtualTreeToList($xeTable);
       this.handleTableData();
       this.updateTreeDataIndex();
     }).then(() => {
@@ -8066,6 +8076,7 @@ const Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand() {
+    const $xeTable = this;
     const {
       treeOpts,
       tableFullData
@@ -8084,7 +8095,7 @@ const Methods = {
     }
     return this.handleTableData().then(() => {
       if (transform) {
-        this.handleVirtualTreeToList();
+        handleVirtualTreeToList($xeTable);
         return this.handleTableData();
       }
     }).then(() => {