vxe-table 3.23.0 → 3.23.2

package/es/table/src/body.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { defineVxeComponent } from '../../ui/src/comp';
-import { isEnableConf, getClass } from '../../ui/src/utils';
+import { isEnableConf, getClass, getDefaultConfig } from '../../ui/src/utils';
 import { getRowid, createHandleGetRowId, getCellRestHeight } from './util';
 import { updateCellTitle } from '../../ui/src/dom';
 import { getSlotVNs } from '../../ui/src/vn';
@@ -118,8 +118,13 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     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 === 'ellipsis';
     const showTitle = cellOverflow === 'title';
     const showTooltip = cellOverflow === true ? tooltipOpts.mode === 'tooltip' : cellOverflow === 'tooltip';
@@ -420,7 +425,10 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
                 '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

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { defineVxeComponent } from '../../ui/src/comp';
-import { getClass } from '../../ui/src/utils';
+import { getClass, getDefaultConfig } from '../../ui/src/utils';
 import { updateCellTitle } from '../../ui/src/dom';
 import { getCalcHeight } from './util';
 const sourceType = 'table';
@@ -36,8 +36,13 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
         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';
@@ -145,7 +150,10 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
                     '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
                 }, getClass(footerClassName, cellParams), getClass(footerCellClassName, cellParams)],

package/es/table/src/header.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { defineVxeComponent } from '../../ui/src/comp';
-import { isEnableConf, getClass } from '../../ui/src/utils';
+import { isEnableConf, getClass, getDefaultConfig } from '../../ui/src/utils';
 import { getCalcHeight, convertHeaderColumnToRows, convertHeaderToGridRows } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 const { renderer, renderEmptyElement } = VxeUI;
@@ -38,8 +38,13 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIndex, co
         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 === 'ellipsis';
         const showTitle = headOverflow === 'title';
@@ -158,7 +163,10 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIndex, co
                     '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/methods.js

@@ -4283,7 +4283,7 @@ function updateRowOffsetTop($xeTable) {
         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;
@@ -4325,7 +4325,7 @@ function updateRowExpandStyle($xeTable) {
                             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 {
@@ -7097,7 +7097,7 @@ const tableMethods = {
             return;
         }
         const defaultRowHeight = $xeTable.computeDefaultRowHeight;
-        let currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
+        let currCellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
         if (!showOverflow) {
             currCellHeight = tdEl.clientHeight;
         }
@@ -7262,7 +7262,7 @@ const tableMethods = {
             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;
                 }
             }
@@ -7334,7 +7334,7 @@ const tableMethods = {
         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;
     },

package/es/table/src/table.js

@@ -1391,6 +1391,11 @@ export default {
             const scrollbarXOpts = $xeTable.computeScrollbarXOpts;
             const scrollbarYOpts = $xeTable.computeScrollbarYOpts;
             return `${scrollbarXOpts.visible}${scrollbarYOpts.visible}`;
+        },
+        computeCellConfHeitht() {
+            const $xeTable = this;
+            const cellOpts = $xeTable.computeCellOpts;
+            return cellOpts.height;
         } }),
     watch: {
         data(value) {
@@ -1474,6 +1479,9 @@ export default {
         computeScrollbarVisible() {
             this.reLayoutFlag++;
         },
+        computeCellConfHeitht() {
+            this.reLayoutFlag++;
+        },
         reLayoutFlag() {
             const $xeTable = this;
             $xeTable.$nextTick(() => $xeTable.recalculate(true));

package/es/table/src/util.js

@@ -672,10 +672,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;