vxe-table 3.4.7-beta.0 → 3.4.8

package/packages/edit/src/mixin.js

@@ -6,12 +6,12 @@ import { browse } from '../../tools/src/dom'
 const { getRowid } = UtilTools
 
 function insertTreeRow (_vm, newRecords, isAppend) {
-  const { treeFullData, afterFullData, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = _vm
+  const { tableFullTreeData, afterFullData, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = _vm
   const funcName = isAppend ? 'push' : 'unshift'
   newRecords.forEach(item => {
     const parentRowId = item[treeOpts.parentField]
     const rowid = getRowid(_vm, item)
-    const matchObj = parentRowId ? XEUtils.findTree(treeFullData, item => parentRowId === item[treeOpts.rowField], treeOpts) : null
+    const matchObj = parentRowId ? XEUtils.findTree(tableFullTreeData, item => parentRowId === item[treeOpts.rowField], treeOpts) : null
     if (matchObj) {
       const { item: parentRow } = matchObj
       const parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)]
@@ -31,13 +31,12 @@ function insertTreeRow (_vm, newRecords, isAppend) {
         }
       }
       afterFullData[funcName](item)
-      treeFullData[funcName](item)
-      const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: treeFullData, parent: null, level: 0 }
+      tableFullTreeData[funcName](item)
+      const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: tableFullTreeData, parent: null, level: 0 }
       fullDataRowIdData[rowid] = rest
       fullAllDataRowIdData[rowid] = rest
     }
   })
-  _vm.updateVirtualTreeData()
 }
 
 export default {
@@ -59,7 +58,7 @@ export default {
      * @param {Row} row 指定行
      */
     _insertAt (records, row) {
-      const { treeFullData, mergeList, afterFullData, editStore, sYOpts, scrollYLoad, tableFullData, treeConfig, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = this
+      const { tableFullTreeData, mergeList, afterFullData, editStore, tableFullData, treeConfig, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = this
       const { transform } = treeOpts
       if (!XEUtils.isArray(records)) {
         records = [records]
@@ -99,7 +98,7 @@ export default {
         } else {
           // 如果为虚拟树
           if (treeConfig && transform) {
-            const matchObj = XEUtils.findTree(treeFullData, item => row[treeOpts.rowField] === item[treeOpts.rowField], treeOpts)
+            const matchObj = XEUtils.findTree(tableFullTreeData, item => row[treeOpts.rowField] === item[treeOpts.rowField], treeOpts)
             if (matchObj) {
               const { parent: parentRow } = matchObj
               const parentChilds = matchObj.items
@@ -122,7 +121,6 @@ export default {
                 fullDataRowIdData[rowid] = rest
                 fullAllDataRowIdData[rowid] = rest
               })
-              this.updateVirtualTreeData()
             } else {
               if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                 UtilTools.warn('vxe.error.unableInsert')
@@ -152,13 +150,12 @@ export default {
         }
       }
       editStore.insertList.unshift(...newRecords)
-      this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length
-      this.handleTableData(transform)
+      this.handleTableData(treeConfig && treeOpts.transform)
       this.updateFooter()
       this.cacheRowMap()
       this.updateAfterDataIndex()
       this.checkSelectionStatus()
-      if (scrollYLoad) {
+      if (this.scrollYLoad) {
         this.updateScrollYSpace()
       }
       return this.$nextTick().then(() => {
@@ -178,7 +175,7 @@ export default {
      * 如果为空则删除所有
      */
     _remove (rows) {
-      const { afterFullData, tableFullData, treeFullData, treeConfig, mergeList, editStore, checkboxOpts, selection, isInsertByRow, sYOpts, scrollYLoad, treeOpts } = this
+      const { afterFullData, tableFullData, tableFullTreeData, treeConfig, mergeList, editStore, checkboxOpts, selection, isInsertByRow, treeOpts } = this
       const { transform } = treeOpts
       const { actived, removeList, insertList } = editStore
       const { checkField: property } = checkboxOpts
@@ -214,7 +211,7 @@ export default {
         if (treeConfig && transform) {
           rows.forEach((row) => {
             const rowid = getRowid(this, row)
-            const matchObj = XEUtils.findTree(treeFullData, item => rowid === getRowid(this, item), treeOpts)
+            const matchObj = XEUtils.findTree(tableFullTreeData, item => rowid === getRowid(this, item), treeOpts)
             if (matchObj) {
               const rItems = matchObj.items.splice(matchObj.index, 1)
               rest.push(rItems[0])
@@ -223,7 +220,6 @@ export default {
             if (afIndex > -1) {
               afterFullData.splice(afIndex, 1)
             }
-            this.updateVirtualTreeData()
           })
         } else {
           rows.forEach(row => {
@@ -259,13 +255,12 @@ export default {
           insertList.splice(iIndex, 1)
         }
       })
-      this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length
-      this.handleTableData(transform)
+      this.handleTableData(treeConfig && treeOpts.transform)
       this.updateFooter()
       this.cacheRowMap()
       this.updateAfterDataIndex()
       this.checkSelectionStatus()
-      if (scrollYLoad) {
+      if (this.scrollYLoad) {
         this.updateScrollYSpace()
       }
       return this.$nextTick().then(() => {
@@ -318,7 +313,7 @@ export default {
      * 获取新增的临时数据
      */
     _getInsertRecords () {
-      const { treeConfig, treeFullData, tableFullData, treeOpts } = this
+      const { treeConfig, tableFullTreeData, tableFullData, treeOpts } = this
       const insertList = this.editStore.insertList
       const insertRecords = []
       if (insertList.length) {
@@ -326,7 +321,7 @@ export default {
         if (treeConfig && treeOpts.transform) {
           insertList.forEach(row => {
             const rowid = getRowid(this, row)
-            const matchObj = XEUtils.findTree(treeFullData, item => rowid === getRowid(this, item), treeOpts)
+            const matchObj = XEUtils.findTree(tableFullTreeData, item => rowid === getRowid(this, item), treeOpts)
             if (matchObj) {
               insertRecords.push(row)
             }

package/packages/export/src/mixin.js

@@ -2,7 +2,7 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
 import { UtilTools } from '../../tools'
-import { mergeBodyMethod, toTreePathSeq } from '../../table/src/util'
+import { mergeBodyMethod } from '../../table/src/util'
 import { browse } from '../../tools/src/dom'
 
 const { formatText } = UtilTools
@@ -40,16 +40,13 @@ function hasTreeChildren ($xetable, row) {
   return row[treeOpts.children] && row[treeOpts.children].length > 0
 }
 
-function getSeq ($xetable, row, rowIndex, column, columnIndex, path) {
+function getSeq ($xetable, row, rowIndex, column, columnIndex) {
   const seqOpts = $xetable.seqOpts
   const seqMethod = seqOpts.seqMethod || column.seqMethod
   if (seqMethod) {
     return seqMethod({ row, rowIndex, column, columnIndex })
   }
-  if (path) {
-    return toTreePathSeq(path)
-  }
-  return seqOpts.startIndex + rowIndex + 1
+  return $xetable.getRowSeq(row)
 }
 
 function defaultFilterExportColumn (column) {
@@ -106,7 +103,7 @@ function getLabelData ($xetable, opts, columns, datas) {
           } else {
             switch (column.type) {
               case 'seq':
-                cellValue = getSeq($xetable, row, rowIndex, column, columnIndex, path)
+                cellValue = getSeq($xetable, row, rowIndex, column, columnIndex)
                 break
               case 'checkbox':
                 cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row))
@@ -162,7 +159,7 @@ function getLabelData ($xetable, opts, columns, datas) {
       } else {
         switch (column.type) {
           case 'seq':
-            cellValue = getSeq($xetable, row, rowIndex, column, columnIndex, null)
+            cellValue = getSeq($xetable, row, rowIndex, column, columnIndex)
             break
           case 'checkbox':
             cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row))

package/packages/filter/src/mixin.js

@@ -104,7 +104,7 @@ export default {
           // 判断面板不能大于表格高度
           let maxHeight = null
           if (filterHeight >= bodyElem.clientHeight) {
-            maxHeight = Math.max(40, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0))
+            maxHeight = Math.max(60, bodyElem.clientHeight - (filterFootElem ? filterFootElem.offsetHeight : 0) - (filterHeadElem ? filterHeadElem.offsetHeight : 0))
           }
           if (column.fixed === 'left') {
             left = targetElem.offsetLeft + targetElem.offsetParent.offsetLeft - centerWidth

package/packages/select/src/select.js

@@ -13,7 +13,7 @@ function getOptUniqueId () {
 }
 
 function getOptkey (_vm) {
-  return _vm.optionId || '_XID'
+  return _vm.optionId || '_X_ID'
 }
 
 function getOptid (_vm, option) {

package/packages/table/src/body.js

@@ -377,7 +377,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
       )
     }
     // 如果是树形表格
-    if (treeConfig && !scrollYLoad && treeExpandeds.length) {
+    if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
       const rowChildren = row[treeOpts.children]
       if (rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1) {
         rows.push(...renderRows(h, _vm, $xetable, fixedType, rowChildren, tableColumn))

package/packages/table/src/methods.js

@@ -283,7 +283,7 @@ const Methods = {
     return clearTableAllStatus(this)
   },
   /**
-   * 同步 data 数据
+   * 同步 data 数据（即将废弃）
    * 如果用了该方法，那么组件将不再记录增删改的状态，只能自行实现对应逻辑
    * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
    */
@@ -301,9 +301,24 @@ const Methods = {
     return this.handleTableData(true).then(this.updateFooter).then(this.recalculate)
   },
   handleTableData (force) {
-    const { scrollYLoad, scrollYStore } = this
-    const fullData = force ? this.updateAfterFullData() : this.afterFullData
-    this.tableData = scrollYLoad ? fullData.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullData.slice(0)
+    const { scrollYLoad, scrollYStore, fullDataRowIdData, afterFullData } = this
+    let fullList = afterFullData
+    // 是否进行数据处理
+    if (force) {
+      // 更新数据，处理筛选和排序
+      this.updateAfterFullData()
+      // 如果为虚拟树，将树结构拍平
+      fullList = this.handleVirtualTreeToList()
+    }
+    const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0)
+    tableData.forEach((row, $index) => {
+      const rowid = getRowid(this, row)
+      const rest = fullDataRowIdData[rowid]
+      if (rest) {
+        rest.$index = $index
+      }
+    })
+    this.tableData = tableData
     return this.$nextTick()
   },
   updateScrollYStatus (fullData) {
@@ -334,13 +349,24 @@ const Methods = {
           if (!treeOpts.children) {
             UtilTools.error('vxe.error.reqProp', ['tree-config.children'])
           }
+          if (!treeOpts.mapChildren) {
+            UtilTools.error('vxe.error.reqProp', ['tree-config.mapChildren'])
+          }
+          if (treeOpts.children === treeOpts.mapChildren) {
+            UtilTools.error('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren'])
+          }
           fullData.forEach(row => {
             if (row[treeOpts.children] && row[treeOpts.children].length) {
               UtilTools.warn('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
             }
           })
         }
-        treeData = XEUtils.toArrayTree(fullData, { key: treeOpts.rowField, parentKey: treeOpts.parentField, children: treeOpts.children })
+        treeData = XEUtils.toArrayTree(fullData, {
+          key: treeOpts.rowField,
+          parentKey: treeOpts.parentField,
+          children: treeOpts.children,
+          mapChildren: treeOpts.mapChildren
+        })
         fullData = treeData.slice(0)
       } else {
         treeData = fullData.slice(0)
@@ -356,7 +382,7 @@ const Methods = {
     this.scrollYLoad = sYLoad
     // 全量数据
     this.tableFullData = fullData
-    this.treeFullData = treeData
+    this.tableFullTreeData = treeData
     // 缓存数据
     this.cacheRowMap(true)
     // 原始数据
@@ -530,7 +556,7 @@ const Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheRowMap (source) {
-    const { treeConfig, treeOpts, tableFullData, fullDataRowMap, fullAllDataRowMap } = this
+    const { treeConfig, treeOpts, tableFullData, fullDataRowMap, fullAllDataRowMap, tableFullTreeData } = this
     let { fullDataRowIdData, fullAllDataRowIdData } = this
     const rowkey = getRowkey(this)
     const isLazy = treeConfig && treeOpts.lazy
@@ -560,14 +586,14 @@ const Methods = {
     fullAllDataRowIdData = this.fullAllDataRowIdData = {}
     fullAllDataRowMap.clear()
     if (treeConfig) {
-      XEUtils.eachTree(tableFullData, handleCache, treeOpts)
+      XEUtils.eachTree(tableFullTreeData, handleCache, treeOpts)
     } else {
       tableFullData.forEach(handleCache)
     }
   },
   loadTreeChildren (row, childRecords) {
     const { keepSource, tableSourceData, treeOpts, fullDataRowIdData, fullDataRowMap, fullAllDataRowMap, fullAllDataRowIdData } = this
-    const { children } = treeOpts
+    const { transform, children, mapChildren } = treeOpts
     const rest = fullAllDataRowIdData[getRowid(this, row)]
     const parentLevel = rest ? rest.level : 0
     return this.createData(childRecords).then((rows) => {
@@ -587,6 +613,9 @@ const Methods = {
         fullAllDataRowMap.set(childRow, rest)
       }, treeOpts)
       row[children] = rows
+      if (transform) {
+        row[mapChildren] = rows
+      }
       return rows
     })
   },
@@ -1073,15 +1102,38 @@ const Methods = {
     }
     return rowList
   },
+  /**
+   * 如果为虚拟树，将树结构拍平
+   * @returns
+   */
+  handleVirtualTreeToList () {
+    const { treeOpts, treeConfig, treeExpandeds, afterTreeFullData, afterFullData } = this
+    if (treeConfig && treeOpts.transform) {
+      const fullData = []
+      const expandMaps = new Map()
+      XEUtils.eachTree(afterTreeFullData, (row, index, items, path, parent) => {
+        if (!parent || (expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1)) {
+          expandMaps.set(row, 1)
+          fullData.push(row)
+        }
+      }, { children: treeOpts.mapChildren })
+      this.afterFullData = fullData
+      this.updateScrollYStatus(fullData)
+      return fullData
+    }
+    return afterFullData
+  },
   /**
    * 获取处理后全量的表格数据
    * 如果存在筛选条件，继续处理
    */
   updateAfterFullData () {
-    const { tableFullColumn, tableFullData, filterOpts, sortOpts } = this
+    const { tableFullColumn, tableFullData, filterOpts, sortOpts, treeConfig, treeOpts, tableFullTreeData } = this
     const { remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts
     const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple } = sortOpts
-    let tableData = tableFullData.slice(0)
+    const { transform } = treeOpts
+    let tableData = []
+    let tableTree = []
     const filterColumns = []
     const orderColumns = []
     tableFullColumn.forEach(column => {
@@ -1104,7 +1156,7 @@ const Methods = {
       }
     })
     if (filterColumns.length) {
-      tableData = tableData.filter(row => {
+      const handleFilter = (row) => {
         return filterColumns.every(({ column, valueList, itemList }) => {
           if (valueList.length && !allRemoteFilter) {
             const { filterMethod, filterRender } = column
@@ -1125,52 +1177,84 @@ const Methods = {
           }
           return true
         })
-      })
+      }
+      if (treeConfig && transform) {
+        // 筛选虚拟树
+        tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, { ...treeOpts, original: true })
+        tableData = tableTree
+      } else {
+        tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter)
+        tableTree = tableData
+      }
+    } else {
+      if (treeConfig && transform) {
+        // 还原虚拟树
+        tableTree = XEUtils.searchTree(tableFullTreeData, () => true, { ...treeOpts, original: true })
+        tableData = tableTree
+      } else {
+        tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0)
+        tableTree = tableData
+      }
     }
     const firstOrderColumn = orderColumns[0]
     if (!allRemoteSort && firstOrderColumn) {
-      if (allSortMethod) {
-        const sortRests = allSortMethod({ data: tableData, column: firstOrderColumn.column, property: firstOrderColumn.property, order: firstOrderColumn.order, sortList: orderColumns, $table: this })
-        tableData = XEUtils.isArray(sortRests) ? sortRests : tableData
+      if (treeConfig && transform) {
+        // 虚拟树和列表一样，只能排序根级节点
+        if (allSortMethod) {
+          const sortRests = allSortMethod({ data: tableTree, sortList: orderColumns, $table: this })
+          tableTree = XEUtils.isArray(sortRests) ? sortRests : tableTree
+        } else {
+          tableTree = XEUtils.orderBy(tableTree, orderColumns.map(({ column, order }) => [getOrderField(this, column), order]))
+        }
+        tableData = tableTree
       } else {
-        // 兼容 v4
-        if (sortMultiple) {
-          tableData = XEUtils.orderBy(tableData, orderColumns.map(({ column, order }) => [getOrderField(this, column), order]))
+        if (allSortMethod) {
+          const sortRests = allSortMethod({ data: tableData, column: firstOrderColumn.column, property: firstOrderColumn.property, order: firstOrderColumn.order, sortList: orderColumns, $table: this })
+          tableData = XEUtils.isArray(sortRests) ? sortRests : tableData
         } else {
-          // 兼容 v2，在 v4 中废弃， sortBy 不能为数组
-          let sortByConfs
-          if (XEUtils.isArray(firstOrderColumn.sortBy)) {
-            sortByConfs = firstOrderColumn.sortBy.map(item => [item, firstOrderColumn.order])
+          // 兼容 v4
+          if (sortMultiple) {
+            tableData = XEUtils.orderBy(tableData, orderColumns.map(({ column, order }) => [getOrderField(this, column), order]))
+          } else {
+            // 兼容 v2，在 v4 中废弃， sortBy 不能为数组
+            let sortByConfs
+            if (XEUtils.isArray(firstOrderColumn.sortBy)) {
+              sortByConfs = firstOrderColumn.sortBy.map(item => [item, firstOrderColumn.order])
+            }
+            tableData = XEUtils.orderBy(tableData, sortByConfs || [firstOrderColumn].map(({ column, order }) => [getOrderField(this, column), order]))
           }
-          tableData = XEUtils.orderBy(tableData, sortByConfs || [firstOrderColumn].map(({ column, order }) => [getOrderField(this, column), order]))
         }
+        tableTree = tableData
       }
     }
     this.afterFullData = tableData
-    return tableData
+    this.afterTreeFullData = tableTree
+    this.updateAfterDataIndex()
   },
   /**
    * 预编译
    * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
    */
   updateAfterDataIndex () {
-    const { treeConfig, afterFullData, fullDataRowIdData, fullAllDataRowIdData, treeFullData, treeOpts } = this
+    const { treeConfig, afterFullData, fullDataRowIdData, fullAllDataRowIdData, afterTreeFullData, treeOpts } = this
     if (treeConfig) {
-      XEUtils.eachTree(treeFullData, (row, index, items, path) => {
+      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 }
         }
-      }, treeOpts)
+      }, { children: treeOpts.mapChildren })
     } else {
       afterFullData.forEach((row, index) => {
         const rowid = getRowid(this, row)
@@ -1179,6 +1263,7 @@ const Methods = {
         const seq = index + 1
         if (allrest) {
           allrest.seq = seq
+          allrest._index = index
         }
         if (fullrest) {
           fullrest.seq = seq
@@ -3734,12 +3819,16 @@ const Methods = {
   },
   clearTreeExpandLoaded (row) {
     const { treeOpts, treeExpandeds, fullAllDataRowMap } = this
-    const { lazy } = treeOpts
+    const { transform, lazy } = treeOpts
     const rest = fullAllDataRowMap.get(row)
     if (lazy && rest) {
       rest.treeLoaded = false
       XEUtils.remove(treeExpandeds, item => row === item)
     }
+    if (transform) {
+      this.handleVirtualTreeToList()
+      return this.handleTableData()
+    }
     return this.$nextTick()
   },
   /**
@@ -3754,7 +3843,7 @@ const Methods = {
         return this.handleAsyncTreeExpandChilds(row)
       }).then(() => {
         if (transform) {
-          return this.updateVirtualTreeData()
+          return this.handleTableData()
         }
       }).then(() => {
         return this.recalculate()
@@ -3814,7 +3903,7 @@ const Methods = {
   },
   handleAsyncTreeExpandChilds (row) {
     const { fullAllDataRowMap, treeExpandeds, treeOpts, treeLazyLoadeds, checkboxOpts } = this
-    const { loadMethod } = treeOpts
+    const { transform, loadMethod } = treeOpts
     const { checkStrictly } = checkboxOpts
     const rest = fullAllDataRowMap.get(row)
     return new Promise(resolve => {
@@ -3834,9 +3923,17 @@ const Methods = {
             if (!checkStrictly && this.isCheckedByCheckboxRow(row)) {
               this.setCheckboxRow(childRows, true)
             }
+            this.$nextTick().then(() => {
+              if (transform) {
+                return this.handleTableData()
+              }
+            }).then(() => {
+              return this.recalculate()
+            }).then(() => resolve())
           })
+        } else {
+          this.$nextTick().then(() => this.recalculate()).then(() => resolve())
         }
-        resolve(this.$nextTick().then(this.recalculate))
       })
     })
   },
@@ -3900,23 +3997,6 @@ const Methods = {
     }
     return Promise.all(result).then(this.recalculate)
   },
-  updateVirtualTreeData () {
-    const { scrollYLoad: oldScrollYLoad, treeExpandeds, treeOpts, treeFullData } = this
-    const fullData = []
-    const expandMaps = new Map()
-    XEUtils.eachTree(treeFullData, (row, index, items, path, parent) => {
-      if (!parent || (expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1)) {
-        expandMaps.set(row, 1)
-        fullData.push(row)
-      }
-    }, treeOpts)
-    const scrollYLoad = this.updateScrollYStatus(fullData)
-    this.tableFullData = scrollYLoad ? fullData : treeFullData
-    if (scrollYLoad || oldScrollYLoad !== scrollYLoad) {
-      return this.handleTableData(true).then(() => this.recalculate())
-    }
-    return this.$nextTick()
-  },
   /**
    * 虚拟树的展开与收起
    * @param rows
@@ -3925,7 +4005,8 @@ const Methods = {
    */
   handleVirtualTreeExpand (rows, expanded) {
     return this.handleBaseTreeExpand(rows, expanded).then(() => {
-      return this.updateVirtualTreeData()
+      this.handleVirtualTreeToList()
+      return this.handleTableData()
     }).then(() => {
       return this.recalculate()
     })
@@ -3967,13 +4048,16 @@ const Methods = {
    */
   clearTreeExpand () {
     const { treeOpts, treeExpandeds, tableFullData } = this
-    const { reserve } = treeOpts
+    const { transform, reserve } = treeOpts
     const isExists = treeExpandeds.length
     this.treeExpandeds = []
     if (reserve) {
       XEUtils.eachTree(tableFullData, row => this.handleTreeExpandReserve(row, false), treeOpts)
     }
-    return this.updateVirtualTreeData().then(() => {
+    return this.handleTableData().then(() => {
+      if (transform) {
+        this.handleVirtualTreeToList()
+      }
       if (isExists) {
         this.recalculate()
       }

package/packages/tools/src/utils.js

@@ -183,7 +183,7 @@ export const UtilTools = {
   },
   // 行主键 key
   getRowkey ($xetable) {
-    return $xetable.rowId || '_XID'
+    return $xetable.rowId || '_X_ID'
   },
   // 行主键 value
   getRowid ($xetable, row) {

package/packages/v-x-e-table/src/conf.js

@@ -49,7 +49,7 @@ export default {
     //  storage: false,
     //  checkMethod () {}
     // },
-    // rowId: '_XID', // 行数据的唯一主键字段名
+    // rowId: '_X_ID', // 行数据的唯一主键字段名
     sortConfig: {
       // remote: false,
       // trigger: 'default',
@@ -67,6 +67,7 @@ export default {
       parentField: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
+      mapChildren: '_X_CHILD',
       indent: 20,
       showIcon: true
     },

package/packages/validator/src/mixin.js

@@ -151,7 +151,7 @@ export default {
           const ruleProps = Object.keys(validRest)
           return this.$nextTick().then(() => {
             if (ruleProps.length) {
-              return validRest[ruleProps[0]][0]
+              return Promise.reject(validRest[ruleProps[0]][0])
             }
             if (cb) {
               cb()

package/types/table.d.ts

@@ -272,6 +272,7 @@ export declare class Table extends VXETableComponent {
   /**
    * 同步 data 数据；如果用了该方法，那么组件将不再记录增删改的状态，只能自行实现对应逻辑
    * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
+   * @deprecated
    */
   syncData(): Promise<any>;
   /**