vxe-table 3.4.4 → 3.4.7-beta.1

package/packages/table/src/body.js

@@ -40,7 +40,7 @@ function renderLine (h, _vm, $xetable, rowLevel, items, params) {
 /**
  * 渲染列
  */
-function renderColumn (h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
+function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
   const {
     $listeners: tableListeners,
     afterFullData,
@@ -98,7 +98,7 @@ function renderColumn (h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel,
   const bindMouseenter = tableListeners['cell-mouseenter']
   const bindMouseleave = tableListeners['cell-mouseleave']
   const triggerDblclick = (editRender && editConfig && editOpts.trigger === 'dblclick')
-  const params = { $table: $xetable, $seq, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items }
+  const params = { $table: $xetable, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items }
   // 虚拟滚动不支持动态高度
   if ((scrollXLoad || scrollYLoad) && !hasEllipsis) {
     showEllipsis = hasEllipsis = true
@@ -266,7 +266,7 @@ function renderColumn (h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel,
   }, tdVNs)
 }
 
-function renderRows (h, _vm, $xetable, $seq, fixedType, tableData, tableColumn) {
+function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
   const {
     stripe,
     rowKey,
@@ -280,24 +280,19 @@ function renderRows (h, _vm, $xetable, $seq, fixedType, tableData, tableColumn)
     editOpts,
     treeExpandeds,
     scrollYLoad,
-    scrollYStore,
     editStore,
     rowExpandeds,
     radioOpts,
     checkboxOpts,
     expandColumn,
     hasFixedColumn,
-    fullAllDataRowIdData,
+    fullDataRowIdData,
     rowOpts
   } = $xetable
   const rows = []
   tableData.forEach((row, $rowIndex) => {
     const trOn = {}
     let rowIndex = $rowIndex
-    let seq = rowIndex + 1
-    if (scrollYLoad) {
-      seq += scrollYStore.startIndex
-    }
     const _rowIndex = $xetable.getVTRowIndex(row)
     // 确保任何情况下 rowIndex 都精准指向真实 data 索引
     rowIndex = $xetable.getRowIndex(row)
@@ -317,9 +312,10 @@ function renderRows (h, _vm, $xetable, $seq, fixedType, tableData, tableColumn)
       }
     }
     const rowid = UtilTools.getRowid($xetable, row)
-    const rest = fullAllDataRowIdData[rowid]
+    const rest = fullDataRowIdData[rowid]
     const rowLevel = rest ? rest.level : 0
-    const params = { $table: $xetable, $seq, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex }
+    const seq = rest ? rest.seq : -1
+    const params = { $table: $xetable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex }
     let isNewRow = false
     if (editConfig) {
       isNewRow = editStore.insertList.indexOf(row) > -1
@@ -340,7 +336,7 @@ function renderRows (h, _vm, $xetable, $seq, fixedType, tableData, tableColumn)
         key: rowKey || treeConfig ? rowid : $rowIndex,
         on: trOn
       }, tableColumn.map((column, $columnIndex) => {
-        return renderColumn(h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData)
+        return renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData)
       }))
     )
     // 如果行被展开了
@@ -353,7 +349,7 @@ function renderRows (h, _vm, $xetable, $seq, fixedType, tableData, tableColumn)
       }
       const { showOverflow } = expandColumn
       const hasEllipsis = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? allColumnOverflow : showOverflow
-      const expandParams = { $table: $xetable, $seq, seq, column: expandColumn, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex }
+      const expandParams = { $table: $xetable, seq, column: expandColumn, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex }
       rows.push(
         h('tr', {
           class: 'vxe-body--expanded-row',
@@ -381,10 +377,10 @@ function renderRows (h, _vm, $xetable, $seq, 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, $seq ? `${$seq}.${seq}` : `${seq}`, fixedType, rowChildren, tableColumn))
+        rows.push(...renderRows(h, _vm, $xetable, fixedType, rowChildren, tableColumn))
       }
     }
   })
@@ -529,7 +525,7 @@ export default {
          */
         h('tbody', {
           ref: 'tbody'
-        }, renderRows(h, this, $xetable, '', fixedType, tableData, tableColumn))
+        }, renderRows(h, this, $xetable, fixedType, tableData, tableColumn))
       ]),
       h('div', {
         class: 'vxe-table--checkbox-range'

package/packages/table/src/cell.js

@@ -99,16 +99,16 @@ export const Cell = {
     }
     switch (type) {
       case 'seq':
-        renMaps.renderHeader = this.renderIndexHeader
-        renMaps.renderCell = treeNode ? this.renderTreeIndexCell : this.renderIndexCell
+        renMaps.renderHeader = this.renderSeqHeader
+        renMaps.renderCell = treeNode ? this.renderTreeIndexCell : this.renderSeqCell
         break
       case 'radio':
         renMaps.renderHeader = this.renderRadioHeader
         renMaps.renderCell = treeNode ? this.renderTreeRadioCell : this.renderRadioCell
         break
       case 'checkbox':
-        renMaps.renderHeader = this.renderSelectionHeader
-        renMaps.renderCell = checkboxOpts.checkField ? (treeNode ? this.renderTreeSelectionCellByProp : this.renderSelectionCellByProp) : (treeNode ? this.renderTreeSelectionCell : this.renderSelectionCell)
+        renMaps.renderHeader = this.renderCheckboxHeader
+        renMaps.renderCell = checkboxOpts.checkField ? (treeNode ? this.renderTreeSelectionCellByProp : this.renderCheckboxCellByProp) : (treeNode ? this.renderTreeSelectionCell : this.renderCheckboxCell)
         break
       case 'expand':
         renMaps.renderCell = this.renderExpandCell
@@ -253,24 +253,24 @@ export const Cell = {
   /**
    * 索引
    */
-  renderIndexHeader (h, params) {
+  renderSeqHeader (h, params) {
     const { $table, column } = params
     const { slots } = column
     return renderTitleContent(h, params, slots && slots.header ? $table.callSlot(slots.header, params, h) : UtilTools.formatText(column.getTitle(), 1))
   },
-  renderIndexCell (h, params) {
+  renderSeqCell (h, params) {
     const { $table, column } = params
-    const { seqOpts } = $table
+    const { treeConfig, seqOpts } = $table
     const { slots } = column
     if (slots && slots.default) {
       return $table.callSlot(slots.default, params, h)
     }
-    const { $seq, seq, level } = params
+    const { seq } = params
     const seqMethod = seqOpts.seqMethod
-    return [UtilTools.formatText(seqMethod ? seqMethod(params) : level ? `${$seq}.${seq}` : (seqOpts.startIndex) + seq, 1)]
+    return [UtilTools.formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)]
   },
   renderTreeIndexCell (h, params) {
-    return Cell.renderTreeIcon(h, params, Cell.renderIndexCell(h, params))
+    return Cell.renderTreeIcon(h, params, Cell.renderSeqCell(h, params))
   },
 
   /**
@@ -350,7 +350,7 @@ export const Cell = {
   /**
    * 多选
    */
-  renderSelectionHeader (h, params) {
+  renderCheckboxHeader (h, params) {
     const { $table, column, isHidden } = params
     const { isIndeterminate: isAllCheckboxIndeterminate, isAllCheckboxDisabled } = $table
     const { slots } = column
@@ -409,7 +409,7 @@ export const Cell = {
       ] : []))
     ])
   },
-  renderSelectionCell (h, params) {
+  renderCheckboxCell (h, params) {
     const { $table, row, column, isHidden } = params
     const { treeConfig, treeIndeterminates } = $table
     const { labelField, checkMethod, visibleMethod } = $table.checkboxOpts
@@ -474,9 +474,9 @@ export const Cell = {
     ]
   },
   renderTreeSelectionCell (h, params) {
-    return Cell.renderTreeIcon(h, params, Cell.renderSelectionCell(h, params))
+    return Cell.renderTreeIcon(h, params, Cell.renderCheckboxCell(h, params))
   },
-  renderSelectionCellByProp (h, params) {
+  renderCheckboxCellByProp (h, params) {
     const { $table, row, column, isHidden } = params
     const { treeConfig, treeIndeterminates } = $table
     const { labelField, checkField: property, halfField, checkMethod, visibleMethod } = $table.checkboxOpts
@@ -541,7 +541,7 @@ export const Cell = {
     ]
   },
   renderTreeSelectionCellByProp (h, params) {
-    return Cell.renderTreeIcon(h, params, Cell.renderSelectionCellByProp(h, params))
+    return Cell.renderTreeIcon(h, params, Cell.renderCheckboxCellByProp(h, params))
   },
 
   /**

package/packages/table/src/methods.js

@@ -3,7 +3,7 @@ import GlobalConfig from '../../v-x-e-table/src/conf'
 import Cell from './cell'
 import VXETable from '../../v-x-e-table'
 import { UtilTools, DomTools } from '../../tools'
-import { clearTableAllStatus, handleFieldOrColumn, restoreScrollLocation, restoreScrollListener } from './util'
+import { clearTableAllStatus, handleFieldOrColumn, restoreScrollLocation, restoreScrollListener, toTreePathSeq } from './util'
 import { eqEmptyValue, isEnableConf } from '../../tools/src/utils'
 import { browse, getPaddingTopBottomSize, setScrollTop, setScrollLeft } from '../../tools/src/dom'
 import { formats } from '../../v-x-e-table/src/formats'
@@ -301,9 +301,33 @@ 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 { treeConfig, scrollYLoad, scrollYStore, fullDataRowIdData, treeExpandeds, treeOpts } = this
+    let fullList = []
+    // 是否进行数据处理
+    if (force) {
+      this.updateAfterFullData()
+    }
+    // 如果为虚拟树，将树结构拍平
+    if (treeConfig && treeOpts.transform) {
+      const expandMaps = new Map()
+      XEUtils.eachTree(this.afterTreeFullData, (row, index, items, path, parent) => {
+        if (!parent || (expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1)) {
+          expandMaps.set(row, 1)
+          fullList.push(row)
+        }
+      }, { children: treeOpts.mapChildren })
+    } else {
+      fullList = this.afterFullData
+    }
+    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 +358,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 +391,7 @@ const Methods = {
     this.scrollYLoad = sYLoad
     // 全量数据
     this.tableFullData = fullData
-    this.treeFullData = treeData
+    this.tableFullTreeData = treeData
     // 缓存数据
     this.cacheRowMap(true)
     // 原始数据
@@ -530,12 +565,14 @@ 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
     const handleCache = (row, index, items, path, parent, nodes) => {
       let rowid = getRowid(this, row)
+      const seq = treeConfig && path ? toTreePathSeq(path) : index + 1
+      const level = nodes ? nodes.length - 1 : 0
       if (eqEmptyValue(rowid)) {
         rowid = getRowUniqueId()
         XEUtils.set(row, rowkey, rowid)
@@ -543,7 +580,7 @@ const Methods = {
       if (isLazy && row[treeOpts.hasChild] && XEUtils.isUndefined(row[treeOpts.children])) {
         row[treeOpts.children] = null
       }
-      const rest = { row, rowid, index: treeConfig && parent ? -1 : index, items, parent, level: nodes ? nodes.length - 1 : 0 }
+      const rest = { row, rowid, seq, index: treeConfig && parent ? -1 : index, _index: -1, $index: -1, items, parent, level }
       if (source) {
         fullDataRowIdData[rowid] = rest
         fullDataRowMap.set(row, rest)
@@ -558,7 +595,7 @@ const Methods = {
     fullAllDataRowIdData = this.fullAllDataRowIdData = {}
     fullAllDataRowMap.clear()
     if (treeConfig) {
-      XEUtils.eachTree(tableFullData, handleCache, treeOpts)
+      XEUtils.eachTree(tableFullTreeData, handleCache, treeOpts)
     } else {
       tableFullData.forEach(handleCache)
     }
@@ -578,7 +615,7 @@ const Methods = {
       }
       XEUtils.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
         const rowid = getRowid(this, childRow)
-        const rest = { row: childRow, rowid, index: -1, items, parent, level: parentLevel + nodes.length }
+        const rest = { row: childRow, rowid, seq: -1, index: -1, _index: -1, $index: -1, items, parent, level: parentLevel + nodes.length }
         fullDataRowIdData[rowid] = rest
         fullDataRowMap.set(childRow, rest)
         fullAllDataRowIdData[rowid] = rest
@@ -724,6 +761,21 @@ const Methods = {
     }
     return null
   },
+  /**
+   * 根据 row 获取序号
+   * @param {Row} row 行对象
+   */
+  getRowSeq (row) {
+    const { fullDataRowIdData } = this
+    if (row) {
+      const rowid = getRowid(this, row)
+      const rest = fullDataRowIdData[rowid]
+      if (rest) {
+        return rest.seq
+      }
+    }
+    return -1
+  },
   /**
    * 根据 row 获取相对于 data 中的索引
    * @param {Row} row 行对象
@@ -1061,10 +1113,12 @@ const Methods = {
    * 如果存在筛选条件，继续处理
    */
   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 => {
@@ -1087,7 +1141,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
@@ -1108,7 +1162,16 @@ const Methods = {
           }
           return true
         })
-      })
+      }
+      if (treeConfig && transform) {
+        tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, { ...treeOpts, original: true })
+      } else {
+        tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter)
+        tableTree = tableData
+      }
+    } else {
+      tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0)
+      tableTree = tableData
     }
     const firstOrderColumn = orderColumns[0]
     if (!allRemoteSort && firstOrderColumn) {
@@ -1128,9 +1191,52 @@ const Methods = {
           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, afterTreeFullData, treeOpts } = this
+    if (treeConfig) {
+      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
+        }
+        if (fullrest) {
+          fullrest.seq = seq
+        } 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)
+    } 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
+        }
+        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 }
+        }
+      })
+    }
   },
   /**
    * 根据行的唯一主键获取行
@@ -2097,7 +2203,7 @@ const Methods = {
    * 表格键盘事件
    */
   keydownEvent (evnt) {
-    const { filterStore, ctxMenuStore, editStore, keyboardConfig, mouseConfig, mouseOpts } = this
+    const { filterStore, ctxMenuStore, editStore, keyboardConfig, mouseConfig, mouseOpts, keyboardOpts } = this
     const { actived } = editStore
     const { keyCode } = evnt
     const isEsc = keyCode === 27
@@ -2110,13 +2216,15 @@ const Methods = {
           // 如果按下了 Esc 键，关闭快捷菜单、筛选
           this.closeFilter()
           this.closeMenu()
-          // 如果是激活编辑状态，则取消编辑
-          if (actived.row) {
-            const params = actived.args
-            this.clearActived(evnt)
-            // 如果配置了选中功能，则为选中状态
-            if (mouseConfig && mouseOpts.selected) {
-              this.$nextTick(() => this.handleSelected(params, evnt))
+          if (keyboardConfig && keyboardOpts.isEsc) {
+            // 如果是激活编辑状态，则取消编辑
+            if (actived.row) {
+              const params = actived.args
+              this.clearActived(evnt)
+              // 如果配置了选中功能，则为选中状态
+              if (mouseConfig && mouseOpts.selected) {
+                this.$nextTick(() => this.handleSelected(params, evnt))
+              }
             }
           }
         }
@@ -2923,6 +3031,16 @@ const Methods = {
     const { fullDataRowIdData, afterFullData, checkboxReserveRowMap, checkboxOpts, treeConfig, treeOpts } = this
     const reserveSelection = []
     if (checkboxOpts.reserve) {
+      const afterFullIdMaps = {}
+      if (treeConfig) {
+        XEUtils.eachTree(afterFullData, row => {
+          afterFullIdMaps[getRowid(this, row)] = 1
+        }, treeOpts)
+      } else {
+        afterFullData.forEach(row => {
+          afterFullIdMaps[getRowid(this, row)] = 1
+        })
+      }
       XEUtils.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
         if (oldRow) {
           if (isFull) {
@@ -2930,14 +3048,8 @@ const Methods = {
               reserveSelection.push(oldRow)
             }
           } else {
-            if (treeConfig) {
-              if (!XEUtils.findTree(afterFullData, row => getRowid(this, row) === oldRowid, treeOpts)) {
-                reserveSelection.push(oldRow)
-              }
-            } else {
-              if (!afterFullData.some(row => getRowid(this, row) === oldRowid)) {
-                reserveSelection.push(oldRow)
-              }
+            if (!afterFullIdMaps[oldRowid]) {
+              reserveSelection.push(oldRow)
             }
           }
         }
@@ -3690,7 +3802,7 @@ const Methods = {
         return this.handleAsyncTreeExpandChilds(row)
       }).then(() => {
         if (transform) {
-          return this.updateVirtualTreeData()
+          return this.handleTableData()
         }
       }).then(() => {
         return this.recalculate()
@@ -3836,23 +3948,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
@@ -3861,7 +3956,7 @@ const Methods = {
    */
   handleVirtualTreeExpand (rows, expanded) {
     return this.handleBaseTreeExpand(rows, expanded).then(() => {
-      return this.updateVirtualTreeData()
+      return this.handleTableData()
     }).then(() => {
       return this.recalculate()
     })
@@ -3909,7 +4004,7 @@ const Methods = {
     if (reserve) {
       XEUtils.eachTree(tableFullData, row => this.handleTreeExpandReserve(row, false), treeOpts)
     }
-    return this.updateVirtualTreeData().then(() => {
+    return this.handleTableData().then(() => {
       if (isExists) {
         this.recalculate()
       }
@@ -4418,7 +4513,7 @@ const Methods = {
 }
 
 // Module methods
-const funcs = 'setFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,clearCopyCellArea,setCellAreas,openFind,openReplace,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,clearCopyCellArea,setCellAreas,openFind,openReplace,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
 
 funcs.forEach(name => {
   Methods[name] = function (...args) {

package/packages/table/src/table.js

@@ -114,15 +114,15 @@ export default {
     footerAlign: { type: String, default: () => GlobalConfig.table.footerAlign },
     // 是否显示表头
     showHeader: { type: Boolean, default: () => GlobalConfig.table.showHeader },
-    // 是否要高亮当前选中行
+    // （即将废弃）是否要高亮当前选中行
     highlightCurrentRow: { type: Boolean, default: () => GlobalConfig.table.highlightCurrentRow },
-    // 鼠标移到行是否要高亮显示
+    // （即将废弃）鼠标移到行是否要高亮显示
     highlightHoverRow: { type: Boolean, default: () => GlobalConfig.table.highlightHoverRow },
-    // 是否要高亮当前选中列
+    // （即将废弃）是否要高亮当前选中列
     highlightCurrentColumn: { type: Boolean, default: () => GlobalConfig.table.highlightCurrentColumn },
-    // 鼠标移到列是否要高亮显示
+    // （即将废弃）鼠标移到列是否要高亮显示
     highlightHoverColumn: { type: Boolean, default: () => GlobalConfig.table.highlightHoverColumn },
-    // 激活单元格编辑时是否高亮显示
+    // （即将废弃）激活单元格编辑时是否高亮显示
     highlightCell: Boolean,
     // 是否显示表尾合计
     showFooter: Boolean,
@@ -235,7 +235,7 @@ export default {
     scrollX: Object,
     // 纵向虚拟滚动配置项
     scrollY: Object,
-    // 优化相关
+    // （即将废弃）优化相关
     animat: { type: Boolean, default: () => GlobalConfig.table.animat },
     delayHover: { type: Number, default: () => GlobalConfig.table.delayHover },
     // 额外的参数

package/packages/table/src/util.js

@@ -20,6 +20,10 @@ export function restoreScrollLocation (_vm, scrollLeft, scrollTop) {
   })
 }
 
+export function toTreePathSeq (path) {
+  return path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('')
+}
+
 export function removeScrollListener (scrollElem) {
   if (scrollElem && scrollElem._onscroll) {
     scrollElem.onscroll = null

package/packages/tools/src/dom.js

@@ -204,14 +204,9 @@ export const DomTools = {
     }
   },
   triggerEvent (targetElem, type) {
-    let evnt
-    if (typeof Event === 'function') {
-      evnt = new Event(type)
-    } else {
-      evnt = document.createEvent('Event')
-      evnt.initEvent(type, true, true)
+    if (targetElem) {
+      targetElem.dispatchEvent(new Event(type))
     }
-    targetElem.dispatchEvent(evnt)
   },
   calcHeight ($xetable, key) {
     const val = $xetable[key]

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

@@ -11,6 +11,7 @@ export default {
     showHeader: true,
     animat: true,
     delayHover: 250,
+    autoResize: true,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,
@@ -18,7 +19,6 @@ export default {
     // resizeInterval: 500,
     // size: null,
     // zIndex: null,
-    // autoResize: false,
     // stripe: false,
     // border: false,
     // round: false,
@@ -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
     },
@@ -91,6 +92,9 @@ export default {
     mouseConfig: {
       extension: true
     },
+    keyboardConfig: {
+      isEsc: true
+    },
     areaConfig: {
       selectCellByHeader: true
     },