vxe-table 3.11.12 → 3.11.14

package/lib/table/src/methods.js

@@ -572,16 +572,15 @@ function handleRecalculateLayout($xeTable, reFull) {
   }
   $xeTable.calcCellWidth();
   $xeTable.autoCellWidth();
-  if (reFull === true) {
-    // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
-    return $xeTable.computeScrollLoad().then(() => {
+  return $xeTable.computeScrollLoad().then(() => {
+    if (reFull === true) {
+      // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
       calcCellHeight($xeTable);
       $xeTable.calcCellWidth();
       $xeTable.autoCellWidth();
       return $xeTable.computeScrollLoad();
-    });
-  }
-  return $xeTable.computeScrollLoad();
+    }
+  });
 }
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const reactData = $xeTable;
@@ -1950,6 +1949,11 @@ const Methods = {
    * @returns
    */
   handleVirtualTreeToList() {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
     const {
       treeOpts,
       treeConfig,
@@ -1965,6 +1969,10 @@ const Methods = {
         const rowid = (0, _util.getRowid)(this, row);
         const parentRowid = (0, _util.getRowid)(this, parent);
         if (!parent || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
+          const rowRest = fullAllDataRowIdData[rowid];
+          if (rowRest) {
+            rowRest._index = fullData.length;
+          }
           expandMaps[rowid] = 1;
           fullData.push(row);
         }
@@ -2188,24 +2196,69 @@ const Methods = {
     this.afterTreeFullData = tableTree;
     this.updateAfterDataIndex();
   },
+  updateTreeDataIndex() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      afterFullData,
+      fullDataRowIdData,
+      fullAllDataRowIdData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    if (treeConfig) {
+      if (treeOpts.transform) {
+        afterFullData.forEach((row, index) => {
+          const rowid = (0, _util.getRowid)($xeTable, row);
+          const rowRest = fullAllDataRowIdData[rowid];
+          if (rowRest) {
+            rowRest._index = index;
+          } else {
+            const rest = {
+              row,
+              rowid,
+              seq: '-1',
+              index: -1,
+              $index: -1,
+              _index: index,
+              items: [],
+              parent: null,
+              level: 0,
+              height: 0
+            };
+            fullAllDataRowIdData[rowid] = rest;
+            fullDataRowIdData[rowid] = rest;
+          }
+        });
+      }
+    }
+  },
   /**
    * 预编译
    * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
    */
   updateAfterDataIndex() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
     const {
-      treeConfig,
       afterFullData,
       fullDataRowIdData,
       fullAllDataRowIdData,
-      afterTreeFullData,
-      treeOpts
-    } = this;
+      afterTreeFullData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const fullMaps = {};
     if (treeConfig) {
       _xeUtils.default.eachTree(afterTreeFullData, (row, index, items, path) => {
-        const rowid = (0, _util.getRowid)(this, row);
+        const rowid = (0, _util.getRowid)($xeTable, row);
         const rowRest = fullAllDataRowIdData[rowid];
         const seq = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
         if (rowRest) {
@@ -2231,9 +2284,10 @@ const Methods = {
       }, {
         children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField
       });
+      $xeTable.updateTreeDataIndex();
     } else {
       afterFullData.forEach((row, index) => {
-        const rowid = (0, _util.getRowid)(this, row);
+        const rowid = (0, _util.getRowid)($xeTable, row);
         const rowRest = fullAllDataRowIdData[rowid];
         const seq = index + 1;
         if (rowRest) {
@@ -2260,10 +2314,46 @@ const Methods = {
     }
     this.afterFullRowMaps = fullMaps;
   },
+  /**
+   * 只对 tree-config 有效，获取行的子级
+   */
+  getTreeRowChildren(rowOrRowid) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      fullDataRowIdData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      transform,
+      mapChildrenField
+    } = treeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    if (rowOrRowid && treeConfig) {
+      let rowid;
+      if (_xeUtils.default.isString(rowOrRowid)) {
+        rowid = rowOrRowid;
+      } else {
+        rowid = (0, _util.getRowid)($xeTable, rowOrRowid);
+      }
+      if (rowid) {
+        const rest = fullDataRowIdData[rowid];
+        const row = rest ? rest.row : null;
+        if (row) {
+          return row[transform ? mapChildrenField : childrenField] || [];
+        }
+      }
+    }
+    return [];
+  },
   /**
    * 只对 tree-config 有效，获取行的父级
    */
-  getParentRow(rowOrRowid) {
+  getTreeParentRow(rowOrRowid) {
     const {
       treeConfig,
       fullDataRowIdData
@@ -2282,6 +2372,11 @@ const Methods = {
     }
     return null;
   },
+  getParentRow(rowOrRowid) {
+    const $xeTable = this;
+    (0, _log.warnLog)('vxe.error.delFunc', ['getParentRow', 'getTreeParentRow']);
+    return $xeTable.getTreeParentRow(rowOrRowid);
+  },
   /**
    * 根据行的唯一主键获取行
    * @param {String/Number} rowid 行主键
@@ -6889,7 +6984,9 @@ const Methods = {
               }
               return this.$nextTick().then(() => {
                 if (transform) {
-                  return this.handleTableData();
+                  this.handleTableData();
+                  this.updateTreeDataIndex();
+                  return this.$nextTick();
                 }
               });
             });
@@ -7015,7 +7112,9 @@ const Methods = {
       validRows.forEach(row => this.handleTreeExpandReserve(row, expanded));
     }
     this.treeExpandedMaps = treeTempExpandedMaps;
-    return Promise.all(result).then(this.recalculate);
+    return Promise.all(result).then(() => {
+      return this.recalculate();
+    });
   },
   /**
    * 虚拟树的展开与收起
@@ -7026,9 +7125,14 @@ const Methods = {
   handleVirtualTreeExpand(rows, expanded) {
     return this.handleBaseTreeExpand(rows, expanded).then(() => {
       this.handleVirtualTreeToList();
-      return this.handleTableData();
+      this.handleTableData();
+      this.updateTreeDataIndex();
     }).then(() => {
       return this.recalculate();
+    }).then(() => {
+      setTimeout(() => {
+        this.updateCellAreas();
+      }, 30);
     });
   },
   /**