vxe-table 4.13.38 → 4.13.40

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

@@ -1,4 +1,5 @@
-import { defineComponent, h, ref, computed, inject, Teleport } from 'vue'
+import { h, ref, computed, inject, Teleport } from 'vue'
+import { defineVxeComponent } from '../../../ui/src/comp'
 import { VxeUI } from '../../../ui'
 import { formatText, isEnableConf } from '../../../ui/src/utils'
 import { getPropClass } from '../../../ui/src/dom'
@@ -9,7 +10,7 @@ import type { VxeTableConstructor, VxeTableMethods, VxeTablePrivateMethods } fro
 
 const { getI18n, getIcon, renderer } = VxeUI
 
-export default defineComponent({
+export default defineVxeComponent({
   name: 'VxeTableFilterPanel',
   props: {
     filterStore: Object as any

package/packages/table/module/menu/panel.ts

@@ -1,4 +1,5 @@
-import { defineComponent, h, Teleport, inject, ref, Ref, createCommentVNode } from 'vue'
+import { h, Teleport, inject, ref, Ref, createCommentVNode } from 'vue'
+import { defineVxeComponent } from '../../../ui/src/comp'
 import { VxeUI } from '../../../ui'
 import { getFuncText } from '../../../ui/src/utils'
 import XEUtils from 'xe-utils'
@@ -7,7 +8,7 @@ import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods } fro
 
 const { getIcon } = VxeUI
 
-export default defineComponent({
+export default defineVxeComponent({
   name: 'VxeTableMenuPanel',
   setup (props, context) {
     const xID = XEUtils.uniqueId()

package/packages/table/src/body.ts

@@ -1,4 +1,5 @@
-import { defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, onMounted, onUnmounted } from 'vue'
+import { TransitionGroup, h, ref, Ref, PropType, inject, nextTick, onMounted, onUnmounted } from 'vue'
+import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getOffsetSize, calcTreeLine, getRowid, createHandleGetRowId, getCellRestHeight } from './util'
@@ -12,7 +13,7 @@ const { getI18n, renderer, renderEmptyElement } = VxeUI
 
 const renderType = 'body'
 
-export default defineComponent({
+export default defineVxeComponent({
   name: 'VxeTableBody',
   props: {
     tableData: Array as PropType<any[]>,
@@ -45,7 +46,7 @@ export default defineComponent({
       return !!(isDragResize || (lastScrollTime && Date.now() < lastScrollTime + (delayHover as number)))
     }
 
-    const renderLine = (rowid: string, params: VxeTableDefines.CellRenderBodyParams, cellHeight: number) => {
+    const renderLine = (rowid: string, params: VxeTableDefines.CellRenderBodyParams, cellHeight: number): VxeComponentSlotType[] => {
       const { row, column } = params
       const { afterFullData } = tableInternalData
       const { treeConfig } = tableProps
@@ -302,7 +303,7 @@ export default defineComponent({
         if (mEndRow) {
           const meRowRest = fullAllDataRowIdData[getRowid($xeTable, mEndRow)]
           if (meRowRest) {
-            cellHeight += meRowRest.oTop - rowRest.oTop + getCellRestHeight(meRowRest, cellOpts, rowOpts, defaultRowHeight)
+            cellHeight += meRowRest.oTop + getCellRestHeight(meRowRest, cellOpts, rowOpts, defaultRowHeight) - rowRest.oTop - getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight)
           }
         }
       }
@@ -326,7 +327,7 @@ export default defineComponent({
         tcStyle.minHeight = `${cellHeight}px`
       }
 
-      const tdVNs: any[] = []
+      const tdVNs: VxeComponentSlotType[] = []
       if (fixedHiddenColumn && isAllOverflow) {
         tdVNs.push(
           h('div', {
@@ -609,7 +610,7 @@ export default defineComponent({
             const { showOverflow } = expandColumn || {}
             const colid = expandColumn.id
             const colRest = fullColumnIdData[colid] || {}
-            const hasEllipsis = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? isAllOverflow : showOverflow
+            const hasEllipsis = XEUtils.eqNull(showOverflow) ? isAllOverflow : showOverflow
             let columnIndex = -1
             let $columnIndex = -1
             let _columnIndex = -1
@@ -791,13 +792,14 @@ export default defineComponent({
 
       let emptyContent: string | VxeComponentSlotType | VxeComponentSlotType[]
       const emptySlot = slots ? slots.empty : null
+      const emptyParams = { $table: $xeTable, $grid: $xeGrid }
       if (emptySlot) {
-        emptyContent = $xeTable.callSlot(emptySlot, { $table: $xeTable, $grid: $xeGrid })
+        emptyContent = $xeTable.callSlot(emptySlot, emptyParams)
       } else {
         const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null
         const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null
         if (rtEmptyView) {
-          emptyContent = getSlotVNs(rtEmptyView(emptyOpts, { $table: $xeTable }))
+          emptyContent = getSlotVNs(rtEmptyView(emptyOpts, emptyParams))
         } else {
           emptyContent = tableProps.emptyText || getI18n('vxe.table.emptyText')
         }
@@ -880,7 +882,7 @@ export default defineComponent({
                 ? [
                     h('span', {
                       class: 'vxe-table--cell-main-area-btn',
-                      onMousedown (evnt: any) {
+                      onMousedown (evnt: MouseEvent) {
                         if ($xeTable.triggerCellAreaExtendMousedownEvent) {
                           $xeTable.triggerCellAreaExtendMousedownEvent(evnt, { $table: $xeTable, fixed: fixedType, type: renderType })
                         }

package/packages/table/src/cell.ts

@@ -400,20 +400,6 @@ export const Cell = {
     const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column
     const renderOpts = editRender || cellRender
     const defaultSlot = slots ? slots.default : null
-    if (defaultSlot) {
-      return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params))
-    }
-    if (renderOpts) {
-      const compConf = renderer.get(renderOpts.name)
-      if (compConf) {
-        const rtCell = compConf.renderTableCell || compConf.renderCell
-        const rtDefault = compConf.renderTableDefault || compConf.renderDefault
-        const renderFn = editRender ? rtCell : rtDefault
-        if (renderFn) {
-          return renderCellBaseVNs(params, getSlotVNs(renderFn(renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params))))
-        }
-      }
-    }
     let cellValue: string | number | null = ''
     if (isRowGroupStatus && field && row.isAggregate) {
       const aggRow: VxeTableDefines.AggregateRowInfo = row
@@ -460,6 +446,20 @@ export const Cell = {
         }
       }
     } else {
+      if (defaultSlot) {
+        return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params))
+      }
+      if (renderOpts) {
+        const compConf = renderer.get(renderOpts.name)
+        if (compConf) {
+          const rtCell = compConf.renderTableCell || compConf.renderCell
+          const rtDefault = compConf.renderTableDefault || compConf.renderDefault
+          const renderFn = editRender ? rtCell : rtDefault
+          if (renderFn) {
+            return renderCellBaseVNs(params, getSlotVNs(renderFn(renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params))))
+          }
+        }
+      }
       cellValue = $table.getCellLabel(row, column)
     }
     const cellPlaceholder = editRender ? editRender.placeholder : ''

package/packages/table/src/column.ts

@@ -1,4 +1,5 @@
-import { defineComponent, h, onUnmounted, inject, ref, PropType, provide, onMounted, createCommentVNode } from 'vue'
+import { h, onUnmounted, inject, ref, PropType, provide, onMounted, createCommentVNode } from 'vue'
+import { defineVxeComponent } from '../../ui/src/comp'
 import { XEColumnInstance, watchColumn, assembleColumn, destroyColumn } from './util'
 import Cell from './cell'
 
@@ -130,7 +131,7 @@ export const columnProps = {
   params: Object as PropType<VxeColumnPropTypes.Params>
 }
 
-export default defineComponent({
+export default defineVxeComponent({
   name: 'VxeColumn',
   props: columnProps,
   setup (props, { slots }) {

package/packages/table/src/footer.ts

@@ -1,4 +1,5 @@
-import { defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, onMounted, onUnmounted } from 'vue'
+import { TransitionGroup, h, ref, Ref, PropType, inject, nextTick, onMounted, onUnmounted } from 'vue'
+import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { updateCellTitle, getPropClass } from '../../ui/src/dom'
@@ -10,7 +11,7 @@ const { renderer, renderEmptyElement } = VxeUI
 
 const renderType = 'footer'
 
-export default defineComponent({
+export default defineVxeComponent({
   name: 'VxeTableFooter',
   props: {
     footerTableData: {

package/packages/table/src/group.ts

@@ -1,11 +1,12 @@
-import { defineComponent, h, onUnmounted, provide, inject, ref, onMounted, Slot, createCommentVNode } from 'vue'
+import { h, onUnmounted, provide, inject, ref, onMounted, Slot, createCommentVNode } from 'vue'
+import { defineVxeComponent } from '../../ui/src/comp'
 import { columnProps } from './column'
 import { XEColumnInstance, watchColumn, assembleColumn, destroyColumn } from './util'
 import Cell from './cell'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types'
 
-export default defineComponent({
+export default defineVxeComponent({
   name: 'VxeColgroup',
   props: columnProps,
   setup (props, { slots }) {

package/packages/table/src/header.ts

@@ -1,4 +1,5 @@
-import { defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, watch, onMounted, onUnmounted } from 'vue'
+import { TransitionGroup, h, ref, Ref, PropType, inject, nextTick, watch, onMounted, onUnmounted } from 'vue'
+import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getCellHeight, convertHeaderColumnToRows } from './util'
@@ -9,7 +10,7 @@ const { renderer, renderEmptyElement } = VxeUI
 
 const renderType = 'header'
 
-export default defineComponent({
+export default defineVxeComponent({
   name: 'VxeTableHeader',
   props: {
     tableData: Array as PropType<any[]>,

package/packages/table/src/props.ts

@@ -159,11 +159,20 @@ export default {
   },
 
   /** 高级属性 */
-  // （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
+  /**
+   * （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
+   * @deprecated
+   */
   columnKey: Boolean as PropType<VxeTablePropTypes.ColumnKey>,
-  // （即将废弃）rowKey 已废弃，被 row-config.useKey 替换
+  /**
+   * （即将废弃）rowKey 已废弃，被 row-config.useKey 替换
+   * @deprecated
+   */
   rowKey: Boolean as PropType<VxeTablePropTypes.RowKey>,
-  // （即将废弃）rowId 已废弃，被 row-config.keyField 替换
+  /**
+   * （即将废弃）rowId 已废弃，被 row-config.keyField 替换
+   * @deprecated
+   */
   rowId: {
     type: String as PropType<VxeTablePropTypes.RowId>,
     default: () => getConfig().table.rowId
@@ -200,11 +209,17 @@ export default {
   rowConfig: Object as PropType<VxeTablePropTypes.RowConfig>,
   // 数据聚合配置项
   aggregateConfig: Object as PropType<VxeTablePropTypes.AggregateConfig>,
-  //  已废弃，被 aggregateConfig 替换
+  /**
+   * 已废弃，被 aggregateConfig 替换
+   * @deprecated
+   */
   rowGroupConfig: Object as PropType<VxeTablePropTypes.RowGroupConfig>,
   // 当前行配置项
   currentRowConfig: Object as PropType<VxeTablePropTypes.CurrentRowConfig>,
-  // 已废弃，被 rowDragConfig 替换
+  /**
+   * 已废弃，被 rowDragConfig 替换
+   * @deprecated
+   */
   dragConfig: Object as PropType<VxeTablePropTypes.DragConfig>,
   // 行拖拽排序配置项
   rowDragConfig: Object as PropType<VxeTablePropTypes.RowDragConfig>,
@@ -258,9 +273,15 @@ export default {
   emptyRender: Object as PropType<VxeTablePropTypes.EmptyRender>,
   // 自定义列配置项
   customConfig: Object as PropType<VxeTablePropTypes.CustomConfig>,
-  // （即将废弃）横向虚拟滚动配置项
+  /**
+   * （即将废弃）横向虚拟滚动配置项
+   * @deprecated
+   */
   scrollX: Object as PropType<VxeTablePropTypes.ScrollX>,
-  // （即将废弃）纵向虚拟滚动配置项
+  /**
+   * （即将废弃）纵向虚拟滚动配置项
+   * @deprecated
+   */
   scrollY: Object as PropType<VxeTablePropTypes.ScrollY>,
   // 横向虚拟滚动配置项
   virtualXConfig: Object as PropType<VxeTablePropTypes.VirtualXConfig>,

package/packages/table/src/table.ts

@@ -1,4 +1,5 @@
-import { defineComponent, h, ComponentPublicInstance, reactive, ref, Ref, provide, inject, nextTick, onActivated, onDeactivated, onBeforeUnmount, onUnmounted, watch, computed, onMounted } from 'vue'
+import { h, ComponentPublicInstance, reactive, ref, Ref, provide, inject, nextTick, onActivated, onDeactivated, onBeforeUnmount, onUnmounted, watch, computed, onMounted } from 'vue'
+import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey } from '../../ui/src/dom'
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils'
@@ -28,7 +29,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE'
 const maxYHeight = 5e6
 const maxXWidth = 5e6
 
-export default defineComponent({
+export default defineVxeComponent({
   name: 'VxeTable',
   props: tableProps,
   emits: tableEmits,
@@ -247,6 +248,7 @@ export default defineComponent({
 
       isRowGroupStatus: false,
       rowGroupList: [],
+      aggHandleFields: [],
 
       rowGroupExpandedFlag: 1,
       rowExpandedFlag: 1,
@@ -769,22 +771,15 @@ export default defineComponent({
     })
 
     const computeTableRowExpandedList = computed(() => {
-      const { treeConfig } = props
-      const { rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag, isRowGroupStatus } = reactData
+      const { rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData
       const { visibleDataRowIdData, rowExpandedMaps } = internalData
-      const treeOpts = computeTreeOpts.value
-      const { transform } = treeOpts
       const expandList: any[] = []
       if (expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
-        if (isRowGroupStatus || (treeConfig && transform)) {
-          XEUtils.each(rowExpandedMaps, (row, rowid) => {
-            if (visibleDataRowIdData[rowid]) {
-              expandList.push(row)
-            }
-          })
-        } else {
-          return XEUtils.values(rowExpandedMaps)
-        }
+        XEUtils.each(rowExpandedMaps, (row, rowid) => {
+          if (visibleDataRowIdData[rowid]) {
+            expandList.push(row)
+          }
+        })
       }
       return expandList
     })
@@ -866,6 +861,19 @@ export default defineComponent({
       return rowGroupOpts.groupFields
     })
 
+    const computeRowGroupColumns = computed(() => {
+      const { rowGroupList } = reactData
+      const { fullColumnFieldData } = internalData
+      const rgColumns: VxeTableDefines.ColumnInfo[] = []
+      rowGroupList.forEach(aggConf => {
+        const colRest = fullColumnFieldData[aggConf.field]
+        if (colRest) {
+          rgColumns.push(colRest.column)
+        }
+      })
+      return rgColumns
+    })
+
     const refMaps: VxeTablePrivateRef = {
       refElem,
       refTooltip,
@@ -954,6 +962,8 @@ export default defineComponent({
       computeIsMaxFixedColumn,
       computeIsAllCheckboxDisabled,
       computeVirtualScrollBars,
+      computeRowGroupFields,
+      computeRowGroupColumns,
 
       computeSXOpts,
       computeSYOpts
@@ -990,6 +1000,10 @@ export default defineComponent({
       internalData.isCurrDeepKey = hasDeepKey(keyField)
     }
 
+    const hangleStorageDefaultValue = (value: boolean | null | undefined, isAll: boolean) => {
+      return XEUtils.isBoolean(value) ? value : isAll
+    }
+
     const getNextSortOrder = (column: VxeTableDefines.ColumnInfo) => {
       const sortOpts = computeSortOpts.value
       const { orders = [] } = sortOpts
@@ -1523,13 +1537,13 @@ export default defineComponent({
       const { customConfig } = props
       const tableId = computeTableId.value
       const customOpts = computeCustomOpts.value
-      const { storage, restoreStore } = customOpts
+      const { storage, restoreStore, storeOptions } = customOpts
       const isAllCustom = storage === true
-      const storageOpts: VxeTableDefines.VxeTableCustomStorageObj = isAllCustom ? {} : Object.assign({}, storage || {})
-      const isCustomResizable = isAllCustom || storageOpts.resizable
-      const isCustomVisible = isAllCustom || storageOpts.visible
-      const isCustomFixed = isAllCustom || storageOpts.fixed
-      const isCustomSort = isAllCustom || storageOpts.sort
+      const storageOpts: VxeTableDefines.VxeTableCustomStorageObj = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions)
+      const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom)
+      const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom)
+      const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom)
+      const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom)
       if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
         if (!tableId) {
           errLog('vxe.error.reqProp', ['id'])
@@ -3135,13 +3149,18 @@ export default defineComponent({
     }
 
     const handleUpdateRowGroup = (groupFields?: string[]) => {
-      reactData.rowGroupList = groupFields
-        ? (XEUtils.isArray(groupFields) ? groupFields : [groupFields]).map(field => {
-            return {
-              field
-            }
+      const aggFields: string[] = []
+      const aggConfs: { field: string }[] = []
+      if (groupFields) {
+        (XEUtils.isArray(groupFields) ? groupFields : [groupFields]).forEach(field => {
+          aggFields.push(field)
+          aggConfs.push({
+            field
           })
-        : []
+        })
+      }
+      reactData.rowGroupList = aggConfs
+      reactData.aggHandleFields = aggFields
     }
 
     const handleeGroupSummary = (aggList: VxeTableDefines.AggregateRowInfo[]) => {
@@ -3323,9 +3342,9 @@ export default defineComponent({
       internalData.cvCacheMaps = {}
       reactData.isRowLoading = true
       reactData.scrollVMLoading = false
-      internalData.treeExpandedMaps = {}
+      // internalData.treeExpandedMaps = {}
       reactData.treeExpandedFlag++
-      internalData.rowExpandedMaps = {}
+      // internalData.rowExpandedMaps = {}
       reactData.rowExpandedFlag++
       internalData.insertRowMaps = {}
       reactData.insertRowFlag++
@@ -4072,7 +4091,7 @@ export default defineComponent({
     const handleUpdateResize = () => {
       const el = refElem.value
       if (el && el.clientWidth && el.clientHeight) {
-        tableMethods.recalculate()
+        $xeTable.recalculate()
       }
     }
 
@@ -6715,13 +6734,13 @@ export default defineComponent({
         const { id } = props
         const customOpts = computeCustomOpts.value
         const { collectColumn } = internalData
-        const { storage, checkMethod } = customOpts
+        const { storage, checkMethod, storeOptions } = customOpts
         const isAllCustom = storage === true
-        const storageOpts: VxeTableDefines.VxeTableCustomStorageObj = isAllCustom ? {} : Object.assign({}, storage || {})
-        const isCustomResizable = isAllCustom || storageOpts.resizable
-        const isCustomVisible = isAllCustom || storageOpts.visible
-        const isCustomFixed = isAllCustom || storageOpts.fixed
-        const isCustomSort = isAllCustom || storageOpts.sort
+        const storageOpts: VxeTableDefines.VxeTableCustomStorageObj = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions)
+        const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom)
+        const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom)
+        const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom)
+        const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom)
         const resizableData: Record<string, number> = {}
         const sortData: Record<string, number> = {}
         const visibleData: Record<string, boolean> = {}
@@ -8204,13 +8223,13 @@ export default defineComponent({
         const { customConfig } = props
         const tableId = computeTableId.value
         const customOpts = computeCustomOpts.value
-        const { updateStore, storage } = customOpts
+        const { updateStore, storage, storeOptions } = customOpts
         const isAllCustom = storage === true
-        const storageOpts: VxeTableDefines.VxeTableCustomStorageObj = isAllCustom ? {} : Object.assign({}, storage || {})
-        const isCustomResizable = isAllCustom || storageOpts.resizable
-        const isCustomVisible = isAllCustom || storageOpts.visible
-        const isCustomFixed = isAllCustom || storageOpts.fixed
-        const isCustomSort = isAllCustom || storageOpts.sort
+        const storageOpts: VxeTableDefines.VxeTableCustomStorageObj = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions)
+        const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom)
+        const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom)
+        const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom)
+        const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom)
         if (type !== 'reset') {
           // fix：修复拖动列宽，重置按钮无法点击的问题
           reactData.isCustomStatus = true
@@ -10687,14 +10706,15 @@ export default defineComponent({
 
     const renderEmptyBody = () => {
       const emptyOpts = computeEmptyOpts.value
-      const params = { $table: $xeTable }
-      if (slots.empty) {
-        return slots.empty(params)
+      const emptySlot = slots.empty
+      const emptyParams = { $table: $xeTable, $grid: $xeGrid }
+      if (emptySlot) {
+        return emptySlot(emptyParams)
       } else {
         const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null
         const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null
         if (rtEmptyView) {
-          return getSlotVNs(rtEmptyView(emptyOpts, params))
+          return getSlotVNs(rtEmptyView(emptyOpts, emptyParams))
         }
       }
       return getFuncText(props.emptyText) || getI18n('vxe.table.emptyText')

package/packages/toolbar/src/toolbar.ts

@@ -1,4 +1,5 @@
-import { defineComponent, h, ref, Ref, computed, inject, createCommentVNode, VNode, reactive, nextTick, PropType } from 'vue'
+import { h, ref, Ref, computed, inject, createCommentVNode, VNode, reactive, nextTick, PropType } from 'vue'
+import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
@@ -9,7 +10,7 @@ import type { VxeGridConstructor, GridPrivateMethods, ToolbarMethods, ToolbarInt
 
 const { getConfig, getIcon, getI18n, renderer, commands, createEvent, useFns } = VxeUI
 
-export default defineComponent({
+export default defineVxeComponent({
   name: 'VxeToolbar',
   props: {
     loading: Boolean,

package/packages/ui/index.ts

@@ -100,6 +100,14 @@ VxeUI.setConfig({
       showFooter: true,
       placement: 'top-right',
       //  storage: false,
+      storeOptions: {
+        visible: true,
+        resizable: true,
+        sort: true,
+        fixed: true
+        // rowGroup: false,
+        // aggFunc: false
+      },
       //  checkMethod () {},
       modalOptions: {
         showMaximize: true,
@@ -308,6 +316,9 @@ VxeUI.setIcon({
   TABLE_DRAG_DISABLED: iconPrefix + 'no-drop',
   TABLE_ROW_GROUP_OPEN: iconPrefix + 'arrow-right rotate90',
   TABLE_ROW_GROUP_CLOSE: iconPrefix + 'arrow-right',
+  TABLE_AGGREGATION_GROUPING: iconPrefix + 'grouping',
+  TABLE_AGGREGATION_VALUES: iconPrefix + 'values',
+  TABLE_AGGREGATION_DELETE: iconPrefix + 'close',
 
   // toolbar
   TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',

package/packages/ui/src/comp.ts

@@ -0,0 +1,3 @@
+import { defineComponent } from 'vue'
+
+export const defineVxeComponent = defineComponent

package/styles/components/icon.scss

@@ -5,7 +5,7 @@
 @font-face {
   font-family: "vxetableiconfont";
   src: 
-       url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
+       url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
 }
 
 @keyframes rollCircle {
@@ -79,6 +79,18 @@ $btnThemeList: (
   }
 }
 
+.vxe-table-icon-close:before {
+  content: "\e6e9";
+}
+
+.vxe-table-icon-grouping:before {
+  content: "\e66c";
+}
+
+.vxe-table-icon-values:before {
+  content: "\e66f";
+}
+
 .vxe-table-icon-add-sub:before {
   content: "\e6bc";
 }

package/styles/components/table-module/custom.scss

@@ -52,9 +52,14 @@
   }
 }
 
+.vxe-table-custom--handle-wrapper {
+  display: flex;
+  flex-direction: column;
+}
+
 .vxe-table-custom-wrapper {
   display: none;
-  flex-direction: column;
+  flex-direction: row;
   position: absolute;
   text-align: left;
   background-color: var(--vxe-ui-layout-background-color);
@@ -120,8 +125,10 @@
 }
 
 .vxe-table-custom--header {
+  display: flex;
+  align-items: center;
   flex-shrink: 0;
-  padding: 0.28em 0;
+  height: 2.4em;
   font-weight: 700;
   border-bottom: 1px solid var(--vxe-ui-base-popup-border-color);
   user-select: none;