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

package/lib/table/src/table.js

@@ -1634,6 +1634,41 @@ var _default = exports.default = (0, _vue.defineComponent)({
         return cellValue;
       };
     };
+    const updateAfterListIndex = () => {
+      const {
+        afterFullData,
+        fullDataRowIdData,
+        fullAllDataRowIdData
+      } = internalData;
+      const fullMaps = {};
+      afterFullData.forEach((row, index) => {
+        const rowid = (0, _util.getRowid)($xeTable, row);
+        const rowRest = fullAllDataRowIdData[rowid];
+        const seq = index + 1;
+        if (rowRest) {
+          rowRest.seq = seq;
+          rowRest._index = index;
+        } else {
+          const rest = {
+            row,
+            rowid,
+            seq,
+            index: -1,
+            $index: -1,
+            _index: index,
+            items: [],
+            parent: null,
+            level: 0,
+            height: 0,
+            oTop: 0
+          };
+          fullAllDataRowIdData[rowid] = rest;
+          fullDataRowIdData[rowid] = rest;
+        }
+        fullMaps[rowid] = row;
+      });
+      internalData.afterFullRowMaps = fullMaps;
+    };
     /**
      * 预编译
      * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
@@ -1643,72 +1678,55 @@ var _default = exports.default = (0, _vue.defineComponent)({
         treeConfig
       } = props;
       const {
-        afterFullData,
         fullDataRowIdData,
         fullAllDataRowIdData,
         afterTreeFullData
       } = internalData;
       const treeOpts = computeTreeOpts.value;
+      const {
+        transform
+      } = treeOpts;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const fullMaps = {};
       if (treeConfig) {
-        _xeUtils.default.eachTree(afterTreeFullData, (row, index, items, path) => {
-          const rowid = (0, _util.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._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: treeOpts.transform ? treeOpts.mapChildrenField : childrenField
-        });
+        if (transform) {
+          updateAfterListIndex();
+        } else {
+          _xeUtils.default.eachTree(afterTreeFullData, (row, index, items, path) => {
+            const rowid = (0, _util.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;
+        }
       } else {
-        afterFullData.forEach((row, index) => {
-          const rowid = (0, _util.getRowid)($xeTable, row);
-          const rowRest = fullAllDataRowIdData[rowid];
-          const seq = index + 1;
-          if (rowRest) {
-            rowRest.seq = seq;
-            rowRest._index = index;
-          } else {
-            const rest = {
-              row,
-              rowid,
-              seq,
-              index: -1,
-              $index: -1,
-              _index: index,
-              items: [],
-              parent: null,
-              level: 0,
-              height: 0,
-              oTop: 0
-            };
-            fullAllDataRowIdData[rowid] = rest;
-            fullDataRowIdData[rowid] = rest;
-          }
-          fullMaps[rowid] = row;
-        });
+        updateAfterListIndex();
       }
-      internalData.afterFullRowMaps = fullMaps;
     };
     /**
      * 如果为虚拟树，将树结构拍平