vxe-table 4.10.6 → 4.10.8

package/es/table/src/table.js

@@ -244,7 +244,7 @@ export default defineComponent({
                 isFooter: false
             },
             scrollVMLoading: false,
-            calcCellHeightFlag: 0,
+            calcCellHeightFlag: 1,
             resizeHeightFlag: 0,
             isCustomStatus: false,
             isDragRowMove: false,
@@ -893,7 +893,7 @@ export default defineComponent({
                         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;
                         }
@@ -4150,7 +4150,7 @@ export default defineComponent({
                     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;
                         }
                     }
@@ -4196,7 +4196,7 @@ export default defineComponent({
                 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;
             },
@@ -6851,7 +6851,7 @@ export default defineComponent({
                     return;
                 }
                 const defaultRowHeight = computeDefaultRowHeight.value;
-                const currCellHeight = rowRest.resizeHeight || rowRest.height || 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;
@@ -8860,13 +8860,13 @@ export default defineComponent({
                             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

@@ -338,7 +338,7 @@ export function calcTreeLine(params, prevRow) {
     const defaultRowHeight = computeDefaultRowHeight.value;
     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);
@@ -437,7 +437,7 @@ 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);
@@ -445,7 +445,7 @@ export function rowToVisible($xeTable, row) {
                         break;
                     }
                     const currRowRest = fullAllDataRowIdData[currRowid] || {};
-                    scrollTop += currRowRest.resizeHeight || currRowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+                    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 = "4.10.6";
+export const version = "4.10.8";
 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"}`;
+const version = `table v${"4.10.8"}`;
 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";
+const version = "4.10.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3583,7 +3583,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.6"}`;
+const log_version = `table v${"4.10.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -4369,7 +4369,7 @@ function calcTreeLine(params, prevRow) {
   const defaultRowHeight = computeDefaultRowHeight.value;
   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);
@@ -4495,7 +4495,7 @@ 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);
@@ -4503,7 +4503,7 @@ function rowToVisible($xeTable, row) {
             break;
           }
           const currRowRest = fullAllDataRowIdData[currRowid] || {};
-          scrollTop += currRowRest.resizeHeight || currRowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+          scrollTop += currRowRest.resizeHeight || cellOpts.height || rowOpts.height || currRowRest.height || defaultRowHeight;
         }
         if (scrollTop < bodyScrollTop) {
           return $xeTable.scrollTo(null, scrollTop - leftFixedWidth - 1);
@@ -6319,8 +6319,7 @@ const renderType = 'body';
       const rowOpts = computeRowOpts.value;
       const rowDragOpts = computeRowDragOpts.value;
       const defaultRowHeight = computeDefaultRowHeight.value;
-      const customCellHeight = cellOpts.height || rowOpts.height;
-      const currCellHeight = customCellHeight || defaultRowHeight;
+      const customCellHeight = calcCellHeightFlag ? cellOpts.height || rowOpts.height : 0;
       const {
         disabledMethod: dragDisabledMethod,
         isCrossDrag,
@@ -6505,17 +6504,7 @@ const renderType = 'body';
         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;
@@ -10551,7 +10540,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         isFooter: false
       },
       scrollVMLoading: false,
-      calcCellHeightFlag: 0,
+      calcCellHeightFlag: 1,
       resizeHeightFlag: 0,
       isCustomStatus: false,
       isDragRowMove: false,
@@ -11280,7 +11269,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             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;
             }
@@ -15107,7 +15096,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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;
             }
           }
@@ -15159,7 +15148,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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;
       },
@@ -18198,7 +18187,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           return;
         }
         const defaultRowHeight = computeDefaultRowHeight.value;
-        const currCellHeight = rowRest.resizeHeight || rowRest.height || 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;
@@ -20592,13 +20581,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               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 {
@@ -25660,7 +25649,7 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
               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;
@@ -25671,7 +25660,7 @@ keyboard_hook_hooks.add('tableKeyboardModule', {
               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;