vxe-table 3.12.10 → 3.12.12

package/es/table/src/methods.js

@@ -763,7 +763,7 @@ function handleVirtualYVisible($xeTable, currScrollTop) {
                 const row = afterFullData[rIndex];
                 const rowid = getRowid($xeTable, row);
                 const rowRest = fullAllDataRowIdData[rowid] || {};
-                offsetTop += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+                offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
                 if (toVisibleIndex === -1 && scrollTop < offsetTop) {
                     toVisibleIndex = rIndex;
                 }
@@ -3826,7 +3826,7 @@ const Methods = {
             return;
         }
         const defaultRowHeight = $xeTable.computeDefaultRowHeight;
-        const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+        const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
         const tableRect = tableEl.getBoundingClientRect();
         const trRect = trEl.getBoundingClientRect();
         const targetOffsetY = dragClientY - trRect.y - trEl.clientHeight;
@@ -3980,7 +3980,7 @@ const Methods = {
             if (rowRest) {
                 const resizeHeight = rowRest.resizeHeight;
                 if (resizeHeight || isFull) {
-                    const currCellHeight = resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+                    const currCellHeight = resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
                     rest[rowid] = currCellHeight;
                 }
             }
@@ -4029,7 +4029,7 @@ const Methods = {
         const rowid = XEUtils.isString(rowOrId) || XEUtils.isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
-            return rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+            return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
         }
         return 0;
     },
@@ -8134,13 +8134,13 @@ const Methods = {
                     const row = afterFullData[i];
                     const rowid = getRowid($xeTable, row);
                     const rowRest = fullAllDataRowIdData[rowid] || {};
-                    ySpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+                    ySpaceHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
                 }
                 for (let i = 0; i < startIndex; i++) {
                     const row = afterFullData[i];
                     const rowid = getRowid($xeTable, row);
                     const rowRest = fullAllDataRowIdData[rowid] || {};
-                    topSpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+                    topSpaceHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
                 }
             }
         }

package/es/table/src/util.js

@@ -276,7 +276,7 @@ export function calcTreeLine(params, prevRow) {
     const defaultRowHeight = $table.computeDefaultRowHeight;
     const rowid = getRowid($table, row);
     const rowRest = fullAllDataRowIdData[rowid];
-    const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+    const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
     let expandSize = 1;
     if (prevRow) {
         expandSize = countTreeExpand(prevRow, params);
@@ -390,15 +390,15 @@ export function rowToVisible($xeTable, row) {
                 }
                 let scrollTop = 0;
                 const rowRest = fullAllDataRowIdData[rowid];
-                const rHeight = rowRest ? (rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight) : defaultRowHeight;
+                const rHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
                 for (let i = 0; i < afterFullData.length; i++) {
                     const currRow = afterFullData[i];
                     const currRowid = getRowid($xeTable, currRow);
                     if (currRow === row || currRowid === rowid) {
                         break;
                     }
-                    const rowRest = fullAllDataRowIdData[currRowid];
-                    scrollTop += rowRest ? (rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight) : defaultRowHeight;
+                    const currRowRest = fullAllDataRowIdData[currRowid];
+                    scrollTop += currRowRest.resizeHeight || cellOpts.height || rowOpts.height || currRowRest.height || defaultRowHeight;
                 }
                 if (scrollTop < bodyScrollTop) {
                     return $xeTable.scrollTo(null, scrollTop - leftFixedWidth - 1);

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.10";
+export const version = "3.12.12";
 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.10"}`;
+const version = `table v${"3.12.12"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.10";
+const version = "3.12.12";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2840,7 +2840,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.10"}`;
+const log_version = `table v${"3.12.12"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3345,7 +3345,7 @@ function calcTreeLine(params, prevRow) {
   const defaultRowHeight = $table.computeDefaultRowHeight;
   const rowid = getRowid($table, row);
   const rowRest = fullAllDataRowIdData[rowid];
-  const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+  const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
   let expandSize = 1;
   if (prevRow) {
     expandSize = countTreeExpand(prevRow, params);
@@ -3477,15 +3477,15 @@ function rowToVisible($xeTable, row) {
         }
         let scrollTop = 0;
         const rowRest = fullAllDataRowIdData[rowid];
-        const rHeight = rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
+        const rHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
         for (let i = 0; i < afterFullData.length; i++) {
           const currRow = afterFullData[i];
           const currRowid = getRowid($xeTable, currRow);
           if (currRow === row || currRowid === rowid) {
             break;
           }
-          const rowRest = fullAllDataRowIdData[currRowid];
-          scrollTop += rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
+          const currRowRest = fullAllDataRowIdData[currRowid];
+          scrollTop += currRowRest.resizeHeight || cellOpts.height || rowOpts.height || currRowRest.height || defaultRowHeight;
         }
         if (scrollTop < bodyScrollTop) {
           return $xeTable.scrollTo(null, scrollTop - leftFixedWidth - 1);
@@ -5973,7 +5973,7 @@ function handleVirtualYVisible($xeTable, currScrollTop) {
         const row = afterFullData[rIndex];
         const rowid = getRowid($xeTable, row);
         const rowRest = fullAllDataRowIdData[rowid] || {};
-        offsetTop += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+        offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
         if (toVisibleIndex === -1 && scrollTop < offsetTop) {
           toVisibleIndex = rIndex;
         }
@@ -9515,7 +9515,7 @@ const Methods = {
       return;
     }
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
-    const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+    const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
     const tableRect = tableEl.getBoundingClientRect();
     const trRect = trEl.getBoundingClientRect();
     const targetOffsetY = dragClientY - trRect.y - trEl.clientHeight;
@@ -9690,7 +9690,7 @@ const Methods = {
       if (rowRest) {
         const resizeHeight = rowRest.resizeHeight;
         if (resizeHeight || isFull) {
-          const currCellHeight = resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+          const currCellHeight = resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
           rest[rowid] = currCellHeight;
         }
       }
@@ -9743,7 +9743,7 @@ const Methods = {
     const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowOrId) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
     const rowRest = fullAllDataRowIdData[rowid];
     if (rowRest) {
-      return rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+      return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
     }
     return 0;
   },
@@ -14648,13 +14648,13 @@ const Methods = {
           const row = afterFullData[i];
           const rowid = getRowid($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid] || {};
-          ySpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+          ySpaceHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
         }
         for (let i = 0; i < startIndex; i++) {
           const row = afterFullData[i];
           const rowid = getRowid($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid] || {};
-          topSpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+          topSpaceHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
         }
       }
     } else {
@@ -15249,8 +15249,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const rowOpts = $xeTable.computeRowOpts;
   const rowDragOpts = $xeTable.computeRowDragOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
-  const customCellHeight = cellOpts.height || rowOpts.height;
-  const currCellHeight = customCellHeight || defaultRowHeight;
+  const customCellHeight = calcCellHeightFlag ? cellOpts.height || rowOpts.height : 0;
   const {
     disabledMethod: dragDisabledMethod,
     isCrossDrag,
@@ -15435,17 +15434,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     isDirty = $xeTable.isUpdateByRow(row, column.field);
   }
   const isVNAutoHeight = scrollYLoad && !hasEllipsis;
-  let cellHeight = currCellHeight;
-  const vnHeight = calcCellHeightFlag ? rowRest.height : 0;
-  if (resizeHeight) {
-    cellHeight = resizeHeight;
-  } else {
-    if (scrollYLoad) {
-      if (!hasEllipsis) {
-        cellHeight = vnHeight || currCellHeight;
-      }
-    }
-  }
+  const cellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isVNPreEmptyStatus = false;
@@ -23353,7 +23342,7 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
           const item = afterFullData[i];
           const rowid = $xeTable.getRowid(item);
           const rowRest = fullAllDataRowIdData[rowid] || {};
-          countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+          countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
           rangeRows.push(item);
           if (countHeight > moveSize) {
             return rangeRows;
@@ -23364,7 +23353,7 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
           const item = afterFullData[len];
           const rowid = $xeTable.getRowid(item);
           const rowRest = fullAllDataRowIdData[rowid] || {};
-          countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+          countHeight += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
           rangeRows.push(item);
           if (countHeight > moveSize) {
             return rangeRows;