vxe-table 4.21.0 → 4.21.1

package/dist/all.esm.js

@@ -47,7 +47,7 @@ function getDefaultConfig(val1, def1) {
     return XEUtils.eqNull(val1) ? def1 : val1;
 }
 
-const version = "4.21.0";
+const version = "4.21.1";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -769,7 +769,7 @@ function wheelScrollTopTo(diffNum, cb) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.21.0"}`;
+const tableVersion = `table v${"4.21.1"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -1623,10 +1623,10 @@ function handleRowidOrRow($xeTable, rowidOrRow) {
 function getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight) {
     const { height, minHeight, maxHeight } = cellOpts;
     let cellHeight = rowRest.resizeHeight || height || rowOpts.height || rowRest.height || defaultRowHeight;
-    if (maxHeight && maxHeight < cellHeight) {
+    if (maxHeight && maxHeight <= cellHeight) {
         cellHeight = maxHeight;
     }
-    if (minHeight && minHeight > cellHeight) {
+    if (minHeight && minHeight >= cellHeight) {
         cellHeight = minHeight;
     }
     return cellHeight;
@@ -17628,9 +17628,10 @@ var VxeTableComponent = defineVxeComponent({
             if (!el || !el.clientWidth) {
                 return;
             }
+            const cellOpts = computeCellOpts.value;
             const treeOpts = computeTreeOpts.value;
             const defaultRowHeight = computeDefaultRowHeight.value;
-            if (!isAllOverflow && (scrollYLoad || scrollXLoad || (treeConfig && treeOpts.showLine))) {
+            if (!isAllOverflow && (scrollYLoad || scrollXLoad || cellOpts.maxHeight || (treeConfig && treeOpts.showLine))) {
                 const { handleGetRowId } = createHandleGetRowId($xeTable);
                 el.setAttribute('data-calc-row', 'Y');
                 tableData.forEach(row => {
@@ -20274,7 +20275,7 @@ var VxeTableComponent = defineVxeComponent({
                 const rowid = handleGetRowId(row);
                 const rowRest = fullAllDataRowIdData[rowid] || {};
                 rowRest.oTop = offsetTop;
-                offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+                offsetTop += getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
                 // 是否展开行
                 if (expandColumn && rowExpandedMaps[rowid]) {
                     offsetTop += rowRest.expandHeight || expandOpts.height || 0;
@@ -20314,7 +20315,7 @@ var VxeTableComponent = defineVxeComponent({
                                     offsetTop = trEl.offsetTop + trEl.offsetHeight;
                                 }
                                 else {
-                                    offsetTop = rowRest.oTop + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
+                                    offsetTop = rowRest.oTop + getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
                                 }
                             }
                             else {
@@ -21823,7 +21824,7 @@ var VxeTableComponent = defineVxeComponent({
                     if (rowRest) {
                         const resizeHeight = rowRest.resizeHeight;
                         if (resizeHeight || isFull) {
-                            const currCellHeight = resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+                            const currCellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
                             rest[rowid] = currCellHeight;
                         }
                     }
@@ -21889,7 +21890,7 @@ var VxeTableComponent = defineVxeComponent({
                 const rowid = XEUtils.isString(rowOrId) || XEUtils.isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
                 const rowRest = fullAllDataRowIdData[rowid];
                 if (rowRest) {
-                    return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+                    return getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
                 }
                 return 0;
             },
@@ -25550,7 +25551,7 @@ var VxeTableComponent = defineVxeComponent({
                     return;
                 }
                 const defaultRowHeight = computeDefaultRowHeight.value;
-                let currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+                let currCellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
                 if (!showOverflow) {
                     currCellHeight = tdEl.clientHeight;
                 }