vxe-table 4.21.0 → 4.21.2

package/es/table/src/body.js

@@ -4,7 +4,7 @@ import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { getRowid, createHandleGetRowId, getCellRestHeight } from './util';
 import { updateCellTitle, getPropClass } from '../../ui/src/dom';
-import { isEnableConf } from '../../ui/src/utils';
+import { isEnableConf, getDefaultConfig } from '../../ui/src/utils';
 import { getSlotVNs } from '../../ui/src/vn';
 const { getI18n, renderer, renderEmptyElement } = VxeUI;
 const sourceType = 'table';
@@ -135,8 +135,13 @@ export default 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';
@@ -428,7 +433,10 @@ export default 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,

package/es/table/src/footer.js

@@ -4,6 +4,7 @@ import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { updateCellTitle, getPropClass } from '../../ui/src/dom';
 import { getCalcHeight } from './util';
+import { getDefaultConfig } from '../../ui/src/utils';
 const { renderer, renderEmptyElement } = VxeUI;
 const sourceType = 'table';
 const renderType = 'footer';
@@ -61,8 +62,13 @@ export default defineVxeComponent({
                 const compConf = renderOpts ? renderer.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';
@@ -169,7 +175,10 @@ export default 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 }), [

package/es/table/src/header.js

@@ -2,7 +2,7 @@ import { h, ref, inject, nextTick, watch, onMounted, onUnmounted } from 'vue';
 import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
-import { isEnableConf } from '../../ui/src/utils';
+import { getDefaultConfig, isEnableConf } from '../../ui/src/utils';
 import { getCalcHeight, convertHeaderColumnToRows, convertHeaderToGridRows } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 const { renderer, renderEmptyElement } = VxeUI;
@@ -73,8 +73,13 @@ export default defineVxeComponent({
                 const compConf = renderOpts ? renderer.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';
@@ -192,7 +197,10 @@ export default 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,

package/es/table/src/table.js

@@ -4679,7 +4679,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 +4719,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 +6232,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 +6298,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 +9969,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;
                 }
@@ -14264,6 +14264,12 @@ export default defineVxeComponent({
         }, () => {
             reLayoutFlag.value++;
         });
+        watch(() => {
+            const cellOpts = computeCellOpts.value;
+            return cellOpts.height;
+        }, () => {
+            reLayoutFlag.value++;
+        });
         watch(reLayoutFlag, () => {
             $xeTable.recalculate(true);
         });

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

@@ -1834,21 +1834,28 @@
 
 .vxe-table {
   --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-default);
+  --vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-default);
+  --vxe-ui-table-current-row-line-height: var(--vxe-ui-table-row-line-height);
 }
 .vxe-table.size--xlarge {
   --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-xlarge);
+  --vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-xlarge);
 }
 .vxe-table.size--large {
   --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-large);
+  --vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-large);
 }
 .vxe-table.size--medium {
   --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-medium);
+  --vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-medium);
 }
 .vxe-table.size--small {
   --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-small);
+  --vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-small);
 }
 .vxe-table.size--mini {
   --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-mini);
+  --vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-mini);
 }
 
 .vxe-table-slots,
@@ -2977,6 +2984,32 @@
   white-space: nowrap;
 }
 
+.vxe-header--column.is--pg-top .vxe-cell,
+.vxe-body--column.is--pg-top .vxe-cell,
+.vxe-footer--column.is--pg-top .vxe-cell {
+  padding-top: var(--vxe-ui-table-current-cell-padding);
+}
+.vxe-header--column.is--pg-bottom .vxe-cell,
+.vxe-body--column.is--pg-bottom .vxe-cell,
+.vxe-footer--column.is--pg-bottom .vxe-cell {
+  padding-bottom: var(--vxe-ui-table-current-cell-padding);
+}
+.vxe-header--column.is--pg-left .vxe-cell,
+.vxe-body--column.is--pg-left .vxe-cell,
+.vxe-footer--column.is--pg-left .vxe-cell {
+  padding-left: var(--vxe-ui-table-current-cell-padding);
+}
+.vxe-header--column.is--pg-right .vxe-cell,
+.vxe-body--column.is--pg-right .vxe-cell,
+.vxe-footer--column.is--pg-right .vxe-cell {
+  padding-right: var(--vxe-ui-table-current-cell-padding);
+}
+.vxe-header--column .vxe-default-textarea,
+.vxe-body--column .vxe-default-textarea,
+.vxe-footer--column .vxe-default-textarea {
+  padding: var(--vxe-ui-table-current-cell-padding);
+}
+
 /*table*/
 .vxe-table--render-default {
   position: relative;
@@ -3067,7 +3100,7 @@
 .vxe-table--render-default .vxe-body--column,
 .vxe-table--render-default .vxe-footer--column {
   position: relative;
-  line-height: var(--vxe-ui-table-row-line-height);
+  line-height: var(--vxe-ui-table-current-row-line-height);
   text-align: left;
 }
 .vxe-table--render-default .vxe-header--column.col--center,
@@ -3117,7 +3150,7 @@
 .vxe-table--render-default .vxe-body--column,
 .vxe-table--render-default .vxe-footer--column {
   position: relative;
-  line-height: var(--vxe-ui-table-row-line-height);
+  line-height: var(--vxe-ui-table-current-row-line-height);
   text-align: left;
 }
 .vxe-table--render-default .vxe-header--column.col--current,
@@ -3270,16 +3303,6 @@
 .vxe-table--render-default.size--medium .vxe-table--empty-block {
   min-height: var(--vxe-ui-table-row-height-medium);
 }
-.vxe-table--render-default.size--medium .vxe-header--column.is--padding .vxe-cell,
-.vxe-table--render-default.size--medium .vxe-body--column.is--padding .vxe-cell,
-.vxe-table--render-default.size--medium .vxe-footer--column.is--padding .vxe-cell {
-  padding: var(--vxe-ui-table-cell-padding-medium);
-}
-.vxe-table--render-default.size--medium .vxe-header--column.is--padding .vxe-cell .vxe-default-textarea,
-.vxe-table--render-default.size--medium .vxe-body--column.is--padding .vxe-cell .vxe-default-textarea,
-.vxe-table--render-default.size--medium .vxe-footer--column.is--padding .vxe-cell .vxe-default-textarea {
-  padding: var(--vxe-ui-table-cell-padding-medium);
-}
 .vxe-table--render-default.size--medium .vxe-cell .vxe-default-input,
 .vxe-table--render-default.size--medium .vxe-cell .vxe-default-textarea,
 .vxe-table--render-default.size--medium .vxe-cell .vxe-default-select {
@@ -3295,16 +3318,6 @@
 .vxe-table--render-default.size--small .vxe-table--empty-block {
   min-height: var(--vxe-ui-table-row-height-small);
 }
-.vxe-table--render-default.size--small .vxe-header--column.is--padding .vxe-cell,
-.vxe-table--render-default.size--small .vxe-body--column.is--padding .vxe-cell,
-.vxe-table--render-default.size--small .vxe-footer--column.is--padding .vxe-cell {
-  padding: var(--vxe-ui-table-cell-padding-small);
-}
-.vxe-table--render-default.size--small .vxe-header--column.is--padding .vxe-cell .vxe-default-textarea,
-.vxe-table--render-default.size--small .vxe-body--column.is--padding .vxe-cell .vxe-default-textarea,
-.vxe-table--render-default.size--small .vxe-footer--column.is--padding .vxe-cell .vxe-default-textarea {
-  padding: var(--vxe-ui-table-cell-padding-small);
-}
 .vxe-table--render-default.size--small .vxe-cell .vxe-default-input,
 .vxe-table--render-default.size--small .vxe-cell .vxe-default-textarea,
 .vxe-table--render-default.size--small .vxe-cell .vxe-default-select {
@@ -3320,16 +3333,6 @@
 .vxe-table--render-default.size--mini .vxe-table--empty-block {
   min-height: var(--vxe-ui-table-row-height-mini);
 }
-.vxe-table--render-default.size--mini .vxe-header--column.is--padding .vxe-cell,
-.vxe-table--render-default.size--mini .vxe-body--column.is--padding .vxe-cell,
-.vxe-table--render-default.size--mini .vxe-footer--column.is--padding .vxe-cell {
-  padding: var(--vxe-ui-table-cell-padding-mini);
-}
-.vxe-table--render-default.size--mini .vxe-header--column.is--padding .vxe-cell .vxe-default-textarea,
-.vxe-table--render-default.size--mini .vxe-body--column.is--padding .vxe-cell .vxe-default-textarea,
-.vxe-table--render-default.size--mini .vxe-footer--column.is--padding .vxe-cell .vxe-default-textarea {
-  padding: var(--vxe-ui-table-cell-padding-mini);
-}
 .vxe-table--render-default.size--mini .vxe-cell .vxe-default-input,
 .vxe-table--render-default.size--mini .vxe-cell .vxe-default-textarea,
 .vxe-table--render-default.size--mini .vxe-cell .vxe-default-select {
@@ -3341,16 +3344,6 @@
 .vxe-table--render-default.size--mini .vxe-cell--valid-error-tip {
   padding: 0 var(--vxe-ui-table-cell-padding-mini);
 }
-.vxe-table--render-default .vxe-header--column.is--padding .vxe-cell,
-.vxe-table--render-default .vxe-body--column.is--padding .vxe-cell,
-.vxe-table--render-default .vxe-footer--column.is--padding .vxe-cell {
-  padding: var(--vxe-ui-table-cell-padding-default);
-}
-.vxe-table--render-default .vxe-header--column.is--padding .vxe-cell .vxe-default-textarea,
-.vxe-table--render-default .vxe-body--column.is--padding .vxe-cell .vxe-default-textarea,
-.vxe-table--render-default .vxe-footer--column.is--padding .vxe-cell .vxe-default-textarea {
-  padding: var(--vxe-ui-table-cell-padding-default);
-}
 .vxe-table--render-default .vxe-cell {
   white-space: pre-line;
   word-break: break-all;
@@ -3618,7 +3611,6 @@
 .vxe-table--render-default .vxe-body--column > .vxe-cell {
   display: flex;
   flex-direction: row;
-  align-items: center;
 }
 .vxe-table--render-default {
   /*溢出列*/
@@ -3798,24 +3790,6 @@
   color: var(--vxe-ui-input-disabled-color);
   cursor: not-allowed;
 }
-.vxe-table--render-default.size--medium .vxe-cell--checkbox {
-  font-size: var(--vxe-checkbox-font-size-medium);
-}
-.vxe-table--render-default.size--medium .vxe-cell--radio {
-  font-size: var(--vxe-radio-font-size-medium);
-}
-.vxe-table--render-default.size--small .vxe-cell--checkbox {
-  font-size: var(--vxe-checkbox-font-size-small);
-}
-.vxe-table--render-default.size--small .vxe-cell--radio {
-  font-size: var(--vxe-radio-font-size-small);
-}
-.vxe-table--render-default.size--mini .vxe-cell--checkbox {
-  font-size: var(--vxe-checkbox-font-size-mini);
-}
-.vxe-table--render-default.size--mini .vxe-cell--radio {
-  font-size: var(--vxe-radio-font-size-mini);
-}
 .vxe-table--render-default {
   /*暂无数据*/
 }
@@ -4020,6 +3994,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;