vxe-table 3.23.1 → 3.23.3

package/package.json

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

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

@@ -511,6 +511,13 @@ export default {
     handleCustomStyle () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
+      const reactData = $xeTable.reactData
+      const { customStore } = reactData
+
+      if (!customStore.visible) {
+        return $xeTable.$nextTick()
+      }
+      reactData.isCustomDragStatus = false
       return updatePopupStyle($xeTable)
     }
   } as any

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

@@ -190,9 +190,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { hasMerge, columns } = storeData
       const checkedAll = $xeExportPanel.computeCheckedAll
       const supportMerge = $xeExportPanel.computeSupportMerge
-      const expColumns = XEUtils.searchTree(columns, column => column.checked, { children: 'children', mapChildren: 'childNodes', original: true })
+      // 内部导出使用 _columns -> _children 为自定义子集
+      const expColumns = XEUtils.searchTree(columns, column => 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/mixin.ts

@@ -1252,7 +1252,7 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
   const exportOpts = $xeTable.computeExportOpts
   const hasTree = !!treeConfig
   const hasRowGroup = rowGroupList.length > 0
-  const customOpts = $xeTable.computeCustomOpts
+  const printOpts = $xeTable.computePrintOpts
   const selectRecords = $xeTable.getCheckboxRecords()
   const proxyOpts = $xeGGWrapper ? $xeGGWrapper.computeProxyOpts : {}
   const hasFooter = !!footerTableData.length
@@ -1275,9 +1275,9 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
     defOpts.isTreeAllExpanded = (defOpts as any).isAllExpand
   }
 
-  const types = defOpts.types || XEUtils.keys(exportOpts._typeMaps)
+  const types: string[] = isPrint ? [] : (defOpts.types || XEUtils.keys(exportOpts._typeMaps))
   const modes = defOpts.modes || []
-  const checkMethod = customOpts.checkMethod
+  const checkMethod = (isPrint ? printOpts : exportOpts).checkMethod
   const exportColumns = collectColumn.slice(0)
   const { columns, excludeFields, includeFields, extraFields } = defOpts
   // 处理类型
@@ -1381,10 +1381,10 @@ function handleExportAndPrint ($xeTable: VxeTableConstructor, options: VxeTableP
     }
   }
   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 = ''
@@ -1536,7 +1536,12 @@ export default {
 
       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/mixin.ts

@@ -10,6 +10,96 @@ const { renderer } = VxeUI
 
 const sourceType = 'table'
 
+function updatePopupStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
+  const $xeGrid = $xeTable.$xeGrid
+  const $xeGantt = $xeTable.$xeGantt
+  const reactData = $xeTable as unknown as TableReactData
+  const internalData = $xeTable as unknown as TableInternalData
+  const $xeGGWrapper = $xeGrid || $xeGantt
+
+  const { filterStore } = reactData
+  const { elemStore } = internalData
+  const { column, targetEl } = filterStore
+  if (!column || !targetEl) {
+    return $xeTable.$nextTick()
+  }
+  const tableEl = $xeTable.$refs.refElem as HTMLDivElement
+  const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode()
+  const filterOpts = $xeTable.computeFilterOpts
+  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 $xeTable.$nextTick()
+  }
+  const tableFilter = $xeTable.$refs.refTableFilter
+  const filterWrapperElem = tableFilter ? (tableFilter as any).$el as HTMLDivElement : null
+  if (!filterWrapperElem) {
+    return $xeTable.$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.$refs.refElem as HTMLDivElement
+      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 $xeTable.$nextTick()
+}
+
 export default {
   methods: {
     /**
@@ -99,92 +189,22 @@ export default {
     },
     handleOpenFilterColumn (evnt: MouseEvent, btnEl: HTMLDivElement | null, colEl: HTMLDivElement, column: VxeTableDefines.ColumnInfo, params: any) {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
-      const $xeGrid = $xeTable.$xeGrid
-      const $xeGantt = $xeTable.$xeGantt
       const reactData = $xeTable as unknown as TableReactData
       const internalData = $xeTable as unknown as TableInternalData
-      const $xeGGWrapper = $xeGrid || $xeGantt
 
       const { initStore, filterStore } = reactData
-      const { elemStore } = internalData
       if (filterStore.column === column && filterStore.visible) {
         filterStore.visible = false
       } else {
-        const tableEl = $xeTable.$refs.refElem as HTMLDivElement
-        const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode()
-        const filterOpts = $xeTable.computeFilterOpts
-        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
         $xeTable.$nextTick(() => {
-          const headerScrollElem = getRefElem(elemStore['main-header-scroll'])
-          if (!headerScrollElem) {
-            return
-          }
-          const tableFilter = $xeTable.$refs.refTableFilter
-          const filterWrapperElem = tableFilter ? (tableFilter as any).$el 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 = filterWidth / 2
-          let left = 0
-          let top = 0
-          let maxHeight = 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.$refs.refElem as HTMLDivElement
-              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
+          updatePopupStyle($xeTable)
         })
       }
       $xeTable.dispatchEvent('filter-visible', { column, field: column.field, property: column.field, filterList: $xeTable.getCheckedFilters(), visible: filterStore.visible }, evnt)
@@ -462,6 +482,16 @@ export default {
         }
       }
     },
+    handleFilterStyle () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
+
+      const { filterStore } = reactData
+      if (!filterStore.visible) {
+        return $xeTable.$nextTick()
+      }
+      return updatePopupStyle($xeTable)
+    },
     /**
      * 清空指定列的筛选条件
      * 如果为空则清空所有列的筛选条件

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

@@ -2634,10 +2634,9 @@ const calcCellHeight = ($xeTable: VxeTableConstructor) => {
   if (!el || !el.clientWidth) {
     return
   }
-  const cellOpts = $xeTable.computeCellOpts
   const treeOpts = $xeTable.computeTreeOpts
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
-  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 => {
@@ -7915,7 +7914,13 @@ const tableMethods: any = {
   },
   handleGlobalScrollEvent (evnt: MouseEvent) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
 
+    const { filterStore } = reactData
+    const filterOpts = $xeTable.computeFilterOpts
+    if (filterStore.visible && filterOpts.transfer) {
+      $xeTable.handleFilterStyle()
+    }
     reUpdateCustomStyleEvent($xeTable, evnt)
   },
   /**
@@ -7934,11 +7939,15 @@ const tableMethods: any = {
    */
   keydownEvent (evnt: any) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
+    const reactData = $xeTable as unknown as TableReactData
 
-    const { filterStore, ctxMenuStore, editStore, keyboardConfig, mouseConfig, mouseOpts, keyboardOpts } = this
+    const { mouseConfig, keyboardConfig } = props
+    const { filterStore, ctxMenuStore, editStore } = reactData
+    const mouseOpts = $xeTable.computeMouseOpts
+    const keyboardOpts = $xeTable.computeKeyboardOpts
     const { actived } = editStore
-    const { keyCode } = evnt
-    const isEsc = keyCode === 27
+    const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE)
     if (isEsc) {
       this.preventEvent(evnt, 'event.keydown', null, () => {
         $xeTable.dispatchEvent('keydown-start', {}, evnt)

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

@@ -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

@@ -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
 }