vxe-table 4.10.6-beta.5 → 4.10.6-beta.7

package/es/table/src/table.js

@@ -1455,7 +1455,7 @@ export default defineComponent({
                     rowRest._index = index;
                 }
                 else {
-                    const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0, height: 0, oTop: 0 };
+                    const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, treeIndex: -1, items: [], parent: null, level: 0, height: 0, oTop: 0 };
                     fullAllDataRowIdData[rowid] = rest;
                     fullDataRowIdData[rowid] = rest;
                 }
@@ -1475,29 +1475,23 @@ export default defineComponent({
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const fullMaps = {};
             if (treeConfig) {
-                if (transform) {
-                    updateAfterListIndex();
-                }
-                else {
-                    XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
-                        const rowid = getRowid($xeTable, row);
-                        const rowRest = fullAllDataRowIdData[rowid];
-                        const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
-                        if (rowRest) {
-                            rowRest.seq = seq;
-                            if (!transform) {
-                                rowRest._index = index;
-                            }
-                        }
-                        else {
-                            const rest = { row, rowid, seq, index: -1, $index: -1, _index: -1, items: [], parent: null, level: 0, height: 0, oTop: 0 };
-                            fullAllDataRowIdData[rowid] = rest;
-                            fullDataRowIdData[rowid] = rest;
-                        }
-                        fullMaps[rowid] = row;
-                    }, { children: transform ? treeOpts.mapChildrenField : childrenField });
-                    internalData.afterFullRowMaps = fullMaps;
-                }
+                XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
+                    const rowid = getRowid($xeTable, row);
+                    const rowRest = fullAllDataRowIdData[rowid];
+                    const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
+                    if (rowRest) {
+                        rowRest.seq = seq;
+                        rowRest.treeIndex = index;
+                    }
+                    else {
+                        const rest = { row, rowid, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, items: [], parent: null, level: 0, height: 0, oTop: 0 };
+                        fullAllDataRowIdData[rowid] = rest;
+                        fullDataRowIdData[rowid] = rest;
+                    }
+                    fullMaps[rowid] = row;
+                }, { children: transform ? treeOpts.mapChildrenField : childrenField });
+                internalData.afterFullRowMaps = fullMaps;
+                updateAfterListIndex();
             }
             else {
                 updateAfterListIndex();
@@ -2515,12 +2509,14 @@ export default defineComponent({
             }
             calcCellWidth();
             autoCellWidth();
+            updateStyle();
             return computeScrollLoad().then(() => {
                 if (reFull === true) {
                     // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
                     calcCellHeight();
                     calcCellWidth();
                     autoCellWidth();
+                    updateStyle();
                     return computeScrollLoad();
                 }
             });
@@ -3007,8 +3003,9 @@ export default defineComponent({
                 handleVirtualTreeToList();
                 tablePrivateMethods.handleTableData();
                 updateAfterDataIndex();
+                return nextTick();
             }).then(() => {
-                return tableMethods.recalculate();
+                return tableMethods.recalculate(true);
             }).then(() => {
                 setTimeout(() => {
                     tableMethods.updateCellAreas();
@@ -3376,7 +3373,7 @@ export default defineComponent({
                     XEUtils.eachTree(rows, (childRow, index, items, path, parentItem, nodes) => {
                         const rowid = getRowid($xeTable, childRow);
                         const parentRow = parentItem || parentRest.row;
-                        const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, oTop: 0 };
+                        const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, treeIndex: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, oTop: 0 };
                         fullDataRowIdData[rowid] = rest;
                         fullAllDataRowIdData[rowid] = rest;
                     }, { children: childrenField });
@@ -6428,7 +6425,7 @@ export default defineComponent({
                     }
                     let cacheItem = fullAllDataRowIdData[rowid];
                     if (!cacheItem) {
-                        cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, items, parent: parentRow, level, height: 0, oTop: 0 };
+                        cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, oTop: 0 };
                     }
                     cacheItem.row = row;
                     cacheItem.items = items;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.10.6-beta.5";
+export const version = "4.10.6-beta.7";
 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${"4.10.6-beta.5"}`;
+const version = `table v${"4.10.6-beta.7"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.6-beta.5";
+const version = "4.10.6-beta.7";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3568,7 +3568,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.6-beta.5"}`;
+const log_version = `table v${"4.10.6-beta.7"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6210,7 +6210,7 @@ const renderType = 'body';
       let prevRow = null;
       if (rest) {
         rLevel = rest.level;
-        prevRow = rest.items[rest._index - 1];
+        prevRow = rest.items[rest.treeIndex - 1];
       }
       const isFirstRow = $xeTable.eqRow(afterFullData[0], row);
       if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
@@ -11922,6 +11922,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             index: -1,
             $index: -1,
             _index: index,
+            treeIndex: -1,
             items: [],
             parent: null,
             level: 0,
@@ -11955,41 +11956,37 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const fullMaps = {};
       if (treeConfig) {
-        if (transform) {
-          updateAfterListIndex();
-        } else {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, (row, index, items, path) => {
-            const rowid = getRowid($xeTable, row);
-            const rowRest = fullAllDataRowIdData[rowid];
-            const seq = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
-            if (rowRest) {
-              rowRest.seq = seq;
-              if (!transform) {
-                rowRest._index = index;
-              }
-            } else {
-              const rest = {
-                row,
-                rowid,
-                seq,
-                index: -1,
-                $index: -1,
-                _index: -1,
-                items: [],
-                parent: null,
-                level: 0,
-                height: 0,
-                oTop: 0
-              };
-              fullAllDataRowIdData[rowid] = rest;
-              fullDataRowIdData[rowid] = rest;
-            }
-            fullMaps[rowid] = row;
-          }, {
-            children: transform ? treeOpts.mapChildrenField : childrenField
-          });
-          internalData.afterFullRowMaps = fullMaps;
-        }
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, (row, index, items, path) => {
+          const rowid = getRowid($xeTable, row);
+          const rowRest = fullAllDataRowIdData[rowid];
+          const seq = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
+          if (rowRest) {
+            rowRest.seq = seq;
+            rowRest.treeIndex = index;
+          } else {
+            const rest = {
+              row,
+              rowid,
+              seq,
+              index: -1,
+              $index: -1,
+              _index: -1,
+              treeIndex: -1,
+              items: [],
+              parent: null,
+              level: 0,
+              height: 0,
+              oTop: 0
+            };
+            fullAllDataRowIdData[rowid] = rest;
+            fullDataRowIdData[rowid] = rest;
+          }
+          fullMaps[rowid] = row;
+        }, {
+          children: transform ? treeOpts.mapChildrenField : childrenField
+        });
+        internalData.afterFullRowMaps = fullMaps;
+        updateAfterListIndex();
       } else {
         updateAfterListIndex();
       }
@@ -13228,12 +13225,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       }
       calcCellWidth();
       autoCellWidth();
+      updateStyle();
       return computeScrollLoad().then(() => {
         if (reFull === true) {
           // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
           calcCellHeight();
           calcCellWidth();
           autoCellWidth();
+          updateStyle();
           return computeScrollLoad();
         }
       });
@@ -13785,8 +13784,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         handleVirtualTreeToList();
         tablePrivateMethods.handleTableData();
         updateAfterDataIndex();
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       }).then(() => {
-        return tableMethods.recalculate();
+        return tableMethods.recalculate(true);
       }).then(() => {
         setTimeout(() => {
           tableMethods.updateCellAreas();
@@ -14244,6 +14244,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               index,
               _index: -1,
               $index: -1,
+              treeIndex: -1,
               items,
               parent: parentRow,
               level: parentLevel + nodes.length,
@@ -17701,6 +17702,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               index: -1,
               _index: -1,
               $index: -1,
+              treeIndex: index,
               items,
               parent: parentRow,
               level,
@@ -22049,6 +22051,7 @@ edit_hook_hooks.add('tableEditModule', {
             index: -1,
             _index: -1,
             $index: -1,
+            treeIndex: -1,
             items: parentChilds,
             parent: parentRow,
             level: parentLevel + 1,
@@ -22072,6 +22075,7 @@ edit_hook_hooks.add('tableEditModule', {
             index: -1,
             _index: -1,
             $index: -1,
+            treeIndex: -1,
             items: tableFullTreeData,
             parent: null,
             level: 0,
@@ -22126,6 +22130,7 @@ edit_hook_hooks.add('tableEditModule', {
               index: -1,
               _index: -1,
               $index: -1,
+              treeIndex: -1,
               items: afterFullData,
               parent: null,
               level: 0,
@@ -22161,6 +22166,7 @@ edit_hook_hooks.add('tableEditModule', {
                 seq: -1,
                 index: -1,
                 _index: -1,
+                treeIndex: -1,
                 $index: -1,
                 items: afterFullData,
                 parent: null,
@@ -22221,6 +22227,7 @@ edit_hook_hooks.add('tableEditModule', {
                   index: -1,
                   _index: -1,
                   $index: -1,
+                  treeIndex: -1,
                   items: parentMapChilds,
                   parent: parentRow,
                   level: parentLevel + 1,