vxe-table 3.4.8 → 3.4.9

package/packages/table/src/methods.js

@@ -1241,36 +1241,28 @@ const Methods = {
       XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
         const rowid = getRowid(this, row)
         const allrest = fullAllDataRowIdData[rowid]
-        const fullrest = fullDataRowIdData[rowid]
         const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('')
         if (allrest) {
           allrest.seq = seq
           allrest._index = index
-        }
-        if (fullrest) {
-          fullrest.seq = seq
-          fullrest._index = index
         } else {
-          fullAllDataRowIdData[rowid] = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 }
-          fullDataRowIdData[rowid] = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 }
+          const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 }
+          fullAllDataRowIdData[rowid] = rest
+          fullDataRowIdData[rowid] = rest
         }
       }, { children: treeOpts.mapChildren })
     } else {
       afterFullData.forEach((row, index) => {
         const rowid = getRowid(this, row)
         const allrest = fullAllDataRowIdData[rowid]
-        const fullrest = fullDataRowIdData[rowid]
         const seq = index + 1
         if (allrest) {
           allrest.seq = seq
           allrest._index = index
-        }
-        if (fullrest) {
-          fullrest.seq = seq
-          fullrest._index = index
         } else {
-          fullAllDataRowIdData[rowid] = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 }
-          fullDataRowIdData[rowid] = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 }
+          const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 }
+          fullAllDataRowIdData[rowid] = rest
+          fullDataRowIdData[rowid] = rest
         }
       })
     }
@@ -3843,6 +3835,7 @@ const Methods = {
         return this.handleAsyncTreeExpandChilds(row)
       }).then(() => {
         if (transform) {
+          this.handleVirtualTreeToList()
           return this.handleTableData()
         }
       }).then(() => {
@@ -4057,7 +4050,9 @@ const Methods = {
     return this.handleTableData().then(() => {
       if (transform) {
         this.handleVirtualTreeToList()
+        return this.handleTableData()
       }
+    }).then(() => {
       if (isExists) {
         this.recalculate()
       }

package/packages/table/src/util.js

@@ -115,9 +115,12 @@ export function getColMinWidth (params) {
 }
 
 function countTreeExpand (prevRow, params) {
+  let count = 1
+  if (!prevRow) {
+    return count
+  }
   const { $table } = params
   const rowChildren = prevRow[$table.treeOpts.children]
-  let count = 1
   if ($table.isTreeExpandByRow(prevRow)) {
     for (let index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params)
@@ -130,13 +133,13 @@ export function getOffsetSize ($xetable) {
   return lineOffsetSizes[$xetable.vSize] || 0
 }
 
-export function calcTreeLine (params, items) {
-  const { $table, $rowIndex } = params
+export function calcTreeLine (params, items, rIndex) {
+  const { $table } = params
   let expandSize = 1
-  if ($rowIndex) {
-    expandSize = countTreeExpand(items[$rowIndex - 1], params)
+  if (rIndex) {
+    expandSize = countTreeExpand(items[rIndex - 1], params)
   }
-  return $table.rowHeight * expandSize - ($rowIndex ? 1 : (12 - getOffsetSize($table)))
+  return $table.rowHeight * expandSize - (rIndex ? 1 : (12 - getOffsetSize($table)))
 }
 
 export function mergeBodyMethod (mergeList, _rowIndex, _columnIndex) {