vxe-table 3.4.7-beta.2 → 3.4.10-beta.0

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/table/src/body.js

@@ -12,10 +12,20 @@ function isOperateMouse ($xetable) {
   return $xetable._isResize || ($xetable.lastScrollTime && Date.now() < $xetable.lastScrollTime + $xetable.delayHover)
 }
 
-function renderLine (h, _vm, $xetable, rowLevel, items, params) {
-  const column = params.column
-  const { treeOpts, treeConfig } = $xetable
+function renderLine (h, _vm, $xetable, params) {
+  const { row, column } = params
+  const { treeOpts, treeConfig, fullAllDataRowIdData } = $xetable
   const { slots, treeNode } = column
+  const rowid = UtilTools.getRowid($xetable, row)
+  const rest = fullAllDataRowIdData[rowid]
+  let rLevel = 0
+  let rIndex = 0
+  let items = []
+  if (rest) {
+    rLevel = rest.level
+    rIndex = rest._index
+    items = rest.items
+  }
   if (slots && slots.line) {
     return $xetable.callSlot(slots.line, params, h)
   }
@@ -27,8 +37,8 @@ function renderLine (h, _vm, $xetable, rowLevel, items, params) {
         h('div', {
           class: 'vxe-tree--line',
           style: {
-            height: `${calcTreeLine(params, items)}px`,
-            left: `${(rowLevel * treeOpts.indent) + (rowLevel ? 2 - getOffsetSize($xetable) : 0) + 16}px`
+            height: `${calcTreeLine(params, items, rIndex)}px`,
+            left: `${(rLevel * treeOpts.indent) + (rLevel ? 2 - getOffsetSize($xetable) : 0) + 16}px`
           }
         })
       ])
@@ -213,7 +223,7 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
   } else {
     // 渲染单元格
     tdVNs.push(
-      ...renderLine(h, _vm, $xetable, rowLevel, items, params),
+      ...renderLine(h, _vm, $xetable, params),
       h('div', {
         class: ['vxe-cell', {
           'c--title': showTitle,
@@ -286,7 +296,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     checkboxOpts,
     expandColumn,
     hasFixedColumn,
-    fullDataRowIdData,
+    fullAllDataRowIdData,
     rowOpts
   } = $xetable
   const rows = []
@@ -312,7 +322,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
       }
     }
     const rowid = UtilTools.getRowid($xetable, row)
-    const rest = fullDataRowIdData[rowid]
+    const rest = fullAllDataRowIdData[rowid]
     const rowLevel = rest ? rest.level : 0
     const seq = rest ? rest.seq : -1
     const params = { $table: $xetable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex }

package/packages/table/src/methods.js

@@ -283,7 +283,7 @@ const Methods = {
     return clearTableAllStatus(this)
   },
   /**
-   * 同步 data 数据
+   * 同步 data 数据（即将废弃）
    * 如果用了该方法，那么组件将不再记录增删改的状态，只能自行实现对应逻辑
    * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
    */
@@ -301,23 +301,14 @@ const Methods = {
     return this.handleTableData(true).then(this.updateFooter).then(this.recalculate)
   },
   handleTableData (force) {
-    const { treeConfig, scrollYLoad, scrollYStore, fullDataRowIdData, treeExpandeds, treeOpts } = this
-    let fullList = []
+    const { scrollYLoad, scrollYStore, fullDataRowIdData, afterFullData } = this
+    let fullList = afterFullData
     // 是否进行数据处理
     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
+      // 如果为虚拟树，将树结构拍平
+      fullList = this.handleVirtualTreeToList()
     }
     const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0)
     tableData.forEach((row, $index) => {
@@ -1111,6 +1102,27 @@ 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
+  },
   /**
    * 获取处理后全量的表格数据
    * 如果存在筛选条件，继续处理
@@ -1167,34 +1179,53 @@ const Methods = {
         })
       }
       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 {
-      tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0)
-      tableTree = tableData
+      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
       }
-      tableTree = tableData
     }
     this.afterFullData = tableData
     this.afterTreeFullData = tableTree
@@ -1210,33 +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
-        }
-        if (fullrest) {
-          fullrest.seq = seq
+          allrest._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
         }
-      }, treeOpts)
+      }, { 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
-        }
-        if (fullrest) {
-          fullrest.seq = seq
-          fullrest._index = index
+          allrest._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
         }
       })
     }
@@ -3785,12 +3811,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()
   },
   /**
@@ -3805,6 +3835,7 @@ const Methods = {
         return this.handleAsyncTreeExpandChilds(row)
       }).then(() => {
         if (transform) {
+          this.handleVirtualTreeToList()
           return this.handleTableData()
         }
       }).then(() => {
@@ -3967,6 +3998,7 @@ const Methods = {
    */
   handleVirtualTreeExpand (rows, expanded) {
     return this.handleBaseTreeExpand(rows, expanded).then(() => {
+      this.handleVirtualTreeToList()
       return this.handleTableData()
     }).then(() => {
       return this.recalculate()
@@ -4009,13 +4041,18 @@ 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.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) {

package/packages/validator/src/mixin.js

@@ -1,4 +1,5 @@
 import XEUtils from 'xe-utils'
+import GlobalConfig from '../../v-x-e-table/src/conf'
 import { UtilTools, DomTools } from '../../tools'
 import { eqEmptyValue } from '../../tools/src/utils'
 
@@ -151,21 +152,26 @@ 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()
             }
           })
         }).catch(firstErrParams => {
-          return new Promise((resolve) => {
+          return new Promise((resolve, reject) => {
             const finish = () => {
               this.$nextTick(() => {
                 if (cb) {
                   cb(validRest)
                   resolve()
                 } else {
-                  resolve(validRest)
+                  if (GlobalConfig.validToReject) {
+                    // 已废弃，校验失败将不会执行catch
+                    reject(validRest)
+                  } else {
+                    resolve(validRest)
+                  }
                 }
               })
             }

package/types/table.d.ts

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