vxe-table 4.3.13 → 4.4.0-beta.0

package/packages/form/src/form-item.ts

@@ -80,6 +80,9 @@ export default defineComponent({
       const { slots, title, visible, folding, field, collapseNode, itemRender, showError, errRule, className, titleOverflow } = item
       const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
       const itemClassName = compConf ? compConf.itemClassName : ''
+      const itemStyle = compConf ? compConf.itemStyle : null
+      const itemContentClassName = compConf ? compConf.itemContentClassName : ''
+      const itemContentStyle = compConf ? compConf.itemContentStyle : null
       const defaultSlot = slots ? slots.default : null
       const titleSlot = slots ? slots.title : null
       const span = item.span || props.span
@@ -160,7 +163,8 @@ export default defineComponent({
             'is--active': isActivetem($xeform, item),
             'is--error': showError
           }
-        ]
+        ],
+        style: XEUtils.isFunction(itemStyle) ? itemStyle(params) : itemStyle
       }, [
         h('div', {
           class: 'vxe-form--item-inner'
@@ -176,7 +180,8 @@ export default defineComponent({
             ...ons
           }, renderTitle($xeform, item)) : null,
           h('div', {
-            class: ['vxe-form--item-content', align ? `align--${align}` : null]
+            class: ['vxe-form--item-content', align ? `align--${align}` : '', itemContentClassName ? (XEUtils.isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName) : ''],
+            style: XEUtils.isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle
           }, contentVNs)
         ])
       ])

package/packages/grid/src/grid.ts

@@ -15,7 +15,7 @@ import { TableMethods, VxeGridConstructor, VxeGridEmits, GridReactData, VxeGridP
 
 const tableComponentPropKeys = Object.keys(tableComponentProps as any)
 
-const tableComponentMethodKeys: (keyof TableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'openTooltip', 'focus', 'blur', 'connect']
+const tableComponentMethodKeys: (keyof TableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'openTooltip', 'focus', 'blur', 'connect']
 
 const gridComponentEmits: VxeGridEmits = [
   ...tableComponentEmits,
@@ -37,9 +37,9 @@ export default defineComponent({
   name: 'VxeGrid',
   props: {
     ...tableComponentProps,
-    columns: Array as PropType<VxeGridPropTypes.Columns>,
+    columns: Array as PropType<VxeGridPropTypes.Columns<any>>,
     pagerConfig: Object as PropType<VxeGridPropTypes.PagerConfig>,
-    proxyConfig: Object as PropType<VxeGridPropTypes.ProxyConfig>,
+    proxyConfig: Object as PropType<VxeGridPropTypes.ProxyConfig<any>>,
     toolbarConfig: Object as PropType<VxeGridPropTypes.ToolbarConfig>,
     formConfig: Object as PropType<VxeGridPropTypes.FormConfig>,
     zoomConfig: Object as PropType<VxeGridPropTypes.ZoomConfig>,
@@ -70,7 +70,7 @@ export default defineComponent({
         pageSize: GlobalConfig.pager.pageSize || 10,
         currentPage: 1
       }
-    } as GridReactData)
+    } as GridReactData<any>)
 
     const refElem = ref() as Ref<HTMLDivElement>
     const refTable = ref() as Ref<ComponentPublicInstance<VxeTableProps, VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods>>

package/packages/select/src/select.ts

@@ -52,7 +52,9 @@ export default defineComponent({
   emits: [
     'update:modelValue',
     'change',
-    'clear'
+    'clear',
+    'blur',
+    'focus'
   ] as VxeSelectEmits,
   setup (props, context) {
     const { slots, emit } = context
@@ -635,14 +637,16 @@ export default defineComponent({
       }
     }
 
-    const focusEvent = () => {
+    const focusEvent = (evnt: FocusEvent) => {
       if (!props.disabled) {
         reactData.isActivated = true
       }
+      selectMethods.dispatchEvent('focus', {}, evnt)
     }
 
-    const blurEvent = () => {
+    const blurEvent = (evnt: FocusEvent) => {
       reactData.isActivated = false
+      selectMethods.dispatchEvent('blur', {}, evnt)
     }
 
     const modelSearchEvent = (value: string) => {

package/packages/table/src/body.ts

@@ -139,7 +139,8 @@ export default defineComponent({
       const { height: rowHeight } = rowOpts
       const renderOpts = editRender || cellRender
       const compConf = renderOpts ? VXETable.renderer.get(renderOpts.name) : null
-      const cellClassName = compConf ? compConf.cellClassName : ''
+      const compCellClassName = compConf ? compConf.cellClassName : ''
+      const compCellStyle = compConf ? compConf.cellStyle : ''
       const showAllTip = tooltipOpts.showAll
       const columnIndex = $xetable.getColumnIndex(column)
       const _columnIndex = $xetable.getVTColumnIndex(column)
@@ -303,7 +304,7 @@ export default defineComponent({
             'col--valid-error': hasValidError,
             'col--current': currentColumn === column
           },
-          getPropClass(cellClassName, params),
+          getPropClass(compCellClassName, params),
           getPropClass(className, params),
           getPropClass(allCellClassName, params)
         ],
@@ -311,7 +312,7 @@ export default defineComponent({
         ...attrs,
         style: Object.assign({
           height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
-        }, cellStyle ? (XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle) : null),
+        }, XEUtils.isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle),
         ...tdOns
       }, tdVNs)
     }

package/packages/table/src/column.ts

@@ -42,7 +42,7 @@ export const columnProps = {
   // 给表尾单元格附加 className
   footerClassName: [String, Function] as PropType<VxeColumnPropTypes.FooterClassName>,
   // 格式化显示内容
-  formatter: [Function, Array, String] as PropType<VxeColumnPropTypes.Formatter>,
+  formatter: [Function, Array, String] as PropType<VxeColumnPropTypes.Formatter<any>>,
   // 是否允许排序
   sortable: Boolean as PropType<VxeColumnPropTypes.Sortable>,
   // 自定义排序的属性
@@ -54,7 +54,7 @@ export const columnProps = {
   // 筛选是否允许多选
   filterMultiple: { type: Boolean as PropType<VxeColumnPropTypes.FilterMultiple>, default: true },
   // 自定义筛选方法
-  filterMethod: Function as PropType<VxeColumnPropTypes.FilterMethod>,
+  filterMethod: Function as PropType<VxeColumnPropTypes.FilterMethod<any>>,
   // 筛选重置方法
   filterResetMethod: Function as PropType<VxeColumnPropTypes.FilterResetMethod>,
   // 筛选复原方法
@@ -76,7 +76,7 @@ export const columnProps = {
   // 单元格值类型
   cellType: String as PropType<VxeColumnPropTypes.CellType>,
   // 单元格渲染配置项
-  cellRender: Object as PropType<VxeColumnPropTypes.CellRender>,
+  cellRender: Object as PropType<VxeColumnPropTypes.CellRender<any>>,
   // 单元格编辑渲染配置项
   editRender: Object as PropType<VxeColumnPropTypes.EditRender>,
   // 内容渲染配置项

package/packages/table/src/props.ts

@@ -138,13 +138,13 @@ export default {
   // 区域配置项
   areaConfig: Object as PropType<VxeTablePropTypes.AreaConfig>,
   // 按键配置项
-  keyboardConfig: Object as PropType<VxeTablePropTypes.KeyboardConfig>,
+  keyboardConfig: Object as PropType<VxeTablePropTypes.KeyboardConfig<any>>,
   // 复制粘/贴配置项
-  clipConfig: Object as PropType<VxeTablePropTypes.ClipConfig>,
+  clipConfig: Object as PropType<VxeTablePropTypes.ClipConfig<any>>,
   // 查找/替换配置项
   fnrConfig: Object as PropType<VxeTablePropTypes.FNRConfig>,
   // 编辑配置项
-  editConfig: Object as PropType<VxeTablePropTypes.EditConfig>,
+  editConfig: Object as PropType<VxeTablePropTypes.EditConfig<any>>,
   // 校验配置项
   validConfig: Object as PropType<VxeTablePropTypes.ValidConfig>,
   // 校验规则配置项

package/packages/table/src/table.ts

@@ -18,7 +18,7 @@ import VxeLoading from '../../loading/index'
 import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, restoreScrollListener, XEBodyScrollElement } from './util'
 import { getSlotVNs } from '../../tools/vn'
 
-import { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePropTypes, VxeToolbarConstructor, VxeTooltipInstance, TablePrivateMethods, VxeTablePrivateRef, VxeTablePrivateComputed, VxeTablePrivateMethods, VxeTableMethods, TableMethods, VxeMenuPanelInstance, VxeTableDefines, VxeTableProps, VxeColumnPropTypes } from '../../../types/all'
+import { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, TableReactData, TableInternalData, VxeTablePropTypes, VxeToolbarConstructor, VxeTooltipInstance, TablePrivateMethods, VxeTablePrivateRef, VxeTablePrivateComputed, VxeTablePrivateMethods, VxeTableMethods, TableMethods, VxeMenuPanelInstance, VxeTableDefines, VxeTableProps, VxeColumnPropTypes, VxeTableDataRow } from '../../../types/all'
 
 const isWebkit = browse['-webkit'] && !browse.edge
 
@@ -420,7 +420,7 @@ export default defineComponent({
     })
 
     const computeClipOpts = computed(() => {
-      return Object.assign({}, GlobalConfig.table.clipConfig, props.clipConfig) as VxeTablePropTypes.ClipOpts
+      return Object.assign({}, GlobalConfig.table.clipConfig, props.clipConfig)
     })
 
     const computeFNROpts = computed(() => {
@@ -3116,7 +3116,7 @@ export default defineComponent({
         return new Promise(resolve => {
           // 还原滚动条位置
           if (lastScrollLeft || lastScrollTop) {
-            return restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then(resolve).then(() => {
+            return restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then().then(() => {
               // 存在滚动行为未结束情况
               setTimeout(resolve, 30)
             })
@@ -3560,13 +3560,16 @@ export default defineComponent({
        * 判断指定列是否为筛选状态，如果为空则判断所有列
        * @param {String} fieldOrColumn 字段名
        */
-      isFilter (fieldOrColumn) {
+      isActiveFilterByColumn (fieldOrColumn) {
         const column = handleFieldOrColumn($xetable, fieldOrColumn)
         if (column) {
           return column.filters && column.filters.some((option) => option.checked)
         }
         return $xetable.getCheckedFilters().length > 0
       },
+      isFilter (fieldOrColumn) {
+        return tableMethods.isActiveFilterByColumn(fieldOrColumn)
+      },
       /**
        * 判断展开行是否懒加载完成
        * @param {Row} row 行对象
@@ -4413,7 +4416,7 @@ export default defineComponent({
               if (keyboardOpts.isDel && (selected.row || selected.column)) {
                 if (delMethod) {
                   delMethod({
-                    row: selected.row,
+                    row: selected.row as VxeTableDataRow,
                     rowIndex: tableMethods.getRowIndex(selected.row),
                     column: selected.column,
                     columnIndex: tableMethods.getColumnIndex(selected.column),
@@ -4425,7 +4428,7 @@ export default defineComponent({
                 if (isBack) {
                   if (backMethod) {
                     backMethod({
-                      row: selected.row,
+                      row: selected.row as VxeTableDataRow,
                       rowIndex: tableMethods.getRowIndex(selected.row),
                       column: selected.column,
                       columnIndex: tableMethods.getColumnIndex(selected.column),
@@ -5103,7 +5106,7 @@ export default defineComponent({
         const { column } = params
         const { tooltipStore } = reactData
         const cell = evnt.currentTarget as HTMLTableCellElement
-        handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row)
+        handleTargetEnterEvent(tooltipStore.column !== column || !!tooltipStore.row)
         if (tooltipStore.column !== column || !tooltipStore.visible) {
           handleTooltip(evnt, cell, cell.querySelector('.vxe-cell--item') as HTMLElement || cell.children[0], null, params)
         }

package/types/column.d.ts

@@ -1,6 +1,5 @@
-import { VNode } from 'vue'
 import { VXEComponent, SlotVNodeType } from './component'
-import { VxeTableConstructor, VxeTableDefines, VxeTablePropTypes } from './table'
+import { VxeTableConstructor, VxeTableDataRow, VxeTableDefines, VxeTablePropTypes } from './table'
 import { VxeGlobalRendererHandles } from './v-x-e-table'
 import { VxeFilterPanel } from './filter'
 import { VxeTooltipPropTypes } from './tooltip'
@@ -11,11 +10,11 @@ import { VxeTooltipPropTypes } from './tooltip'
  * 组件 - 表格列
  * @example import { VxeColumn } from 'vxe-table'
  */
-export const VxeColumn: VXEComponent<VxeColumnProps>
+export const VxeColumn: VXEComponent<VxeColumnProps<any>>
 /**
  * 组件 - 表格列
  */
-export const Column: VXEComponent<VxeColumnProps>
+export const Column: VXEComponent<VxeColumnProps<any>>
 
 export namespace VxeColumnPropTypes {
   export type ColId = string | number
@@ -33,20 +32,20 @@ export namespace VxeColumnPropTypes {
   export type ShowOverflow = VxeTablePropTypes.ShowOverflow
   export type ShowHeaderOverflow = ShowOverflow
   export type ShowFooterOverflow = ShowOverflow
-  export type ClassName = string | ((params: VxeGlobalRendererHandles.RenderCellParams) => string | any[] | { [key: string]: boolean })
-  export type HeaderClassName = string | ((params: VxeGlobalRendererHandles.RenderHeaderParams) => string | any[] | { [key: string]: boolean })
-  export type FooterClassName = string | ((params: VxeGlobalRendererHandles.RenderFooterParams) => string | any[] | { [key: string]: boolean })
+  export type ClassName<D = VxeTableDataRow> = string | ((params: VxeGlobalRendererHandles.RenderCellParams<D>) => string | any[] | { [key: string]: boolean })
+  export type HeaderClassName<D = VxeTableDataRow> = string | ((params: VxeGlobalRendererHandles.RenderHeaderParams<D>) => string | any[] | { [key: string]: boolean })
+  export type FooterClassName<D = VxeTableDataRow> = string | ((params: VxeGlobalRendererHandles.RenderFooterParams<D>) => string | any[] | { [key: string]: boolean })
 
-  export type Formatter = ((params: {
+  export type Formatter<D = VxeTableDataRow> = ((params: {
     cellValue: any
-    column: VxeTableDefines.ColumnInfo
-    row: any
+    column: VxeTableDefines.ColumnInfo<D>
+    row: D
   }) => string | number) | any[] | string
 
   export type Sortable = boolean
-  export type SortBy = string | ((params: {
-    row: any
-    column: VxeTableDefines.ColumnInfo
+  export type SortBy<D = VxeTableDataRow> = string | ((params: {
+    row: D
+    column: VxeTableDefines.ColumnInfo<D>
   }) => string | number)
   export type SortType = 'auto' | 'string' | 'number' | null
 
@@ -61,27 +60,27 @@ export namespace VxeColumnPropTypes {
 
   export type FilterMultiple = boolean
 
-  interface FilterMethodParams {
-    $table: VxeTableConstructor,
+  interface FilterMethodParams<D = VxeTableDataRow> {
+    $table: VxeTableConstructor<D>,
     value: any
     option: VxeTableDefines.FilterOption
     cellValue: any
-    row: any
-    column: VxeTableDefines.ColumnInfo
+    row: D
+    column: VxeTableDefines.ColumnInfo<D>
   }
-  export type FilterMethod = (params: FilterMethodParams) => boolean
+  export type FilterMethod<D = VxeTableDataRow> = (params: FilterMethodParams<D>) => boolean
 
-  interface FilterResetMethodParams {
+  interface FilterResetMethodParams<D = VxeTableDataRow> {
     options: VxeTableDefines.FilterOption[]
-    column: VxeTableDefines.ColumnInfo
+    column: VxeTableDefines.ColumnInfo<D>
   }
   export type FilterResetMethod = (params: FilterResetMethodParams) => void
 
-  interface FilterRecoverMethodParams {
+  interface FilterRecoverMethodParams<D = VxeTableDataRow> {
     option: VxeTableDefines.FilterOption
-    column: VxeTableDefines.ColumnInfo
+    column: VxeTableDefines.ColumnInfo<D>
   }
-  export type FilterRecoverMethod = (params: FilterRecoverMethodParams) => void
+  export type FilterRecoverMethod<D = VxeTableDataRow> = (params: FilterRecoverMethodParams<D>) => void
 
   /**
    * 筛选渲染配置项
@@ -97,20 +96,20 @@ export namespace VxeColumnPropTypes {
   export type TreeNode = boolean
   export type Visible = boolean
 
-  interface ExportMethodParams {
-    $table: VxeTableConstructor,
-    row: any
-    column: VxeTableDefines.ColumnInfo
+  interface ExportMethodParams<D = VxeTableDataRow> {
+    $table: VxeTableConstructor<D>,
+    row: D
+    column: VxeTableDefines.ColumnInfo<D>
   }
-  export type ExportMethod = (params: ExportMethodParams) => string | number
+  export type ExportMethod<D = VxeTableDataRow> = (params: ExportMethodParams<D>) => string | number
 
-  interface FooterExportParams {
-    $table: VxeTableConstructor,
+  interface FooterExportParams<D = VxeTableDataRow> {
+    $table: VxeTableConstructor<D>,
     items: any[]
-    column: VxeTableDefines.ColumnInfo
+    column: VxeTableDefines.ColumnInfo<D>
     _columnIndex: number
   }
-  export type FooterExportMethod = (params: FooterExportParams) => string | number
+  export type FooterExportMethod<D = VxeTableDataRow> = (params: FooterExportParams<D>) => string | number
 
   export interface TitlePrefix {
     useHTML?: VxeTooltipPropTypes.UseHTML
@@ -128,8 +127,8 @@ export namespace VxeColumnPropTypes {
 
   export type CellType = 'auto' | 'number' | 'string'
 
-  export interface CellRender extends VxeGlobalRendererHandles.RenderOptions {
-    events?: { [key: string]: (cellParams: DefaultSlotParams, ...args: any[]) => any }
+  export interface CellRender<D = VxeTableDataRow> extends VxeGlobalRendererHandles.RenderOptions {
+    events?: { [key: string]: (cellParams: DefaultSlotParams<D>, ...args: any[]) => any }
     options?: any[]
     optionProps?: VxeGlobalRendererHandles.RenderOptionProps
     optionGroups?: any[]
@@ -140,7 +139,7 @@ export namespace VxeColumnPropTypes {
   /**
    * 编辑渲染配置项
    */
-  export interface EditRender extends VxeGlobalRendererHandles.RenderOptions {
+  export interface EditRender<D = VxeTableDataRow> extends VxeGlobalRendererHandles.RenderOptions {
     events?: { [key: string]: (cellParams: EditSlotParams, ...args: any[]) => any }
     enabled?: boolean
     options?: any[]
@@ -149,7 +148,7 @@ export namespace VxeColumnPropTypes {
     optionGroupProps?: VxeGlobalRendererHandles.RenderOptionGroupProps
     autofocus?: string
     autoselect?: boolean
-    defaultValue?: ((params: { column: VxeTableDefines.ColumnInfo }) => any) | null | undefined | string | number | RegExp | object | any[] | Date
+    defaultValue?: ((params: { column: VxeTableDefines.ColumnInfo<D> }) => any) | null | undefined | string | number | RegExp | object | any[] | Date
     immediate?: boolean
     content?: string
     placeholder?: string
@@ -167,42 +166,42 @@ export namespace VxeColumnPropTypes {
 
   export type Params = any
 
-  interface FilterSlotParams {
+  interface FilterSlotParams<D = VxeTableDataRow> {
     $panel: VxeFilterPanel
     column: {
       filters: VxeTableDefines.FilterOption[]
-    } & VxeTableDefines.ColumnInfo
+    } & VxeTableDefines.ColumnInfo<D>
     columnIndex: number
     $columnIndex: number
     $rowIndex: number
   }
 
-  interface EditSlotParams {
-    column: VxeTableDefines.ColumnInfo
+  interface EditSlotParams<D = VxeTableDataRow> {
+    column: VxeTableDefines.ColumnInfo<D>
     columnIndex: number
     $columnIndex: number
-    row: any
+    row: D
     rowIndex: number
     $rowIndex: number
   }
 
-  interface FooterSlotParams {
-    column: VxeTableDefines.ColumnInfo
+  interface FooterSlotParams<D = VxeTableDataRow> {
+    column: VxeTableDefines.ColumnInfo<D>
     columnIndex: number
     _columnIndex: number
     $columnIndex: number
     $rowIndex: number
     items: any[]
-    data: any[][]
+    data: D[][]
   }
 
-  interface HeaderSlotParams extends VxeTableDefines.CellRenderHeaderParams { }
+  interface HeaderSlotParams<D = VxeTableDataRow> extends VxeTableDefines.CellRenderHeaderParams<D> { }
 
-  interface ContentSlotParams {
-    column: VxeTableDefines.ColumnInfo
+  interface ContentSlotParams<D = VxeTableDataRow> {
+    column: VxeTableDefines.ColumnInfo<D>
     columnIndex: number
     $columnIndex: number
-    row: any
+    row: D
     rowIndex: number
     $rowIndex: number
     isHidden: boolean
@@ -210,25 +209,25 @@ export namespace VxeColumnPropTypes {
     type: string
   }
 
-  interface DefaultSlotParams extends VxeTableDefines.CellRenderBodyParams { }
+  interface DefaultSlotParams<D = VxeTableDataRow> extends VxeTableDefines.CellRenderBodyParams<D> { }
 
-  interface IconSlotParams extends DefaultSlotParams { }
+  interface IconSlotParams<D = VxeTableDataRow> extends DefaultSlotParams<D> { }
 
-  export type Slots = {
-    title?: string | ((params: HeaderSlotParams) => SlotVNodeType[] | SlotVNodeType) | null
-    radio?: string | ((params: DefaultSlotParams) => SlotVNodeType[] | SlotVNodeType) | null
-    checkbox?: string | ((params: DefaultSlotParams) => SlotVNodeType[] | SlotVNodeType) | null
-    default?: string | ((params: DefaultSlotParams) => SlotVNodeType[] | SlotVNodeType) | null
-    header?: string | ((params: HeaderSlotParams) => SlotVNodeType[] | SlotVNodeType) | null
-    footer?: string | ((params: FooterSlotParams) => SlotVNodeType[] | SlotVNodeType) | null
-    content?: string | ((params: ContentSlotParams) => SlotVNodeType[] | SlotVNodeType) | null
-    filter?: string | ((params: FilterSlotParams) => SlotVNodeType[] | SlotVNodeType) | null
-    edit?: string | ((params: EditSlotParams) => SlotVNodeType[] | SlotVNodeType) | null
-    icon?: string | ((params: IconSlotParams) => SlotVNodeType[] | SlotVNodeType) | null
+  export type Slots<D = VxeTableDataRow> = {
+    title?: string | ((params: HeaderSlotParams<D>) => SlotVNodeType[] | SlotVNodeType) | null
+    radio?: string | ((params: DefaultSlotParams<D>) => SlotVNodeType[] | SlotVNodeType) | null
+    checkbox?: string | ((params: DefaultSlotParams<D>) => SlotVNodeType[] | SlotVNodeType) | null
+    default?: string | ((params: DefaultSlotParams<D>) => SlotVNodeType[] | SlotVNodeType) | null
+    header?: string | ((params: HeaderSlotParams<D>) => SlotVNodeType[] | SlotVNodeType) | null
+    footer?: string | ((params: FooterSlotParams<D>) => SlotVNodeType[] | SlotVNodeType) | null
+    content?: string | ((params: ContentSlotParams<D>) => SlotVNodeType[] | SlotVNodeType) | null
+    filter?: string | ((params: FilterSlotParams<D>) => SlotVNodeType[] | SlotVNodeType) | null
+    edit?: string | ((params: EditSlotParams<D>) => SlotVNodeType[] | SlotVNodeType) | null
+    icon?: string | ((params: IconSlotParams<D>) => SlotVNodeType[] | SlotVNodeType) | null
   }
 }
 
-export type VxeColumnProps = {
+export type VxeColumnProps<D = VxeTableDataRow> = {
   colId?: VxeColumnPropTypes.ColId
   /**
    * 渲染类型
@@ -289,19 +288,19 @@ export type VxeColumnProps = {
   /**
    * 给单元格附加 className
    */
-  className?: VxeColumnPropTypes.ClassName
+  className?: VxeColumnPropTypes.ClassName<D>
   /**
    * 给表头单元格附加 className
    */
-  headerClassName?: VxeColumnPropTypes.HeaderClassName
+  headerClassName?: VxeColumnPropTypes.HeaderClassName<D>
   /**
    * 给表尾单元格附加 className
    */
-  footerClassName?: VxeColumnPropTypes.FooterClassName
+  footerClassName?: VxeColumnPropTypes.FooterClassName<D>
   /**
    * 格式化显示内容
    */
-  formatter?: VxeColumnPropTypes.Formatter
+  formatter?: VxeColumnPropTypes.Formatter<D>
   /**
    * 是否允许排序
    */
@@ -309,7 +308,7 @@ export type VxeColumnProps = {
   /**
    * 自定义排序的属性
    */
-  sortBy?: VxeColumnPropTypes.SortBy
+  sortBy?: VxeColumnPropTypes.SortBy<D>
   /**
    * 排序的字段类型，比如字符串转数值等
    */
@@ -325,7 +324,7 @@ export type VxeColumnProps = {
   /**
    * 自定义筛选方法
    */
-  filterMethod?: VxeColumnPropTypes.FilterMethod
+  filterMethod?: VxeColumnPropTypes.FilterMethod<D>
   /**
    * 筛选模板配置项
    */
@@ -341,11 +340,11 @@ export type VxeColumnProps = {
   /**
    * 自定义单元格数据导出方法
    */
-  exportMethod?: VxeColumnPropTypes.ExportMethod
+  exportMethod?: VxeColumnPropTypes.ExportMethod<D>
   /**
    * 自定义表尾单元格数据导出方法
    */
-  footerExportMethod?: VxeColumnPropTypes.FooterExportMethod
+  footerExportMethod?: VxeColumnPropTypes.FooterExportMethod<D>
   /**
    * 已废弃，被 titlePrefix 替换
    * @deprecated
@@ -362,11 +361,11 @@ export type VxeColumnProps = {
   /**
    * 单元格渲染配置项
    */
-  cellRender?: VxeColumnPropTypes.CellRender
+  cellRender?: VxeColumnPropTypes.CellRender<D>
   /**
    * 单元格编辑渲染配置项
    */
-  editRender?: VxeColumnPropTypes.EditRender
+  editRender?: VxeColumnPropTypes.EditRender<D>
   /**
    * 内容渲染配置项
    */

package/types/component.d.ts

@@ -15,17 +15,11 @@ export interface VxeComponentBase {
   xID: string
 }
 
-export interface RecordInfo {
-  [key: string]: any
-}
-
 export interface VxeEvent {
   $event: Event
   [key: string]: any
 }
 
-export type VNodeStyle = {
-  [key: string]: string | number
-}
+export type VNodeStyle = Record<string, string | number>
 
 export type SlotVNodeType = JSX.Element | VNode | string | number