vxe-table 4.21.0 → 4.21.1

package/es/table/src/table.js

@@ -2033,9 +2033,10 @@ export default 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 => {
@@ -4679,7 +4680,7 @@ export default 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;
@@ -4719,7 +4720,7 @@ export default 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 {
@@ -6232,7 +6233,7 @@ export default 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;
                         }
                     }
@@ -6298,7 +6299,7 @@ export default 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;
             },
@@ -9969,7 +9970,7 @@ export default 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;
                 }

package/es/table/src/util.js

@@ -645,10 +645,10 @@ export function handleRowidOrRow($xeTable, rowidOrRow) {
 export 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;

package/es/table/style.css

@@ -3618,7 +3618,6 @@
 .vxe-table--render-default .vxe-body--column > .vxe-cell {
   display: flex;
   flex-direction: row;
-  align-items: center;
 }
 .vxe-table--render-default {
   /*溢出列*/
@@ -4020,6 +4019,9 @@
 .vxe-table--render-default.vxe-editable .vxe-body--column {
   padding: 0;
 }
+.vxe-table--render-default .vxe-cell--wrapper {
+  margin: auto 0;
+}
 .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > .vxe-reusekeep-control {
   position: absolute;
   width: 0;