vxe-table 3.19.7 → 3.19.8

package/lib/table/src/methods.js

@@ -2921,20 +2921,32 @@ function autoCellWidth($xeTable) {
 /**
  * 计算自适应行高
  */
-const calcCellAutoHeight = (rowRest, wrapperEl) => {
-  const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
+const calcCellAutoHeight = ($xeTable, rowRest, wrapperEl) => {
+  const reactData = $xeTable;
+  const {
+    scrollXLoad
+  } = reactData;
+  const wrapperElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
   let colHeight = rowRest.height;
   let firstCellStyle = null;
   let topBottomPadding = 0;
-  for (let i = 0; i < cellElemList.length; i++) {
-    const wrapperElem = cellElemList[i];
+  for (let i = 0; i < wrapperElemList.length; i++) {
+    const wrapperElem = wrapperElemList[i];
     const cellElem = wrapperElem.parentElement;
     if (!firstCellStyle) {
+      const cellStyle = cellElem.style;
+      const orHeight = cellStyle.height;
+      if (!scrollXLoad) {
+        cellStyle.height = '';
+      }
       firstCellStyle = getComputedStyle(cellElem);
       topBottomPadding = firstCellStyle ? Math.ceil(_xeUtils.default.toNumber(firstCellStyle.paddingTop) + _xeUtils.default.toNumber(firstCellStyle.paddingBottom)) : 0;
+      if (!scrollXLoad) {
+        cellStyle.height = orHeight;
+      }
     }
     const cellHeight = wrapperElem ? wrapperElem.clientHeight : 0;
-    colHeight = Math.max(colHeight, Math.ceil(cellHeight + topBottomPadding));
+    colHeight = scrollXLoad ? Math.max(colHeight, Math.ceil(cellHeight + topBottomPadding)) : Math.ceil(cellHeight + topBottomPadding);
   }
   return colHeight;
 };
@@ -2964,13 +2976,15 @@ const calcCellHeight = $xeTable => {
     const {
       handleGetRowId
     } = (0, _util.createHandleGetRowId)($xeTable);
+    el.setAttribute('data-calc-row', 'Y');
     tableData.forEach(row => {
       const rowid = handleGetRowId(row);
       const rowRest = fullAllDataRowIdData[rowid];
       if (rowRest) {
-        const height = calcCellAutoHeight(rowRest, el);
+        const height = calcCellAutoHeight($xeTable, rowRest, el);
         rowRest.height = Math.max(defaultRowHeight, scrollXLoad ? Math.max(rowRest.height, height) : height);
       }
+      el.removeAttribute('data-calc-row');
     });
     reactData.calcCellHeightFlag++;
   }
@@ -7155,7 +7169,9 @@ const Methods = {
         return;
       }
       const handleRsHeight = () => {
-        const resizeHeight = calcCellAutoHeight(rowRest, el);
+        el.setAttribute('data-calc-row', 'Y');
+        const resizeHeight = calcCellAutoHeight($xeTable, rowRest, el);
+        el.removeAttribute('data-calc-row');
         const resizeParams = Object.assign(Object.assign({}, params), {
           resizeHeight,
           resizeRow: row
@@ -7254,7 +7270,7 @@ const Methods = {
         const rowid = _xeUtils.default.isString(row) || _xeUtils.default.isNumber(row) ? row : handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
-          rowRest.resizeHeight = calcCellAutoHeight(rowRest, el);
+          rowRest.resizeHeight = calcCellAutoHeight($xeTable, rowRest, el);
         }
         el.removeAttribute('data-calc-row');
       });