vxe-table 3.17.0-beta.12 → 3.17.0-beta.13

package/es/table/module/edit/mixin.js

@@ -70,7 +70,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
             }
             parentChilds[funcName](item);
             mapChilds[funcName](item);
-            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             fullDataRowIdData[rowid] = rest;
             fullAllDataRowIdData[rowid] = rest;
         }
@@ -80,7 +80,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
             }
             afterFullData[funcName](item);
             tableFullTreeData[funcName](item);
-            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             fullDataRowIdData[rowid] = rest;
             fullAllDataRowIdData[rowid] = rest;
         }
@@ -118,7 +118,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
         else {
             newRecords.forEach(item => {
                 const rowid = getRowid($xeTable, item);
-                const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                 fullDataRowIdData[rowid] = rest;
                 fullAllDataRowIdData[rowid] = rest;
                 afterFullData.unshift(item);
@@ -150,7 +150,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             else {
                 newRecords.forEach(item => {
                     const rowid = getRowid($xeTable, item);
-                    const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                    const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                     fullDataRowIdData[rowid] = rest;
                     fullAllDataRowIdData[rowid] = rest;
                     afterFullData.push(item);
@@ -182,7 +182,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                             targetIndex = targetIndex + 1;
                         }
                         parentMapChilds.splice(targetIndex, 0, item);
-                        const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                        const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                         fullDataRowIdData[rowid] = rest;
                         fullAllDataRowIdData[rowid] = rest;
                     });

package/es/table/src/body.js

@@ -239,7 +239,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
         isDirty = $xeTable.isUpdateByRow(row, column.field);
     }
-    const isVNAutoHeight = scrollYLoad && !hasEllipsis;
+    const isVNAutoHeight = !hasEllipsis && (scrollYLoad || scrollXLoad);
     let cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
     const isLastColumn = $columnIndex === columns.length - 1;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
@@ -276,7 +276,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         }
         tcStyle.width = `${column.renderWidth + mergeColWidth - cellOffsetWidth}px`;
     }
-    if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
+    if (scrollYLoad || scrollXLoad || hasEllipsis || isCsHeight || isRsHeight) {
         tcStyle.height = `${cellHeight}px`;
     }
     else {
@@ -456,15 +456,16 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
             };
         }
         if (rowRest) {
+            rowIndex = rowRest.index;
+            _rowIndex = rowRest._index;
             rowLevel = rowRest.level;
+            seq = rowRest.seq;
             if (hasRowGroupAggregate || (treeConfig && transform && seqMode === 'increasing')) {
                 seq = rowRest._index + 1;
             }
-            else {
-                seq = rowRest.seq;
+            else if ((treeConfig && seqMode === 'fixed')) {
+                seq = rowRest._tIndex + 1;
             }
-            rowIndex = rowRest.index;
-            _rowIndex = rowRest._index;
         }
         const params = { $table: $xeTable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex, _rowIndex };
         // 行是否被展开

package/es/table/src/methods.js

@@ -535,7 +535,7 @@ function updateAfterListIndex($xeTable) {
             rowRest._index = index;
         }
         else {
-            const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, treeIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+            const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, treeIndex: -1, _tIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             fullAllDataRowIdData[rowid] = rest;
             fullDataRowIdData[rowid] = rest;
         }
@@ -557,6 +557,7 @@ function updateAfterDataIndex($xeTable) {
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const fullMaps = {};
     if (treeConfig) {
+        let _treeIndex = 0;
         const { handleGetRowId } = createHandleGetRowId($xeTable);
         XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
             const rowid = handleGetRowId(row);
@@ -565,12 +566,14 @@ function updateAfterDataIndex($xeTable) {
             if (rowRest) {
                 rowRest.seq = seq;
                 rowRest.treeIndex = index;
+                rowRest._tIndex = _treeIndex;
             }
             else {
-                const rest = { row, rowid, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                const rest = { row, rowid, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, _tIndex: _treeIndex, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                 fullAllDataRowIdData[rowid] = rest;
                 fullDataRowIdData[rowid] = rest;
             }
+            _treeIndex++;
             fullMaps[rowid] = row;
         }, { children: transform ? treeOpts.mapChildrenField : childrenField });
         if (transform) {
@@ -2208,7 +2211,7 @@ const calcCellHeight = ($xeTable) => {
     const { fullAllDataRowIdData } = internalData;
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const el = $xeTable.$refs.refElem;
-    if (!isAllOverflow && scrollYLoad && el) {
+    if (!isAllOverflow && (scrollYLoad || scrollXLoad) && el) {
         const { handleGetRowId } = createHandleGetRowId($xeTable);
         tableData.forEach(row => {
             const rowid = handleGetRowId(row);
@@ -3925,7 +3928,7 @@ const Methods = {
         const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
             let rowRest = fullAllDataRowIdMaps[rowid];
             if (!rowRest) {
-                rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, _tIndex: -1, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             }
             rowRest.treeLoaded = false;
             rowRest.expandLoaded = false;
@@ -4030,7 +4033,7 @@ const Methods = {
             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, treeIndex: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                 fullDataRowIdData[rowid] = rest;
                 fullAllDataRowIdData[rowid] = rest;
             }, { children: childrenField });

package/es/table/src/table.js

@@ -232,16 +232,17 @@ function renderRowExpandedVNs(h, $xeTable) {
             let rowIndex = -1;
             let $rowIndex = -1;
             if (rowRest) {
+                rowIndex = rowRest.index;
+                $rowIndex = rowRest.$index;
+                _rowIndex = rowRest._index;
                 rowLevel = rowRest.level;
+                seq = rowRest.seq;
                 if (isRowGroupStatus || (treeConfig && transform && seqMode === 'increasing')) {
                     seq = rowRest._index + 1;
                 }
-                else {
-                    seq = rowRest.seq;
+                else if ((treeConfig && seqMode === 'fixed')) {
+                    seq = rowRest._tIndex + 1;
                 }
-                rowIndex = rowRest.index;
-                $rowIndex = rowRest.$index;
-                _rowIndex = rowRest._index;
             }
             if (expandHeight) {
                 cellStyle.height = `${expandHeight}px`;

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.0-beta.12";
+const version = "3.17.0-beta.13";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2668,7 +2668,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.0-beta.12"}`;
+const log_version = `table v${"3.17.0-beta.13"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5888,6 +5888,7 @@ function updateAfterListIndex($xeTable) {
         $index: -1,
         _index: index,
         treeIndex: -1,
+        _tIndex: -1,
         items: [],
         parent: null,
         level: 0,
@@ -5926,6 +5927,7 @@ function updateAfterDataIndex($xeTable) {
   const childrenField = treeOpts.children || treeOpts.childrenField;
   const fullMaps = {};
   if (treeConfig) {
+    let _treeIndex = 0;
     const {
       handleGetRowId
     } = createHandleGetRowId($xeTable);
@@ -5936,6 +5938,7 @@ function updateAfterDataIndex($xeTable) {
       if (rowRest) {
         rowRest.seq = seq;
         rowRest.treeIndex = index;
+        rowRest._tIndex = _treeIndex;
       } else {
         const rest = {
           row,
@@ -5945,6 +5948,7 @@ function updateAfterDataIndex($xeTable) {
           $index: -1,
           _index: -1,
           treeIndex: -1,
+          _tIndex: _treeIndex,
           items: [],
           parent: null,
           level: 0,
@@ -5956,6 +5960,7 @@ function updateAfterDataIndex($xeTable) {
         fullAllDataRowIdData[rowid] = rest;
         fullDataRowIdData[rowid] = rest;
       }
+      _treeIndex++;
       fullMaps[rowid] = row;
     }, {
       children: transform ? treeOpts.mapChildrenField : childrenField
@@ -7918,7 +7923,7 @@ const calcCellHeight = $xeTable => {
   } = internalData;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const el = $xeTable.$refs.refElem;
-  if (!isAllOverflow && scrollYLoad && el) {
+  if (!isAllOverflow && (scrollYLoad || scrollXLoad) && el) {
     const {
       handleGetRowId
     } = createHandleGetRowId($xeTable);
@@ -9855,6 +9860,7 @@ const Methods = {
           _index: -1,
           $index: -1,
           treeIndex: index,
+          _tIndex: -1,
           items,
           parent: parentRow,
           level,
@@ -9998,6 +10004,7 @@ const Methods = {
           _index: -1,
           $index: -1,
           treeIndex: -1,
+          _tIndex: -1,
           items,
           parent: parentRow,
           level: parentLevel + nodes.length,
@@ -18076,7 +18083,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
     isDirty = $xeTable.isUpdateByRow(row, column.field);
   }
-  const isVNAutoHeight = scrollYLoad && !hasEllipsis;
+  const isVNAutoHeight = !hasEllipsis && (scrollYLoad || scrollXLoad);
   let cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
@@ -18112,7 +18119,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     }
     tcStyle.width = `${column.renderWidth + mergeColWidth - cellOffsetWidth}px`;
   }
-  if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
+  if (scrollYLoad || scrollXLoad || hasEllipsis || isCsHeight || isRsHeight) {
     tcStyle.height = `${cellHeight}px`;
   } else {
     tcStyle.minHeight = `${cellHeight}px`;
@@ -18304,14 +18311,15 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       };
     }
     if (rowRest) {
+      rowIndex = rowRest.index;
+      _rowIndex = rowRest._index;
       rowLevel = rowRest.level;
+      seq = rowRest.seq;
       if (hasRowGroupAggregate || treeConfig && transform && seqMode === 'increasing') {
         seq = rowRest._index + 1;
-      } else {
-        seq = rowRest.seq;
+      } else if (treeConfig && seqMode === 'fixed') {
+        seq = rowRest._tIndex + 1;
       }
-      rowIndex = rowRest.index;
-      _rowIndex = rowRest._index;
     }
     const params = {
       $table: $xeTable,
@@ -23228,6 +23236,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
         _index: -1,
         $index: -1,
         treeIndex: -1,
+        _tIndex: -1,
         items: parentChilds,
         parent: parentRow,
         level: parentLevel + 1,
@@ -23252,6 +23261,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
         _index: -1,
         $index: -1,
         treeIndex: -1,
+        _tIndex: -1,
         items: tableFullTreeData,
         parent: null,
         level: 0,
@@ -23322,6 +23332,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           _index: -1,
           $index: -1,
           treeIndex: -1,
+          _tIndex: -1,
           items: afterFullData,
           parent: null,
           level: 0,
@@ -23368,6 +23379,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             _index: -1,
             $index: -1,
             treeIndex: -1,
+            _tIndex: -1,
             items: afterFullData,
             parent: null,
             level: 0,
@@ -23418,6 +23430,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
               _index: -1,
               $index: -1,
               treeIndex: -1,
+              _tIndex: -1,
               items: parentMapChilds,
               parent: parentRow,
               level: parentLevel + 1,
@@ -28207,15 +28220,16 @@ function renderRowExpandedVNs(h, $xeTable) {
       let rowIndex = -1;
       let $rowIndex = -1;
       if (rowRest) {
+        rowIndex = rowRest.index;
+        $rowIndex = rowRest.$index;
+        _rowIndex = rowRest._index;
         rowLevel = rowRest.level;
+        seq = rowRest.seq;
         if (isRowGroupStatus || treeConfig && transform && seqMode === 'increasing') {
           seq = rowRest._index + 1;
-        } else {
-          seq = rowRest.seq;
+        } else if (treeConfig && seqMode === 'fixed') {
+          seq = rowRest._tIndex + 1;
         }
-        rowIndex = rowRest.index;
-        $rowIndex = rowRest.$index;
-        _rowIndex = rowRest._index;
       }
       if (expandHeight) {
         cellStyle.height = `${expandHeight}px`;