vxe-table 4.21.0 → 4.21.2

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.2";
 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.2"}`;
 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;
@@ -4186,8 +4186,13 @@ var TableBodyComponent = defineVxeComponent({
             const isEdit = isEnableConf(editRender);
             const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
             let fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
-            const isCellPadding = XEUtils.eqNull(padding) ? (allPadding === null ? cellOpts.padding : allPadding) : padding;
-            const cellOverflow = XEUtils.eqNull(showOverflow) ? allShowOverflow : showOverflow;
+            const cellPadding = getDefaultConfig(padding, (allPadding === null ? cellOpts.padding : allPadding));
+            const isAllCellPadding = cellPadding === true;
+            const isCellPaddingTop = cellPadding ? (isAllCellPadding || cellPadding.top !== false) : false;
+            const isCellPaddingBottom = cellPadding ? (isAllCellPadding || cellPadding.bottom !== false) : false;
+            const isCellPaddingLeft = cellPadding ? (isAllCellPadding || cellPadding.left !== false) : false;
+            const isCellPaddingRight = cellPadding ? (isAllCellPadding || cellPadding.right !== false) : false;
+            const cellOverflow = getDefaultConfig(showOverflow, allShowOverflow);
             const showEllipsis = (cellOverflow === true ? tooltipOpts.mode : cellOverflow) === 'ellipsis';
             const showTitle = (cellOverflow === true ? tooltipOpts.mode : cellOverflow) === 'title';
             const showTooltip = (cellOverflow === true ? tooltipOpts.mode : cellOverflow) === 'tooltip';
@@ -4479,7 +4484,10 @@ var TableBodyComponent = defineVxeComponent({
                         'col--max-height': maxHeight,
                         'fixed--width': !isAutoCellWidth,
                         'fixed--hidden': fixedHiddenColumn,
-                        'is--padding': isCellPadding,
+                        'is--pg-top': isCellPaddingTop,
+                        'is--pg-bottom': isCellPaddingBottom,
+                        'is--pg-left': isCellPaddingLeft,
+                        'is--pg-right': isCellPaddingRight,
                         'is--progress': (fixedHiddenColumn && isAllOverflow) || isVNPreEmptyStatus,
                         'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
                         'is--drag-disabled': isDisabledDrag,
@@ -4991,8 +4999,13 @@ var TableHeaderComponent = defineVxeComponent({
                 const compConf = renderOpts ? renderer$8.get(renderOpts.name) : null;
                 const isColGroup = column.children && column.children.length;
                 const fixedHiddenColumn = overflowX && !isColGroup && (fixedType ? column.fixed !== fixedType : !!column.fixed);
-                const isPadding = XEUtils.isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
-                const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
+                const cellPadding = getDefaultConfig(headerCellOpts.padding, cellOpts.padding);
+                const isAllCellPadding = cellPadding === true;
+                const isCellPaddingTop = cellPadding ? (isAllCellPadding || cellPadding.top !== false) : false;
+                const isCellPaddingBottom = cellPadding ? (isAllCellPadding || cellPadding.bottom !== false) : false;
+                const isCellPaddingLeft = cellPadding ? (isAllCellPadding || cellPadding.left !== false) : false;
+                const isCellPaddingRight = cellPadding ? (isAllCellPadding || cellPadding.right !== false) : false;
+                const headOverflow = getDefaultConfig(showHeaderOverflow, allColumnHeaderOverflow);
                 const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
                 const showEllipsis = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'ellipsis';
                 const showTitle = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'title';
@@ -5108,7 +5121,10 @@ var TableHeaderComponent = defineVxeComponent({
                             'col--group': isColGroup,
                             'col--ellipsis': hasEllipsis,
                             'fixed--width': !isAutoCellWidth,
-                            'is--padding': isPadding,
+                            'is--pg-top': isCellPaddingTop,
+                            'is--pg-bottom': isCellPaddingBottom,
+                            'is--pg-left': isCellPaddingLeft,
+                            'is--pg-right': isCellPaddingRight,
                             'is--sortable': column.sortable,
                             'col--filter': !!filters,
                             'is--filter-active': hasFilter,
@@ -5492,8 +5508,13 @@ var TableFooterComponent = defineVxeComponent({
                 const compConf = renderOpts ? renderer$7.get(renderOpts.name) : null;
                 const showAllTip = footerTooltipOpts.showAll;
                 const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
-                const isPadding = XEUtils.isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
-                const footOverflow = XEUtils.eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
+                const cellPadding = getDefaultConfig(footerCellOpts.padding, cellOpts.padding);
+                const isAllCellPadding = cellPadding === true;
+                const isCellPaddingTop = cellPadding ? (isAllCellPadding || cellPadding.top !== false) : false;
+                const isCellPaddingBottom = cellPadding ? (isAllCellPadding || cellPadding.bottom !== false) : false;
+                const isCellPaddingLeft = cellPadding ? (isAllCellPadding || cellPadding.left !== false) : false;
+                const isCellPaddingRight = cellPadding ? (isAllCellPadding || cellPadding.right !== false) : false;
+                const footOverflow = getDefaultConfig(showFooterOverflow, allColumnFooterOverflow);
                 const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
                 const showEllipsis = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'ellipsis';
                 const showTitle = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'title';
@@ -5600,7 +5621,10 @@ var TableFooterComponent = defineVxeComponent({
                             'col--last': isLastColumn,
                             'fixed--width': !isAutoCellWidth,
                             'fixed--hidden': fixedHiddenColumn,
-                            'is--padding': isPadding,
+                            'is--pg-top': isCellPaddingTop,
+                            'is--pg-bottom': isCellPaddingBottom,
+                            'is--pg-left': isCellPaddingLeft,
+                            'is--pg-right': isCellPaddingRight,
                             'col--ellipsis': hasEllipsis,
                             'col--current': currentColumn === column
                         }, getPropClass(footerClassName, cellParams), getPropClass(footerCellClassName, cellParams)] }, attrs), { style: footerCellStyle ? (XEUtils.isFunction(footerCellStyle) ? footerCellStyle(cellParams) : footerCellStyle) : null }), tfOns), { key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag ? column.id : $columnIndex }), [
@@ -20274,7 +20298,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 +20338,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 +21847,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 +21913,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 +25574,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;
                 }
@@ -29841,6 +29865,12 @@ var VxeTableComponent = defineVxeComponent({
         }, () => {
             reLayoutFlag.value++;
         });
+        watch(() => {
+            const cellOpts = computeCellOpts.value;
+            return cellOpts.height;
+        }, () => {
+            reLayoutFlag.value++;
+        });
         watch(reLayoutFlag, () => {
             $xeTable.recalculate(true);
         });