vxe-table 3.11.13 → 3.11.15

package/es/table/src/body.js

@@ -280,12 +280,12 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
 }
 function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, showOverflow: allColumnOverflow, treeConfig, treeOpts, expandOpts, editOpts, treeExpandedMaps, scrollYLoad, rowExpandedMaps, radioOpts, checkboxOpts, expandColumn, hasFixedColumn, fullAllDataRowIdData, rowOpts, pendingRowList, pendingRowMaps, columnOpts, isDragColMove } = $xeTable;
+    const { transform, seqMode } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const rows = [];
     tableData.forEach((row, $rowIndex) => {
         const trOn = {};
         let rowIndex = $rowIndex;
-        const _rowIndex = $xeTable.getVTRowIndex(row);
         // 确保任何情况下 rowIndex 都精准指向真实 data 索引
         rowIndex = $xeTable.getRowIndex(row);
         // 当前行事件
@@ -305,8 +305,19 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         }
         const rowid = getRowid($xeTable, row);
         const rest = fullAllDataRowIdData[rowid];
-        const rowLevel = rest ? rest.level : 0;
-        const seq = rest ? rest.seq : -1;
+        let rowLevel = 0;
+        let seq = -1;
+        let _rowIndex = 0;
+        if (rest) {
+            rowLevel = rest.level;
+            if (treeConfig && transform && seqMode === 'increasing') {
+                seq = rest._index + 1;
+            }
+            else {
+                seq = rest.seq;
+            }
+            _rowIndex = rest._index;
+        }
         const params = { $table: $xeTable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex };
         // 行是否被展开
         const isExpandRow = expandColumn && !!rowExpandedMaps[rowid];
@@ -338,7 +349,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
             'vxe-body--row',
             treeConfig ? `row--level-${rowLevel}` : '',
             {
-                'row--stripe': stripe && ($xeTable.getVTRowIndex(row) + 1) % 2 === 0,
+                'row--stripe': stripe && (_rowIndex + 1) % 2 === 0,
                 'is--new': isNewRow,
                 'is--expand-row': isExpandRow,
                 'is--expand-tree': isExpandTree,

package/es/table/src/methods.js

@@ -481,16 +481,15 @@ function handleRecalculateLayout($xeTable, reFull) {
     }
     $xeTable.calcCellWidth();
     $xeTable.autoCellWidth();
-    if (reFull === true) {
-        // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
-        return $xeTable.computeScrollLoad().then(() => {
+    return $xeTable.computeScrollLoad().then(() => {
+        if (reFull === true) {
+            // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
             calcCellHeight($xeTable);
             $xeTable.calcCellWidth();
             $xeTable.autoCellWidth();
             return $xeTable.computeScrollLoad();
-        });
-    }
-    return $xeTable.computeScrollLoad();
+        }
+    });
 }
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
     const reactData = $xeTable;
@@ -1674,6 +1673,9 @@ const Methods = {
      * @returns
      */
     handleVirtualTreeToList() {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { fullAllDataRowIdData } = internalData;
         const { treeOpts, treeConfig, treeExpandedMaps, afterTreeFullData, afterFullData } = this;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         if (treeConfig && treeOpts.transform) {
@@ -1683,6 +1685,10 @@ const Methods = {
                 const rowid = getRowid(this, row);
                 const parentRowid = getRowid(this, parent);
                 if (!parent || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
+                    const rowRest = fullAllDataRowIdData[rowid];
+                    if (rowRest) {
+                        rowRest._index = fullData.length;
+                    }
                     expandMaps[rowid] = 1;
                     fullData.push(row);
                 }
@@ -1825,17 +1831,46 @@ const Methods = {
         this.afterTreeFullData = tableTree;
         this.updateAfterDataIndex();
     },
+    updateTreeDataIndex() {
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { afterFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
+        if (treeConfig) {
+            if (treeOpts.transform) {
+                afterFullData.forEach((row, index) => {
+                    const rowid = getRowid($xeTable, row);
+                    const rowRest = fullAllDataRowIdData[rowid];
+                    if (rowRest) {
+                        rowRest._index = index;
+                    }
+                    else {
+                        const rest = { row, rowid, seq: '-1', index: -1, $index: -1, _index: index, items: [], parent: null, level: 0, height: 0 };
+                        fullAllDataRowIdData[rowid] = rest;
+                        fullDataRowIdData[rowid] = rest;
+                    }
+                });
+            }
+        }
+    },
     /**
      * 预编译
      * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
      */
     updateAfterDataIndex() {
-        const { treeConfig, afterFullData, fullDataRowIdData, fullAllDataRowIdData, afterTreeFullData, treeOpts } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { afterFullData, fullDataRowIdData, fullAllDataRowIdData, afterTreeFullData } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const fullMaps = {};
         if (treeConfig) {
             XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
-                const rowid = getRowid(this, row);
+                const rowid = getRowid($xeTable, row);
                 const rowRest = fullAllDataRowIdData[rowid];
                 const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
                 if (rowRest) {
@@ -1849,10 +1884,11 @@ const Methods = {
                 }
                 fullMaps[rowid] = row;
             }, { children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField });
+            $xeTable.updateTreeDataIndex();
         }
         else {
             afterFullData.forEach((row, index) => {
-                const rowid = getRowid(this, row);
+                const rowid = getRowid($xeTable, row);
                 const rowRest = fullAllDataRowIdData[rowid];
                 const seq = index + 1;
                 if (rowRest) {
@@ -1869,10 +1905,40 @@ const Methods = {
         }
         this.afterFullRowMaps = fullMaps;
     },
+    /**
+     * 只对 tree-config 有效，获取行的子级
+     */
+    getTreeRowChildren(rowOrRowid) {
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { fullDataRowIdData } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const { transform, mapChildrenField } = treeOpts;
+        const childrenField = treeOpts.children || treeOpts.childrenField;
+        if (rowOrRowid && treeConfig) {
+            let rowid;
+            if (XEUtils.isString(rowOrRowid)) {
+                rowid = rowOrRowid;
+            }
+            else {
+                rowid = getRowid($xeTable, rowOrRowid);
+            }
+            if (rowid) {
+                const rest = fullDataRowIdData[rowid];
+                const row = rest ? rest.row : null;
+                if (row) {
+                    return row[transform ? mapChildrenField : childrenField] || [];
+                }
+            }
+        }
+        return [];
+    },
     /**
      * 只对 tree-config 有效，获取行的父级
      */
-    getParentRow(rowOrRowid) {
+    getTreeParentRow(rowOrRowid) {
         const { treeConfig, fullDataRowIdData } = this;
         if (rowOrRowid && treeConfig) {
             let rowid;
@@ -1889,6 +1955,11 @@ const Methods = {
         }
         return null;
     },
+    getParentRow(rowOrRowid) {
+        const $xeTable = this;
+        warnLog('vxe.error.delFunc', ['getParentRow', 'getTreeParentRow']);
+        return $xeTable.getTreeParentRow(rowOrRowid);
+    },
     /**
      * 根据行的唯一主键获取行
      * @param {String/Number} rowid 行主键
@@ -5807,7 +5878,9 @@ const Methods = {
                             }
                             return this.$nextTick().then(() => {
                                 if (transform) {
-                                    return this.handleTableData();
+                                    this.handleTableData();
+                                    this.updateTreeDataIndex();
+                                    return this.$nextTick();
                                 }
                             });
                         });
@@ -5907,7 +5980,9 @@ const Methods = {
             validRows.forEach((row) => this.handleTreeExpandReserve(row, expanded));
         }
         this.treeExpandedMaps = treeTempExpandedMaps;
-        return Promise.all(result).then(this.recalculate);
+        return Promise.all(result).then(() => {
+            return this.recalculate();
+        });
     },
     /**
      * 虚拟树的展开与收起
@@ -5918,9 +5993,14 @@ const Methods = {
     handleVirtualTreeExpand(rows, expanded) {
         return this.handleBaseTreeExpand(rows, expanded).then(() => {
             this.handleVirtualTreeToList();
-            return this.handleTableData();
+            this.handleTableData();
+            this.updateTreeDataIndex();
         }).then(() => {
             return this.recalculate();
+        }).then(() => {
+            setTimeout(() => {
+                this.updateCellAreas();
+            }, 30);
         });
     },
     /**

package/es/table/src/table.js

@@ -849,7 +849,7 @@ export default {
             if (this.showFooter && !(this.footerMethod || this.footerData)) {
                 warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
             }
-            if (treeConfig && this.stripe) {
+            if (treeConfig && !treeOpts.transform && this.stripe) {
                 warnLog('vxe.error.noTree', ['stripe']);
             }
             if (this.tooltipOpts.enabled) {
@@ -887,7 +887,10 @@ export default {
             if (this.rowOpts.height && !this.showOverflow) {
                 warnLog('vxe.error.notProp', ['table.show-overflow']);
             }
-            if (!this.handleRecalculateCellAreas) {
+            if (!this.handleMousedownCellAreaEvent) {
+                if (this.areaConfig) {
+                    warnLog('vxe.error.notProp', ['area-config']);
+                }
                 if (this.clipConfig) {
                     warnLog('vxe.error.notProp', ['clip-config']);
                 }
@@ -914,7 +917,7 @@ export default {
             // if (this.mouseOpts.area && this.checkboxOpts.range) {
             //   warnLog('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range'])
             // }
-            if (this.treeConfig && this.mouseOpts.area) {
+            if (this.mouseOpts.area && (this.treeConfig && !treeOpts.transform)) {
                 errLog('vxe.error.noTree', ['mouse-config.area']);
             }
         }
@@ -1025,7 +1028,7 @@ export default {
             const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
             $xeTable.$nextTick(() => {
                 if (props.loading) {
-                    if (!VxeUILoadingComponent) {
+                    if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
                         errLog('vxe.error.reqComp', ['vxe-loading']);
                     }
                 }
@@ -1280,8 +1283,13 @@ export default {
                         value: currLoading,
                         icon: loadingOpts.icon,
                         text: loadingOpts.text
-                    }
-                }, $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, loading: currLoading }, h))
+                    },
+                    scopedSlots: loadingSlot
+                        ? {
+                            default: () => $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, loading: currLoading }, h)
+                        }
+                        : {}
+                })
                 : loadingSlot
                     ? h('div', {
                         class: ['vxe-loading--custom-wrapper', {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.11.13";
+export const version = "3.11.15";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.11.13"}`;
+const version = `table v${"3.11.15"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);