vxe-table 4.1.10 → 4.1.13

package/packages/table/src/body.ts

@@ -294,7 +294,7 @@ export default defineComponent({
     const renderRows = (fixedType: any, tableData: any, tableColumn: any) => {
       const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, showOverflow: allColumnOverflow, editConfig, treeConfig } = tableProps
       const { hasFixedColumn, treeExpandeds, scrollYLoad, editStore, rowExpandeds, expandColumn, selectRow } = tableReactData
-      const { fullDataRowIdData } = tableInternalData
+      const { fullAllDataRowIdData } = tableInternalData
       const checkboxOpts = computeCheckboxOpts.value
       const radioOpts = computeRadioOpts.value
       const treeOpts = computeTreeOpts.value
@@ -324,7 +324,7 @@ export default defineComponent({
           }
         }
         const rowid = getRowid($xetable, row)
-        const rest = fullDataRowIdData[rowid]
+        const rest = fullAllDataRowIdData[rowid]
         let rowLevel = 0
         let seq: string | number = -1
         if (rest) {

package/packages/table/src/table.ts

@@ -1146,41 +1146,57 @@ export default defineComponent({
         XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
           const rowid = getRowid($xetable, 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
           }
-        }, treeOpts)
+        }, { children: treeOpts.mapChildren })
       } else {
         afterFullData.forEach((row, index) => {
           const rowid = getRowid($xetable, 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
           }
         })
       }
     }
 
+    /**
+     * 如果为虚拟树，将树结构拍平
+     * @returns
+     */
+    const handleVirtualTreeToList = () => {
+      const { treeConfig } = props
+      const { treeExpandeds } = reactData
+      const treeOpts = computeTreeOpts.value
+      if (treeConfig && treeOpts.transform) {
+        const fullData: any = []
+        const expandMaps: Map<any, number> = new Map()
+        XEUtils.eachTree(internalData.afterTreeFullData, (row, index, items, path, parent) => {
+          if (!parent || (expandMaps.has(parent) && $xetable.findRowIndexOf(treeExpandeds, parent) > -1)) {
+            expandMaps.set(row, 1)
+            fullData.push(row)
+          }
+        }, { children: treeOpts.mapChildren })
+        internalData.afterFullData = fullData
+        updateScrollYStatus(fullData)
+        return fullData
+      }
+      return internalData.afterFullData
+    }
+
     /**
      * 获取处理后全量的表格数据
      * 如果存在筛选条件，继续处理
@@ -1252,6 +1268,7 @@ export default defineComponent({
             })
           }
           if (treeConfig && transform) {
+            // 筛选虚拟树
             tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, { ...treeOpts, original: true })
             tableData = tableTree
           } else {
@@ -1259,8 +1276,14 @@ export default defineComponent({
             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
+          }
         }
 
         // 处理排序（不能用于树形结构）
@@ -2266,6 +2289,7 @@ export default defineComponent({
      */
     const handleVirtualTreeExpand = (rows: any[], expanded: boolean) => {
       return handleBaseTreeExpand(rows, expanded).then(() => {
+        handleVirtualTreeToList()
         return tablePrivateMethods.handleTableData()
       }).then(() => {
         return tableMethods.recalculate()
@@ -2299,10 +2323,10 @@ export default defineComponent({
 
     const createGetRowCacheProp = (prop: 'seq' | 'index' | '_index' | '$index') => {
       return function (row: any) {
-        const { fullDataRowIdData } = internalData
+        const { fullAllDataRowIdData } = internalData
         if (row) {
           const rowid = getRowid($xetable, row)
-          const rest = fullDataRowIdData[rowid]
+          const rest = fullAllDataRowIdData[rowid]
           if (rest) {
             return rest[prop]
           }
@@ -3573,12 +3597,16 @@ export default defineComponent({
         const { treeExpandeds } = reactData
         const { fullAllDataRowIdData } = internalData
         const treeOpts = computeTreeOpts.value
-        const { lazy } = treeOpts
+        const { transform, lazy } = treeOpts
         const rest = fullAllDataRowIdData[getRowid($xetable, row)]
         if (lazy && rest) {
           rest.treeLoaded = false
           XEUtils.remove(treeExpandeds, item => $xetable.eqRow(item, row))
         }
+        if (transform) {
+          handleVirtualTreeToList()
+          return tablePrivateMethods.handleTableData()
+        }
         return nextTick()
       },
       /**
@@ -3622,7 +3650,7 @@ export default defineComponent({
       setAllTreeExpand (expanded: boolean) {
         const { tableFullData } = internalData
         const treeOpts = computeTreeOpts.value
-        const { lazy, children } = treeOpts
+        const { transform, lazy, children } = treeOpts
         const expandeds: any[] = []
         XEUtils.eachTree(tableFullData, (row) => {
           const rowChildren = row[children]
@@ -3630,7 +3658,12 @@ export default defineComponent({
             expandeds.push(row)
           }
         }, treeOpts)
-        return tableMethods.setTreeExpand(expandeds, expanded)
+        return tableMethods.setTreeExpand(expandeds, expanded).then(() => {
+          if (transform) {
+            handleVirtualTreeToList()
+            return tableMethods.recalculate()
+          }
+        })
       },
       /**
        * 设置展开树形节点，二个参数设置这一行展开与否
@@ -3672,13 +3705,16 @@ export default defineComponent({
         const { treeExpandeds } = reactData
         const { tableFullTreeData } = internalData
         const treeOpts = computeTreeOpts.value
-        const { reserve } = treeOpts
+        const { transform, reserve } = treeOpts
         const isExists = treeExpandeds.length
         reactData.treeExpandeds = []
         if (reserve) {
           XEUtils.eachTree(tableFullTreeData, row => handleTreeExpandReserve(row, false), treeOpts)
         }
         return tablePrivateMethods.handleTableData().then(() => {
+          if (transform) {
+            handleVirtualTreeToList()
+          }
           if (isExists) {
             tableMethods.recalculate()
           }
@@ -4491,27 +4527,15 @@ export default defineComponent({
         return record
       },
       handleTableData (force?: boolean) {
-        const { treeConfig } = props
         const { scrollYLoad } = reactData
         const { scrollYStore, fullDataRowIdData } = internalData
-        const { treeExpandeds } = reactData
-        const treeOpts = computeTreeOpts.value
-        let fullList: any[] = []
+        let fullList: any[] = internalData.afterFullData
         // 是否进行数据处理
         if (force) {
+          // 更新数据，处理筛选和排序
           updateAfterFullData()
-        }
-        // 如果为虚拟树，将树结构拍平
-        if (treeConfig && treeOpts.transform) {
-          const expandMaps: Map<any, number> = new Map()
-          XEUtils.eachTree(internalData.afterTreeFullData, (row, index, items, path, parent) => {
-            if (!parent || (expandMaps.has(parent) && $xetable.findRowIndexOf(treeExpandeds, parent) > -1)) {
-              expandMaps.set(row, 1)
-              fullList.push(row)
-            }
-          }, { children: treeOpts.mapChildren })
-        } else {
-          fullList = internalData.afterFullData
+          // 如果为虚拟树，将树结构拍平
+          fullList = handleVirtualTreeToList()
         }
         const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0)
         tableData.forEach((row, $index) => {

package/packages/validator/src/hook.ts

@@ -149,7 +149,7 @@ const validatorHook: VxeGlobalHooksHandles.HookOptions = {
           const ruleProps = Object.keys(validRest)
           return nextTick().then(() => {
             if (ruleProps.length) {
-              return validRest[ruleProps[0]][0]
+              return Promise.reject(validRest[ruleProps[0]][0])
             }
             if (cb) {
               cb()