vxe-table 3.12.1-beta.2 → 3.12.1-beta.3

package/es/table/src/methods.js

@@ -998,7 +998,7 @@ const Methods = {
             }
             let cacheItem = fullAllDataRowIdData[rowid];
             if (!cacheItem) {
-                cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, items, parent: parentRow, level, height: 0 };
+                cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, items, parent: parentRow, level, height: 0, oTop: 0 };
             }
             cacheItem.row = row;
             cacheItem.items = items;
@@ -1072,7 +1072,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, items, parent: parentRow, level: parentLevel + nodes.length, height: 0 };
+                const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, oTop: 0 };
                 fullDataRowIdData[rowid] = rest;
                 fullAllDataRowIdData[rowid] = rest;
             }, { children: childrenField });
@@ -1936,7 +1936,7 @@ const Methods = {
                         rowRest._index = index;
                     }
                     else {
-                        const rest = { row, rowid, seq: '-1', index: -1, $index: -1, _index: index, items: [], parent: null, level: 0, height: 0 };
+                        const rest = { row, rowid, seq: '-1', index: -1, $index: -1, _index: index, items: [], parent: null, level: 0, height: 0, oTop: 0 };
                         fullAllDataRowIdData[rowid] = rest;
                         fullDataRowIdData[rowid] = rest;
                     }
@@ -1967,7 +1967,7 @@ const Methods = {
                     rowRest._index = index;
                 }
                 else {
-                    const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0, height: 0 };
+                    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;
                 }
@@ -1985,7 +1985,7 @@ const Methods = {
                     rowRest._index = index;
                 }
                 else {
-                    const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0, height: 0 };
+                    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;
                 }
@@ -6811,7 +6811,7 @@ const Methods = {
             $xeTable.loadScrollXData();
         }
         internalData.lxTimeout = setTimeout(() => {
-            internalData.lxRunTime = undefined;
+            internalData.lxTimeout = undefined;
             internalData.lxRunTime = undefined;
             $xeTable.loadScrollXData();
         }, fpsTime);
@@ -7030,8 +7030,9 @@ const Methods = {
         const $xeTable = this;
         const props = $xeTable;
         const { showOverflow } = props;
+        $xeTable.handleTableColumn();
+        calcCellHeight($xeTable);
         return $xeTable.$nextTick().then(() => {
-            $xeTable.handleTableColumn();
             calcCellHeight($xeTable);
             $xeTable.updateScrollXSpace();
             if (!showOverflow) {
@@ -7082,8 +7083,9 @@ const Methods = {
     },
     updateScrollYData() {
         const $xeTable = this;
+        $xeTable.handleTableData();
+        calcCellHeight($xeTable);
         return $xeTable.$nextTick().then(() => {
-            $xeTable.handleTableData();
             calcCellHeight($xeTable);
             $xeTable.updateScrollYSpace();
         });

package/es/table/src/table.js

@@ -415,6 +415,7 @@ export default {
                 isFooter: false
             },
             scrollVMLoading: false,
+            isCalcCellHeight: 0,
             isCustomStatus: false,
             isDragRowMove: false,
             dragRow: null,

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -6097,7 +6097,8 @@ const Methods = {
           items,
           parent: parentRow,
           level,
-          height: 0
+          height: 0,
+          oTop: 0
         };
       }
       cacheItem.row = row;
@@ -6200,7 +6201,8 @@ const Methods = {
           items,
           parent: parentRow,
           level: parentLevel + nodes.length,
-          height: 0
+          height: 0,
+          oTop: 0
         };
         fullDataRowIdData[rowid] = rest;
         fullAllDataRowIdData[rowid] = rest;
@@ -7259,7 +7261,8 @@ const Methods = {
               items: [],
               parent: null,
               level: 0,
-              height: 0
+              height: 0,
+              oTop: 0
             };
             fullAllDataRowIdData[rowid] = rest;
             fullDataRowIdData[rowid] = rest;
@@ -7307,7 +7310,8 @@ const Methods = {
             items: [],
             parent: null,
             level: 0,
-            height: 0
+            height: 0,
+            oTop: 0
           };
           fullAllDataRowIdData[rowid] = rest;
           fullDataRowIdData[rowid] = rest;
@@ -7336,7 +7340,8 @@ const Methods = {
             items: [],
             parent: null,
             level: 0,
-            height: 0
+            height: 0,
+            oTop: 0
           };
           fullAllDataRowIdData[rowid] = rest;
           fullDataRowIdData[rowid] = rest;
@@ -13037,7 +13042,7 @@ const Methods = {
       $xeTable.loadScrollXData();
     }
     internalData.lxTimeout = setTimeout(() => {
-      internalData.lxRunTime = undefined;
+      internalData.lxTimeout = undefined;
       internalData.lxRunTime = undefined;
       $xeTable.loadScrollXData();
     }, fpsTime);
@@ -13307,8 +13312,9 @@ const Methods = {
     const {
       showOverflow
     } = props;
+    $xeTable.handleTableColumn();
+    calcCellHeight($xeTable);
     return $xeTable.$nextTick().then(() => {
-      $xeTable.handleTableColumn();
       calcCellHeight($xeTable);
       $xeTable.updateScrollXSpace();
       if (!showOverflow) {
@@ -13372,8 +13378,9 @@ const Methods = {
   },
   updateScrollYData() {
     const $xeTable = this;
+    $xeTable.handleTableData();
+    calcCellHeight($xeTable);
     return $xeTable.$nextTick().then(() => {
-      $xeTable.handleTableData();
       calcCellHeight($xeTable);
       $xeTable.updateScrollYSpace();
     });
@@ -13937,6 +13944,7 @@ function renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, ro
     sYOpts,
     scrollXLoad,
     scrollYLoad,
+    isCalcCellHeight,
     highlightCurrentRow,
     showOverflow: allColumnOverflow,
     isAllOverflow,
@@ -14200,14 +14208,15 @@ function renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, ro
     }
   }
   let cellHeight = '';
+  const vnHeight = isCalcCellHeight ? rest.height : 0;
   if (hasEllipsis) {
     if (scrollYRHeight || rowHeight) {
       cellHeight = `${scrollYRHeight || rowHeight}px`;
     } else if (!isAllOverflow) {
-      cellHeight = `${rest.height || 18}px`;
+      cellHeight = `${vnHeight || rowHeight || 18}px`;
     }
   } else {
-    cellHeight = `${rest.height || 18}px`;
+    cellHeight = `${vnHeight || rowHeight || 18}px`;
   }
   if (mouseConfig && mouseOpts.area && selectCellToRow) {
     if (!$columnIndex && selectCellToRow === true || selectCellToRow === column.field) {
@@ -19178,7 +19187,8 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         items: parentChilds,
         parent: parentRow,
         level: parentLevel + 1,
-        height: 0
+        height: 0,
+        oTop: 0
       };
       fullDataRowIdData[rowid] = rest;
       fullAllDataRowIdData[rowid] = rest;
@@ -19200,7 +19210,8 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         items: tableFullTreeData,
         parent: null,
         level: 0,
-        height: 0
+        height: 0,
+        oTop: 0
       };
       fullDataRowIdData[rowid] = rest;
       fullAllDataRowIdData[rowid] = rest;
@@ -19256,7 +19267,8 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           items: afterFullData,
           parent: null,
           level: 0,
-          height: 0
+          height: 0,
+          oTop: 0
         };
         fullDataRowIdData[rowid] = rest;
         fullAllDataRowIdData[rowid] = rest;
@@ -19291,7 +19303,8 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             items: afterFullData,
             parent: null,
             level: 0,
-            height: 0
+            height: 0,
+            oTop: 0
           };
           fullDataRowIdData[rowid] = rest;
           fullAllDataRowIdData[rowid] = rest;
@@ -19349,7 +19362,8 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
               items: parentMapChilds,
               parent: parentRow,
               level: parentLevel + 1,
-              height: 0
+              height: 0,
+              oTop: 0
             };
             fullDataRowIdData[rowid] = rest;
             fullAllDataRowIdData[rowid] = rest;
@@ -23879,6 +23893,7 @@ function handleUupdateResize(_vm) {
         isFooter: false
       },
       scrollVMLoading: false,
+      isCalcCellHeight: 0,
       isCustomStatus: false,
       isDragRowMove: false,
       dragRow: null,