vxe-table 4.21.0 → 4.21.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.21.0",
+  "version": "4.21.2",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -66,7 +66,7 @@
     "typescript": "~5.9.3",
     "vue": "3.4.27",
     "vue-router": "~4.5.1",
-    "vxe-pc-ui": "4.17.14"
+    "vxe-pc-ui": "4.17.18"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/table/src/body.ts

@@ -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'
 
 import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableDefines, VxeComponentSlotType } from '../../../types'
@@ -159,8 +159,15 @@ 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'
@@ -473,7 +480,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/packages/table/src/footer.ts

@@ -6,6 +6,7 @@ import { updateCellTitle, getPropClass } from '../../ui/src/dom'
 import { getCalcHeight } from './util'
 
 import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeTableDefines } from '../../../types'
+import { getDefaultConfig } from '../../ui/src/utils'
 
 const { renderer, renderEmptyElement } = VxeUI
 
@@ -71,8 +72,15 @@ 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'
@@ -182,7 +190,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)],

package/packages/table/src/header.ts

@@ -2,7 +2,7 @@ import { h, ref, Ref, PropType, inject, nextTick, watch, onMounted, onUnmounted
 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'
 
@@ -85,8 +85,15 @@ 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'
@@ -210,7 +217,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/packages/table/src/table.ts

@@ -4880,7 +4880,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
@@ -4920,7 +4920,7 @@ export default defineVxeComponent({
                 if (isScrollYBig && trEl) {
                   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 {
                 if (trEl) {
@@ -6418,7 +6418,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
             }
           }
@@ -6484,7 +6484,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
       },
@@ -10144,7 +10144,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
         }
@@ -14484,6 +14484,12 @@ export default defineVxeComponent({
     }, () => {
       reLayoutFlag.value++
     })
+    watch(() => {
+      const cellOpts = computeCellOpts.value
+      return cellOpts.height
+    }, () => {
+      reLayoutFlag.value++
+    })
     watch(reLayoutFlag, () => {
       $xeTable.recalculate(true)
     })

package/packages/table/src/util.ts

@@ -708,10 +708,10 @@ export function handleRowidOrRow ($xeTable: VxeTableConstructor, rowidOrRow: any
 export function getCellRestHeight (rowRest: VxeTableDefines.RowCacheItem, cellOpts: VxeTablePropTypes.CellConfig, rowOpts: VxeTablePropTypes.RowConfig, defaultRowHeight: number) {
   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/packages/ui/src/utils.ts

@@ -51,6 +51,6 @@ export function eqEmptyValue (cellValue: any) {
   return cellValue === '' || XEUtils.eqNull(cellValue)
 }
 
-export function getDefaultConfig (val1: any, def1: any) {
+export function getDefaultConfig <T = any, D = any> (val1: T, def1: D): (T | D) {
   return XEUtils.eqNull(val1) ? def1 : val1
 }

package/styles/components/table.scss

@@ -8,20 +8,27 @@
 // 局部变量
 .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);
   &.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);
   }
   &.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);
   }
   &.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);
   }
   &.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);
   }
   &.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);
   }
 }
 
@@ -1392,6 +1399,34 @@ $btnThemeList: (
   white-space: nowrap;
 }
 
+.vxe-header--column,
+.vxe-body--column,
+.vxe-footer--column {
+  &.is--pg-top {
+    .vxe-cell {
+      padding-top: var(--vxe-ui-table-current-cell-padding);
+    }
+  }
+  &.is--pg-bottom {
+    .vxe-cell {
+      padding-bottom: var(--vxe-ui-table-current-cell-padding);
+    }
+  }
+  &.is--pg-left {
+    .vxe-cell {
+      padding-left: var(--vxe-ui-table-current-cell-padding);
+    }
+  }
+  &.is--pg-right {
+    .vxe-cell {
+      padding-right: var(--vxe-ui-table-current-cell-padding);
+    }
+  }
+  .vxe-default-textarea {
+    padding: var(--vxe-ui-table-current-cell-padding);
+  }
+}
+
 /*table*/
 .vxe-table--render-default {
   position: relative;
@@ -1504,7 +1539,7 @@ $btnThemeList: (
   .vxe-body--column,
   .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;
     &.col--center {
       text-align: center;
@@ -1573,7 +1608,7 @@ $btnThemeList: (
   .vxe-body--column,
   .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;
     &.col--current {
       background-color: var(--vxe-ui-table-column-current-background-color);
@@ -1857,18 +1892,6 @@ $btnThemeList: (
     .vxe-table--empty-block {
       min-height: var(--vxe-ui-table-row-height-medium);
     }
-    .vxe-header--column,
-    .vxe-body--column,
-    .vxe-footer--column {
-      &.is--padding {
-        .vxe-cell {
-          padding: var(--vxe-ui-table-cell-padding-medium);
-          .vxe-default-textarea {
-            padding: var(--vxe-ui-table-cell-padding-medium);
-          }
-        }
-      }
-    }
     .vxe-cell {
       .vxe-default-input,
       .vxe-default-textarea,
@@ -1890,18 +1913,6 @@ $btnThemeList: (
     .vxe-table--empty-block {
       min-height: var(--vxe-ui-table-row-height-small);
     }
-    .vxe-header--column,
-    .vxe-body--column,
-    .vxe-footer--column {
-      &.is--padding {
-        .vxe-cell {
-          padding: var(--vxe-ui-table-cell-padding-small);
-          .vxe-default-textarea {
-            padding: var(--vxe-ui-table-cell-padding-small);
-          }
-        }
-      }
-    }
     .vxe-cell {
       .vxe-default-input,
       .vxe-default-textarea,
@@ -1923,18 +1934,6 @@ $btnThemeList: (
     .vxe-table--empty-block {
       min-height: var(--vxe-ui-table-row-height-mini);
     }
-    .vxe-header--column,
-    .vxe-body--column,
-    .vxe-footer--column {
-      &.is--padding {
-        .vxe-cell {
-          padding: var(--vxe-ui-table-cell-padding-mini);
-          .vxe-default-textarea {
-            padding: var(--vxe-ui-table-cell-padding-mini);
-          }
-        }
-      }
-    }
     .vxe-cell {
       .vxe-default-input,
       .vxe-default-textarea,
@@ -1951,19 +1950,6 @@ $btnThemeList: (
       padding: 0 var(--vxe-ui-table-cell-padding-mini);
     }
   }
-
-  .vxe-header--column,
-  .vxe-body--column,
-  .vxe-footer--column {
-    &.is--padding {
-      .vxe-cell {
-        padding: var(--vxe-ui-table-cell-padding-default);
-        .vxe-default-textarea {
-          padding: var(--vxe-ui-table-cell-padding-default);
-        }
-      }
-    }
-  }
   
   .vxe-cell {
     white-space: pre-line;
@@ -2188,7 +2174,6 @@ $btnThemeList: (
     & > .vxe-cell {
       display: flex;
       flex-direction: row;
-      align-items: center;
     }
   }
   /*溢出列*/
@@ -2397,30 +2382,6 @@ $btnThemeList: (
     }
   }
 
-  &.size--medium {
-    .vxe-cell--checkbox {
-      font-size: var(--vxe-checkbox-font-size-medium);
-    }
-    .vxe-cell--radio {
-      font-size: var(--vxe-radio-font-size-medium);
-    }
-  }
-  &.size--small {
-    .vxe-cell--checkbox {
-      font-size: var(--vxe-checkbox-font-size-small);
-    }
-    .vxe-cell--radio {
-      font-size: var(--vxe-radio-font-size-small);
-    }
-  }
-  &.size--mini {
-    .vxe-cell--checkbox {
-      font-size: var(--vxe-checkbox-font-size-mini);
-    }
-    .vxe-cell--radio {
-      font-size: var(--vxe-radio-font-size-mini);
-    }
-  }
 
   /*暂无数据*/
   .vxe-table--empty-placeholder,
@@ -2705,6 +2666,9 @@ $btnThemeList: (
     }
   }
 
+  .vxe-cell--wrapper {
+    margin: auto 0;
+  }
   .vxe-body--row {
     .vxe-table--column {
       .vxe-cell {