vxe-table 3.19.7 → 3.19.8

package/es/table/src/methods.js

@@ -2402,20 +2402,30 @@ 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.toNumber(firstCellStyle.paddingTop) + XEUtils.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;
 };
@@ -2434,13 +2444,15 @@ const calcCellHeight = ($xeTable) => {
     const el = $xeTable.$refs.refElem;
     if (!isAllOverflow && (scrollYLoad || scrollXLoad || (treeConfig && treeOpts.showLine)) && el) {
         const { handleGetRowId } = 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++;
     }
@@ -6106,7 +6118,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 });
                 reactData.isDragResize = false;
                 internalData._lastResizeTime = Date.now();
@@ -6191,7 +6205,7 @@ const Methods = {
                 const rowid = XEUtils.isString(row) || XEUtils.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');
             });

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.19.7";
+export const version = "3.19.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${"3.19.7"}`;
+const version = `table v${"3.19.8"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.7";
+const version = "3.19.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2713,7 +2713,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.7"}`;
+const log_version = `table v${"3.19.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8800,20 +8800,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(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(firstCellStyle.paddingTop) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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;
 };
@@ -8843,13 +8855,15 @@ const calcCellHeight = $xeTable => {
     const {
       handleGetRowId
     } = 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++;
   }
@@ -13039,7 +13053,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 = {
           ...params,
           resizeHeight,
@@ -13139,7 +13155,7 @@ const Methods = {
         const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(row) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_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');
       });