vxe-table 3.17.6 → 3.17.7

package/lib/table/src/methods.js

@@ -2751,12 +2751,17 @@ function autoCellWidth($xeTable) {
 const calcCellAutoHeight = (rowRest, wrapperEl) => {
   const cellElemList = 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 cellElem = cellElemList[i];
-    const tdEl = cellElem.parentElement;
-    const topBottomPadding = Math.ceil(_xeUtils.default.toNumber(tdEl.style.paddingTop) + _xeUtils.default.toNumber(tdEl.style.paddingBottom));
-    const cellHeight = cellElem ? cellElem.clientHeight : 0;
-    colHeight = Math.max(colHeight - topBottomPadding, Math.ceil(cellHeight));
+    const wrapperElem = cellElemList[i];
+    const cellElem = wrapperElem.parentElement;
+    if (!firstCellStyle) {
+      firstCellStyle = getComputedStyle(cellElem);
+      topBottomPadding = firstCellStyle ? Math.ceil(_xeUtils.default.toNumber(firstCellStyle.paddingTop) + _xeUtils.default.toNumber(firstCellStyle.paddingBottom)) : 0;
+    }
+    const cellHeight = wrapperElem ? wrapperElem.clientHeight : 0;
+    colHeight = Math.max(colHeight, Math.ceil(cellHeight + topBottomPadding));
   }
   return colHeight;
 };
@@ -6551,6 +6556,7 @@ const Methods = {
   },
   handleRowResizeMousedownEvent(evnt, params) {
     const $xeTable = this;
+    const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
     evnt.stopPropagation();
@@ -6558,6 +6564,9 @@ const Methods = {
     const {
       row
     } = params;
+    const {
+      showOverflow
+    } = props;
     const {
       overflowX,
       scrollbarWidth,
@@ -6596,7 +6605,10 @@ const Methods = {
       return;
     }
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
-    const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+    let currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+    if (!showOverflow) {
+      currCellHeight = tdEl.clientHeight;
+    }
     const tableRect = tableEl.getBoundingClientRect();
     const trRect = trEl.getBoundingClientRect();
     const targetOffsetY = dragClientY - trRect.y - trEl.clientHeight;
@@ -6781,6 +6793,32 @@ const Methods = {
     });
     return rest;
   },
+  recalcRowHeight(rowOrId) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
+    const rows = _xeUtils.default.isArray(rowOrId) ? rowOrId : [rowOrId];
+    const el = $xeTable.$refs.refElem;
+    if (el) {
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
+      el.setAttribute('data-calc-row', 'Y');
+      rows.forEach(row => {
+        const rowid = _xeUtils.default.isString(row) || _xeUtils.default.isNumber(row) ? row : handleGetRowId(row);
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          rowRest.resizeHeight = calcCellAutoHeight(rowRest, el);
+        }
+        el.removeAttribute('data-calc-row');
+      });
+      reactData.calcCellHeightFlag++;
+    }
+    return $xeTable.$nextTick();
+  },
   setRowHeight(rowOrId, height) {
     const $xeTable = this;
     const reactData = $xeTable;