vxe-table 4.21.1 → 4.21.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.21.1",
+  "version": "4.21.3",
   "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.23"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/table/module/custom/hook.ts

@@ -482,7 +482,11 @@ VxeUI.hooks.add('tableCustomModule', {
       handleUpdateCustomColumn,
       handleCustomStyle () {
         const reactData = $xeTable.reactData
+        const { customStore } = reactData
 
+        if (!customStore.visible) {
+          return nextTick()
+        }
         reactData.isCustomDragStatus = false
         return updatePopupStyle()
       }

package/packages/table/module/export/export-panel.ts

@@ -137,9 +137,10 @@ export default defineVxeComponent({
       const { hasMerge, columns } = storeData
       const checkedAll = computeCheckedAll.value
       const supportMerge = computeSupportMerge.value
-      const expColumns = XEUtils.searchTree(columns, (column: any) => column.checked, { children: 'children', mapChildren: 'childNodes', original: true })
+      // 内部导出使用 _columns -> _children 为自定义子集
+      const expColumns = XEUtils.searchTree(columns, (column: any) => column.checked, { children: 'children', mapChildren: '_children', original: true })
       return Object.assign({}, defaultOptions, {
-        columns: expColumns,
+        _columns: expColumns,
         isMerge: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false
       })
     }

package/packages/table/module/export/hook.ts

@@ -304,7 +304,7 @@ const tableExportMethodKeys: (keyof TableExportMethods)[] = ['exportData', 'impo
 hooks.add('tableExportModule', {
   setupTable ($xeTable) {
     const { props, reactData, internalData } = $xeTable
-    const { computeTreeOpts, computePrintOpts, computeExportOpts, computeImportOpts, computeCustomOpts, computeSeqOpts, computeRadioOpts, computeCheckboxOpts, computeColumnOpts, computeAggregateOpts } = $xeTable.getComputeMaps()
+    const { computeTreeOpts, computePrintOpts, computeExportOpts, computeImportOpts, computeSeqOpts, computeRadioOpts, computeCheckboxOpts, computeColumnOpts, computeAggregateOpts } = $xeTable.getComputeMaps()
 
     const getSeq = (cellValue: any, row: any, $rowIndex: number, column: VxeTableDefines.ColumnInfo, $columnIndex: number) => {
       const seqOpts = computeSeqOpts.value
@@ -1280,9 +1280,9 @@ hooks.add('tableExportModule', {
       const { initStore, isGroup, rowGroupList, footerTableData, exportStore, exportParams } = reactData
       const { collectColumn, mergeBodyList, mergeFooterList } = internalData
       const exportOpts = computeExportOpts.value
+      const printOpts = computePrintOpts.value
       const hasTree = !!treeConfig
       const hasRowGroup = rowGroupList.length > 0
-      const customOpts = computeCustomOpts.value
       const selectRecords = $xeTable.getCheckboxRecords()
       const proxyOpts = $xeGGWrapper ? $xeGGWrapper.getComputeMaps().computeProxyOpts.value : {} as VxeGridPropTypes.ProxyOpts
       const hasFooter = !!footerTableData.length
@@ -1305,9 +1305,9 @@ hooks.add('tableExportModule', {
         defOpts.isTreeAllExpanded = (defOpts as any).isAllExpand
       }
 
-      const types: string[] = defOpts.types || XEUtils.keys(exportOpts._typeMaps)
+      const types: string[] = isPrint ? [] : (defOpts.types || XEUtils.keys(exportOpts._typeMaps))
       const modes: string[] = defOpts.modes || []
-      const checkMethod = customOpts.checkMethod
+      const checkMethod = (isPrint ? printOpts : exportOpts).checkMethod
       const exportColumns = collectColumn.slice(0)
       const { columns, excludeFields, includeFields, extraFields } = defOpts
       // 处理类型
@@ -1411,10 +1411,10 @@ hooks.add('tableExportModule', {
         }
       }
       if (!modeList.some(item => item.value === mode)) {
-        exportParams.mode = modeList[0].value
+        exportParams.mode = modeList.length ? modeList[0].value : ''
       }
       if (!typeList.some(item => item.value === type)) {
-        exportParams.type = typeList[0].value
+        exportParams.type = typeList.length ? typeList[0].value : ''
       }
       if (!exportParams.widthMode) {
         exportParams.widthMode = ''
@@ -1510,7 +1510,12 @@ hooks.add('tableExportModule', {
 
         let isCustomCol = false
         let customCols = []
-        if (columns) {
+        const _columns = (opts as any)._columns
+        if (_columns) {
+          // 内部导出使用 _columns -> _children 为自定义子集
+          isCustomCol = true
+          customCols = XEUtils.searchTree(_columns, () => true, { children: '_children', mapChildren: 'childNodes', original: true })
+        } else if (columns) {
           isCustomCol = true
           customCols = XEUtils.searchTree(columns, () => true, { children: 'children', mapChildren: 'childNodes', original: true })
         } else {

package/packages/table/module/filter/hook.ts

@@ -23,6 +23,89 @@ hooks.add('tableFilterModule', {
     const { refElem, refTableFilter } = $xeTable.getRefMaps()
     const { computeFilterOpts, computeMouseOpts } = $xeTable.getComputeMaps()
 
+    const updatePopupStyle = () => {
+      const { filterStore } = reactData
+      const { elemStore } = internalData
+      const { column, targetEl } = filterStore
+      if (!column || !targetEl) {
+        return nextTick()
+      }
+      const tableEl = refElem.value
+      const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode()
+      const filterOpts = computeFilterOpts.value
+      const { maxHeight: customMaxHeight, transfer, zIndex } = filterOpts
+      const currEl = targetEl
+      const tableRect = tableEl.getBoundingClientRect()
+      const filterRender = column ? column.filterRender : null
+      const compConf = filterRender && isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
+
+      const headerScrollElem = getRefElem(elemStore['main-header-scroll'])
+      if (!headerScrollElem) {
+        return nextTick()
+      }
+      const tableFilter = refTableFilter.value
+      const filterWrapperElem = tableFilter ? tableFilter.getRefMaps().refElem.value as HTMLDivElement : null
+      if (!filterWrapperElem) {
+        return nextTick()
+      }
+      const btnRect = currEl.getBoundingClientRect()
+      const filterHeadElem = filterWrapperElem.querySelector<HTMLDivElement>('.vxe-table--filter-header')
+      const filterFootElem = filterWrapperElem.querySelector<HTMLDivElement>('.vxe-table--filter-footer')
+      const filterWidth = filterWrapperElem.offsetWidth
+      const centerWidth = currEl ? filterWidth / 2 : ((filterWidth - column.renderWidth) / 2)
+      let left = 0
+      let top = 0
+      let maxHeight: number = 0
+      /**
+       * 是否显示筛选按钮图标
+       * 如果不存在图标，则相对单元格居中显示
+       */
+      if (transfer) {
+        left = btnRect.left - centerWidth + scrollLeft
+        top = btnRect.top + currEl.clientHeight + scrollTop
+        maxHeight = Math.min(Math.max(tableRect.height, Math.floor(visibleHeight / 2)), Math.max(80, visibleHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 28))
+        if (left < 16) {
+          left = 16
+        } else if (left > (visibleWidth - filterWidth - 16)) {
+          left = visibleWidth - filterWidth - 16
+        }
+      } else {
+        left = btnRect.left - tableRect.left - centerWidth
+        top = btnRect.top - tableRect.top + currEl.clientHeight
+        maxHeight = Math.max(40, tableEl.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14)
+        if (left < 1) {
+          left = 1
+        } else if (left > (tableEl.clientWidth - filterWidth - 1)) {
+          left = tableEl.clientWidth - filterWidth - 1
+        }
+        if ($xeGGWrapper) {
+          const wrapperEl = $xeGGWrapper.getRefMaps().refElem.value
+          if (wrapperEl) {
+            const wrapperRect = wrapperEl.getBoundingClientRect()
+            top += tableRect.top - wrapperRect.top
+          }
+        }
+      }
+      const fStys: Record<string, any> = {
+        top: toCssUnit(top),
+        left: toCssUnit(left)
+      }
+      if (zIndex) {
+        fStys.zIndex = zIndex
+      }
+      filterStore.style = fStys
+      // 筛选面板是自适应表格高度
+      if (compConf ? !compConf.tableFilterAutoHeight : false) {
+        maxHeight = 0
+      } else {
+        if (customMaxHeight) {
+          maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight
+        }
+      }
+      // 判断面板不能大于表格高度
+      filterStore.maxHeight = maxHeight
+      return nextTick()
+    }
     const filterPrivateMethods: TableFilterPrivateMethods = {
       checkFilterOptions () {
         const { filterStore } = reactData
@@ -35,91 +118,20 @@ hooks.add('tableFilterModule', {
       },
       handleOpenFilterColumn (evnt: MouseEvent, btnEl: HTMLDivElement | null, colEl: HTMLDivElement, column: VxeTableDefines.ColumnInfo, params: any) {
         const { initStore, filterStore } = reactData
-        const { elemStore } = internalData
         if (filterStore.column === column && filterStore.visible) {
           filterStore.visible = false
         } else {
-          const tableEl = refElem.value
-          const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode()
-          const filterOpts = computeFilterOpts.value
-          const { maxHeight: customMaxHeight, transfer, zIndex } = filterOpts
           const currEl = btnEl || colEl
-          const tableRect = tableEl.getBoundingClientRect()
-          const filterRender = column ? column.filterRender : null
-          const compConf = filterRender && isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
           $xeTable.handleFilterOptions(column)
           internalData._currFilterParams = params
+          filterStore.targetEl = currEl
           filterStore.style = null
           filterStore.visible = true
           initStore.filter = true
-          nextTick(() => {
-            const headerScrollElem = getRefElem(elemStore['main-header-scroll'])
-            if (!headerScrollElem) {
-              return
-            }
-            const tableFilter = refTableFilter.value
-            const filterWrapperElem = tableFilter ? tableFilter.getRefMaps().refElem.value as HTMLDivElement : null
-            if (!filterWrapperElem) {
-              return
-            }
-            const btnRect = currEl.getBoundingClientRect()
-            const filterHeadElem = filterWrapperElem.querySelector<HTMLDivElement>('.vxe-table--filter-header')
-            const filterFootElem = filterWrapperElem.querySelector<HTMLDivElement>('.vxe-table--filter-footer')
-            const filterWidth = filterWrapperElem.offsetWidth
-            const centerWidth = btnEl ? filterWidth / 2 : ((filterWidth - column.renderWidth) / 2)
-            let left = 0
-            let top = 0
-            let maxHeight: number = 0
-            /**
-             * 是否显示筛选按钮图标
-             * 如果不存在图标，则相对单元格居中显示
-             */
-            if (transfer) {
-              left = btnRect.left - centerWidth + scrollLeft
-              top = btnRect.top + currEl.clientHeight + scrollTop
-              maxHeight = Math.min(Math.max(tableRect.height, Math.floor(visibleHeight / 2)), Math.max(80, visibleHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 28))
-              if (left < 16) {
-                left = 16
-              } else if (left > (visibleWidth - filterWidth - 16)) {
-                left = visibleWidth - filterWidth - 16
-              }
-            } else {
-              left = btnRect.left - tableRect.left - centerWidth
-              top = btnRect.top - tableRect.top + currEl.clientHeight
-              maxHeight = Math.max(40, tableEl.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14)
-              if (left < 1) {
-                left = 1
-              } else if (left > (tableEl.clientWidth - filterWidth - 1)) {
-                left = tableEl.clientWidth - filterWidth - 1
-              }
-              if ($xeGGWrapper) {
-                const wrapperEl = $xeGGWrapper.getRefMaps().refElem.value
-                if (wrapperEl) {
-                  const wrapperRect = wrapperEl.getBoundingClientRect()
-                  top += tableRect.top - wrapperRect.top
-                }
-              }
-            }
-            const fStys: Record<string, any> = {
-              top: toCssUnit(top),
-              left: toCssUnit(left)
-            }
-            if (zIndex) {
-              fStys.zIndex = zIndex
-            }
-            filterStore.style = fStys
-            // 筛选面板是自适应表格高度
-            if (compConf ? !compConf.tableFilterAutoHeight : false) {
-              maxHeight = 0
-            } else {
-              if (customMaxHeight) {
-                maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight
-              }
-            }
-            // 判断面板不能大于表格高度
-            filterStore.maxHeight = maxHeight
-          })
         }
+        nextTick(() => {
+          updatePopupStyle()
+        })
         $xeTable.dispatchEvent('filter-visible', { column, field: column.field, property: column.field, filterList: $xeTable.getCheckedFilters(), visible: filterStore.visible }, evnt)
       },
       /**
@@ -276,6 +288,13 @@ hooks.add('tableFilterModule', {
             $xeTable.dispatchEvent('clear-filter', { filterList: [] }, evnt)
           }
         }
+      },
+      handleFilterStyle () {
+        const { filterStore } = reactData
+        if (!filterStore.visible) {
+          return nextTick()
+        }
+        return updatePopupStyle()
       }
     }
 

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

@@ -2176,10 +2176,9 @@ export default defineVxeComponent({
       if (!el || !el.clientWidth) {
         return
       }
-      const cellOpts = computeCellOpts.value
       const treeOpts = computeTreeOpts.value
       const defaultRowHeight = computeDefaultRowHeight.value
-      if (!isAllOverflow && (scrollYLoad || scrollXLoad || cellOpts.maxHeight || (treeConfig && treeOpts.showLine))) {
+      if (!isAllOverflow && (scrollYLoad || scrollXLoad || (treeConfig && treeOpts.showLine))) {
         const { handleGetRowId } = createHandleGetRowId($xeTable)
         el.setAttribute('data-calc-row', 'Y')
         tableData.forEach(row => {
@@ -8597,6 +8596,11 @@ export default defineVxeComponent({
     }
 
     const handleGlobalScrollEvent = (evnt: MouseEvent) => {
+      const { filterStore } = reactData
+      const filterOpts = computeFilterOpts.value
+      if (filterStore.visible && filterOpts.transfer) {
+        $xeTable.handleFilterStyle()
+      }
       reUpdateCustomStyleEvent(evnt)
     }
 
@@ -14485,6 +14489,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

@@ -251,6 +251,7 @@ export function createReactData (): TableReactData {
     customColumnList: [],
     // 当前选中的筛选列
     filterStore: {
+      targetEl: null,
       isAllSelected: false,
       isIndeterminate: false,
       style: null,

package/packages/ui/src/dom.ts

@@ -20,7 +20,7 @@ export function getTpImg () {
 }
 
 export function getPropClass (property: any, params: any) {
-  return property ? XEUtils.isFunction(property) ? property(params) : property : ''
+  return property ? (XEUtils.isFunction(property) ? property(params) : property) || '' : ''
 }
 
 function getClsRE (cls: any) {

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;
@@ -2396,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,