vxe-table 3.23.0 → 3.23.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.23.0",
+  "version": "3.23.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",
@@ -65,7 +65,7 @@
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
     "vue-template-compiler": "2.6.14",
-    "vxe-pc-ui": "3.17.14"
+    "vxe-pc-ui": "3.17.18"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/table/src/body.ts

@@ -2,7 +2,7 @@ import { PropType, CreateElement } from 'vue'
 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'
@@ -144,8 +144,14 @@ function renderTdColumn (
   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'
@@ -466,7 +472,10 @@ function renderTdColumn (
         '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

@@ -2,7 +2,7 @@ import { PropType, CreateElement } from 'vue'
 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'
 
@@ -44,8 +44,15 @@ function renderRows (h: CreateElement, _vm: any, isOptimizeMode: boolean, tableC
     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'
@@ -155,7 +162,10 @@ function renderRows (h: CreateElement, _vm: any, isOptimizeMode: boolean, tableC
         '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/packages/table/src/header.ts

@@ -2,7 +2,7 @@ import { PropType, CreateElement } from 'vue'
 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'
 
@@ -46,8 +46,15 @@ function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMod
     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'
@@ -170,7 +177,10 @@ function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMod
         '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/methods.ts

@@ -4467,7 +4467,7 @@ function updateRowOffsetTop ($xeTable: VxeTableConstructor & VxeTablePrivateMeth
     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
@@ -4510,7 +4510,7 @@ function updateRowExpandStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMe
             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) {
@@ -7384,7 +7384,7 @@ const tableMethods: any = {
       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
     }
@@ -7551,7 +7551,7 @@ const tableMethods: any = {
       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
         }
       }
@@ -7626,7 +7626,7 @@ const tableMethods: any = {
     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/packages/table/src/table.ts

@@ -1508,6 +1508,12 @@ export default {
       const scrollbarXOpts = $xeTable.computeScrollbarXOpts
       const scrollbarYOpts = $xeTable.computeScrollbarYOpts
       return `${scrollbarXOpts.visible}${scrollbarYOpts.visible}`
+    },
+    computeCellConfHeitht () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
+      const cellOpts = $xeTable.computeCellOpts
+      return cellOpts.height
     }
   } as any,
   watch: {
@@ -1595,6 +1601,9 @@ export default {
     computeScrollbarVisible () {
       this.reLayoutFlag++
     },
+    computeCellConfHeitht () {
+      this.reLayoutFlag++
+    },
     reLayoutFlag () {
       const $xeTable = this
 

package/packages/table/src/util.ts

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

@@ -55,6 +55,6 @@ export function getClass (property: any, params: any) {
   return property ? XEUtils.isFunction(property) ? property(params) : property : ''
 }
 
-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 {