vxe-pc-ui 3.3.56 → 3.3.57

package/types/components/table.d.ts

@@ -1,4 +1,4 @@
-import { VNode } from 'vue'
+import { VNode, CreateElement } from 'vue'
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, VxeComponentSizeType, ValueOf, VxeGlobalConfig, VxeComponentStyleType, VxeComponentSlotType } from '@vxe-ui/core'
 import { VxeColumnPropTypes, VxeColumnProps, VxeColumnSlotTypes } from './column'
 import { VxeTableProDefines, VxeTableProEmits } from './table-plugins'
@@ -16,7 +16,12 @@ export type VxeTableComponent = DefineVxeComponentOptions<VxeTableProps>
 export type VxeTableInstance<D = any> = DefineVxeComponentInstance<{
   reactData: TableReactData<D>
   internalData: TableInternalData<D>
-  xegrid: VxeGridConstructor | null
+  $xeGrid: VxeGridConstructor<D> | null | undefined
+
+  /**
+   * @deprecated
+   */
+  xegrid: VxeGridConstructor<D> | null | undefined
 }, VxeTableProps<D>, VxeTablePrivateComputed<D>, VxeTableMethods<D>>
 
 export type VxeTableConstructor<D = any> = VxeTableInstance<D>
@@ -35,7 +40,7 @@ export type VxeTableDataRow = VxeTablePropTypes.Row
 export namespace VxeTablePropTypes {
   export type Size = VxeComponentSizeType
   export type ID<D = any> = string | ((params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     $grid: VxeGridConstructor<D> | null | undefined
   }) => string | number | null)
 
@@ -66,14 +71,14 @@ export namespace VxeTablePropTypes {
   export type FooterData = Record<string, any>[]
 
   export type FooterMethod<D = any> = (params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     $grid: VxeGridConstructor<D> | null | undefined
     columns: VxeTableDefines.ColumnInfo<D>[]
     data: D[]
   }) => Array<string | number | null>[] | any[]
 
   export type RowClassName<D = VxeTablePropTypes.Row> = string | ((params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     row: D
     rowIndex: number
     $rowIndex: number
@@ -81,7 +86,7 @@ export namespace VxeTablePropTypes {
   }) => void | null | string | { [key: string]: boolean | null | undefined })
 
   export type CellClassName<D = VxeTablePropTypes.Row> = string | ((params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     row: D
     rowIndex: number
     $rowIndex: number
@@ -93,14 +98,14 @@ export namespace VxeTablePropTypes {
   }) => void | null | string | { [key: string]: boolean | null | undefined })
 
   export type HeaderRowClassName<D = VxeTablePropTypes.Row> = string | ((params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     $rowIndex: number
     fixed: VxeColumnPropTypes.Fixed
     type: string
   }) => void | null | string | { [key: string]: boolean | null | undefined })
 
   export type HeaderCellClassName<D = VxeTablePropTypes.Row> = string | ((params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     $rowIndex: number
     column: VxeTableDefines.ColumnInfo<D>
     columnIndex: number
@@ -111,7 +116,7 @@ export namespace VxeTablePropTypes {
   }) => void | null | string | { [key: string]: boolean | null | undefined })
 
   export type FooterRowClassName<D = VxeTablePropTypes.Row> = string | ((params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     row: D
     $rowIndex: number
     _rowIndex: number
@@ -120,7 +125,7 @@ export namespace VxeTablePropTypes {
   }) => void | null | string | { [key: string]: boolean | null | undefined })
 
   export type FooterCellClassName<D = VxeTablePropTypes.Row> = string | ((params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     row: D
     $rowIndex: number
     _rowIndex: number
@@ -142,7 +147,7 @@ export namespace VxeTablePropTypes {
   }) => void | null | VxeComponentStyleType)
 
   export type HeaderCellStyle<D = VxeTablePropTypes.Row> = VxeComponentStyleType | ((params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     $rowIndex: number
     column: VxeTableDefines.ColumnInfo<D>
     columnIndex: number
@@ -150,7 +155,7 @@ export namespace VxeTablePropTypes {
   }) => void | null | VxeComponentStyleType)
 
   export type FooterCellStyle<D = any> = VxeComponentStyleType | ((params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     row: D
     $rowIndex: number
     column: VxeTableDefines.ColumnInfo<D>
@@ -160,7 +165,7 @@ export namespace VxeTablePropTypes {
   }) => void | null | VxeComponentStyleType)
 
   export type RowStyle<D = VxeTablePropTypes.Row> = VxeComponentStyleType | ((params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     row: D
     rowIndex: number
     $rowIndex: number
@@ -168,14 +173,14 @@ export namespace VxeTablePropTypes {
   }) => void | null | VxeComponentStyleType)
 
   export type HeaderRowStyle<D = VxeTablePropTypes.Row> = VxeComponentStyleType | ((params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     $rowIndex: number
     fixed: VxeColumnPropTypes.Fixed
     type: string
   }) => void | null | VxeComponentStyleType)
 
   export type FooterRowStyle<D = any> = VxeComponentStyleType | ((params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     row: D
     $rowIndex: number
     _rowIndex: number
@@ -189,7 +194,7 @@ export namespace VxeTablePropTypes {
   export type MergeFooterItems<D = any> = MergeFooterItem<D>[]
 
   export type SpanMethod<D = VxeTablePropTypes.Row> = (params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     column: VxeTableDefines.ColumnInfo<D>
     columnIndex: number
     $columnIndex: number
@@ -204,7 +209,7 @@ export namespace VxeTablePropTypes {
   }) => void | { rowspan: number, colspan: number }
 
   export type FooterSpanMethod<D = any> = (params: {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
     column: VxeTableDefines.ColumnInfo<D>
     columnIndex: number
     _columnIndex: number
@@ -427,15 +432,19 @@ export namespace VxeTablePropTypes {
      */
     trigger?: 'default' | 'cell' | 'row' | '' | null
     /**
-     * 只对 tree-config 启用有效，是否跨节点拖拽，用于树结构，启用后允许拖拽到其他的子节点，除自身节点之外
+     * 只对 tree-config 启用有效，是否允许同级行拖拽，用于树结构，启用后允许同层级之间进行拖拽
+     */
+    isPeerDrag?: boolean
+    /**
+     * 只对 tree-config 启用有效，是否允许同级/跨层行拖拽，用于树结构，启用后允许跨层级拖拽（除了上级拖到子级）
      */
     isCrossDrag?: boolean
     /**
-     * 只对 tree-config 启用有效，是否允许拖拽成目标节点的子级
+     * 需要 isCrossDrag，只对 tree-config 启用有效，是否允许拖拽成目标行的子级
      */
     isToChildDrag?: boolean
     /**
-     * 只对 tree-config 启用有效，是否允许将自己拖拽到子孙节点中
+     * 需要 isCrossDrag，只对 tree-config 启用有效，是否允许将自己拖拽到子级行中
      */
     isSelfToChildDrag?: boolean
     /**
@@ -499,15 +508,19 @@ export namespace VxeTablePropTypes {
      */
     trigger?: 'default' | 'cell' | '' | null
     /**
-     * 用于分组表头，是否跨列拖拽，启用后允许拖拽到其他的列，除自身列之外
+     * 用于分组表头，是否允许同级列拖拽，启用后允许同层级列之间进行拖拽
+     */
+    isPeerDrag?: boolean
+    /**
+     * 用于分组表头，是否同级/跨层级列拖拽，启用后允许跨拖拽列拖拽（除了上级拖到子级）
      */
     isCrossDrag?: boolean
     /**
-     * 是否允许拖拽成目标列的子级
+     * 需要 isCrossDrag，是否允许拖拽成目标列的子级
      */
     isToChildDrag?: boolean
     /**
-     * 用于分组表头，是否允许将自己拖拽到子孙列中
+     * 需要 isCrossDrag，用于分组表头，是否允许将自己拖拽到子孙列中
      */
     isSelfToChildDrag?: boolean
     /**
@@ -653,7 +666,7 @@ export namespace VxeTablePropTypes {
      * 列宽拖动的最小宽度
      */
     minWidth?: number | string | ((params: {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       column: VxeTableDefines.ColumnInfo<D>
       columnIndex: number
       $columnIndex: number
@@ -664,7 +677,7 @@ export namespace VxeTablePropTypes {
      * 列宽拖动的最大宽度
      */
     maxWidth?: number | string | ((params: {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       column: VxeTableDefines.ColumnInfo<D>
       columnIndex: number
       $columnIndex: number
@@ -702,7 +715,7 @@ export namespace VxeTablePropTypes {
     defaultSort?: SortConfigDefaultSort | SortConfigDefaultSort[]
     orders?: SortOrder[]
     sortMethod?(params: {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       data: D[]
       sortList: VxeTableDefines.SortCheckedParams[]
     }): any[]
@@ -832,13 +845,13 @@ export namespace VxeTablePropTypes {
     height?: number
     padding?: boolean
     loadMethod?(params: {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       row: D
       rowIndex: number
       $rowIndex: number
     }): Promise<void>
     toggleMethod?(params: {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       expanded: boolean
       row: D
       rowIndex: number
@@ -923,14 +936,14 @@ export namespace VxeTablePropTypes {
      * 该方法用于异步加载子节点
      */
     loadMethod?(params: {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       row: D
     }): Promise<any[]>
     /**
      * 该方法在展开或关闭触发之前调用，可以通过返回值来决定是否允许继续执行
      */
     toggleMethod?(params: {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       expanded: boolean
       row: D
       column: VxeTableDefines.ColumnInfo<D>
@@ -1057,7 +1070,7 @@ export namespace VxeTablePropTypes {
     selectedMethod?(params: {
       row: D
       column: VxeTableDefines.ColumnInfo<D>
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       $grid: VxeGridConstructor<D> | null | undefined
     }): boolean
     /**
@@ -1205,7 +1218,7 @@ export namespace VxeTablePropTypes {
       columnIndex: number
       $columnIndex: number
       _columnIndex: number
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
     }): boolean
     /**
      * 只对 isEnter=true 有效，用于重写回车键的方法
@@ -1219,7 +1232,7 @@ export namespace VxeTablePropTypes {
       columnIndex: number
       $columnIndex: number
       _columnIndex: number
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
     }): void
     /**
      * 只对 isDel=true 有效，用于删除键清空单元格内容方法
@@ -1229,7 +1242,7 @@ export namespace VxeTablePropTypes {
       rowIndex: number
       column: VxeTableDefines.ColumnInfo<D>
       columnIndex: number
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
     }): void
     /**
      * 只对 isDel=true 有效，用于重写回退键清空单元格内容并激活为编辑状态方法
@@ -1239,7 +1252,7 @@ export namespace VxeTablePropTypes {
       rowIndex: number
       column: VxeTableDefines.ColumnInfo<D>
       columnIndex: number
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
     }): void
     /**
      * 只对 isEdit=true 有效，用于重写编辑单元格方法
@@ -1249,7 +1262,7 @@ export namespace VxeTablePropTypes {
       rowIndex: number
       column: VxeTableDefines.ColumnInfo<D>
       columnIndex: number
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       $grid: VxeGridConstructor<D> | null | undefined
     }): void
   }
@@ -1810,7 +1823,7 @@ export namespace VxeTablePropTypes {
      */
     importMethod?(params: {
       $table: VxeTableConstructor
-      $grid: VxeGridConstructor
+      $grid: VxeGridConstructor | null | undefined
       file: File
       options: ImportHandleOptions
     }): Promise<any>
@@ -1859,7 +1872,7 @@ export namespace VxeTablePropTypes {
      */
     filename?: string | ((params: {
       $table: VxeTableConstructor
-      $grid?: VxeGridConstructor | null
+      $grid: VxeGridConstructor | null | undefined
       options: ExportOpts
     }) => string)
     /**
@@ -1867,7 +1880,7 @@ export namespace VxeTablePropTypes {
      */
     sheetName?: string | ((params: {
       $table: VxeTableConstructor
-      $grid?: VxeGridConstructor | null
+      $grid: VxeGridConstructor | null | undefined
       options: ExportOpts
     }) => string)
     /**
@@ -1957,17 +1970,17 @@ export namespace VxeTablePropTypes {
      */
     exportMethod?(params: {
       $table: VxeTableConstructor
-      $grid?: VxeGridConstructor
+      $grid: VxeGridConstructor | null | undefined
       options: ExportHandleOptions
     }): Promise<any>
     beforeExportMethod?(params: {
       $table: VxeTableConstructor
-      $grid?: VxeGridConstructor | null
+      $grid: VxeGridConstructor | null | undefined
       options: ExportHandleOptions
     }): void
     afterExportMethod?(params: {
       $table: VxeTableConstructor
-      $grid?: VxeGridConstructor | null
+      $grid: VxeGridConstructor | null | undefined
       status: boolean
       options: ExportHandleOptions
     }): void
@@ -1991,6 +2004,13 @@ export namespace VxeTablePropTypes {
     columns: VxeTableDefines.ColumnInfo[]
     colgroups: VxeTableDefines.ColumnInfo[][]
 
+    /**
+     * @private
+     */
+    isAllExpand?: boolean
+    /**
+     * @private
+     */
     /**
      * @private
      */
@@ -2010,7 +2030,7 @@ export namespace VxeTablePropTypes {
      */
     sheetName?: string | ((params: {
       $table: VxeTableConstructor
-      $grid?: VxeGridConstructor | null
+      $grid: VxeGridConstructor | null | undefined
       options: ExportOpts
     }) => string)
     /**
@@ -3658,7 +3678,7 @@ export interface TablePrivateMethods<D = any> {
    */
   getSetupOptions(): Required<VxeGlobalConfig>
   updateAfterDataIndex(): void
-  callSlot<T>(slotFunc: ((params: T) => VxeComponentSlotType | VxeComponentSlotType[]) | string | null, params: T): VxeComponentSlotType[]
+  callSlot<T>(slotFunc: ((params: T) => VxeComponentSlotType | VxeComponentSlotType[]) | string | null, params: T, h: CreateElement): VxeComponentSlotType[]
   getParentElem(): Element | null
   getParentHeight(): number
   getExcludeHeight(): number
@@ -3698,7 +3718,7 @@ export interface TablePrivateMethods<D = any> {
     column: VxeTableDefines.ColumnInfo<any>
   }): void
   triggerCurrentRowEvent(evnt: Event, params: {
-    $table: VxeTableConstructor<any> & VxeTablePrivateMethods<any>
+    $table: VxeTableConstructor<any>
     row: any
     rowIndex: number
     $rowIndex: number
@@ -4068,8 +4088,8 @@ export namespace VxeTableDefines {
   }
 
   export interface CellRenderHeaderParams<D = any> {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
-    $grid: VxeGridConstructor<D> | null
+    $table: VxeTableConstructor<D>
+    $grid: VxeGridConstructor<D> | null | undefined
     $rowIndex: number
     column: ColumnInfo<D>
     columnIndex: number
@@ -4085,8 +4105,8 @@ export namespace VxeTableDefines {
   }
 
   export interface CellRenderBodyParams<D = any> {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
-    $grid: VxeGridConstructor<D> | null
+    $table: VxeTableConstructor<D>
+    $grid: VxeGridConstructor<D> | null | undefined
     seq: string | number
     rowid: string
     row: D
@@ -4125,8 +4145,8 @@ export namespace VxeTableDefines {
   export interface CellRenderCellParams<D = any> extends CellRenderBodyParams<D> { }
 
   export interface CellRenderFooterParams<D = any> {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
-    $grid: VxeGridConstructor<D> | null
+    $table: VxeTableConstructor<D>
+    $grid: VxeGridConstructor<D> | null | undefined
     row: D
     rowIndex: number
     _rowIndex: number
@@ -4150,7 +4170,7 @@ export namespace VxeTableDefines {
   }
 
   interface TableEventParams<D = any> extends VxeComponentEventParams {
-    $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+    $table: VxeTableConstructor<D>
   }
 
   interface TableBaseHeaderCellParams<D = any> {
@@ -4501,7 +4521,7 @@ export namespace VxeTableDefines {
 
   export interface ExtortSheetMethodParams {
     $table: VxeTableConstructor
-    $grid?: VxeGridConstructor
+    $grid: VxeGridConstructor | null | undefined
     options: VxeTablePropTypes.ExportHandleOptions
     datas: any[]
     columns: VxeTableDefines.ColumnInfo[]
@@ -4592,7 +4612,7 @@ export namespace VxeTableDefines {
   }
   export interface RuleValidatorParams<D = any> {
     $table: VxeTableConstructor<D>
-    $grid: VxeGridConstructor<D> | null
+    $grid: VxeGridConstructor<D> | null | undefined
     cellValue: any
     rule: ValidatorRule<D>
     rules: ValidatorRule<D>[]

package/types/components/toolbar.d.ts

@@ -236,14 +236,14 @@ export interface ToolbarReactData {
 }
 
 export interface ToolbarInternalData {
-  connectTable: (VxeTableConstructor<any> & VxeTablePrivateMethods<any>) | null
+  connectTable: VxeTableConstructor<any> & VxeTablePrivateMethods<any> | null | undefined
 }
 
 export interface ToolbarMethods {
   dispatchEvent(type: ValueOf<VxeToolbarEmits>, params: Record<string, any>, evnt: Event | null): void
   syncUpdate(params: {
     collectColumn: VxeTableDefines.ColumnInfo<any>[]
-    $table: VxeTableConstructor<any> & VxeTablePrivateMethods<any>
+    $table: VxeTableConstructor
   }): void
 }
 export interface VxeToolbarMethods extends ToolbarMethods { }
@@ -260,7 +260,7 @@ export namespace VxeToolbarDefines {
   export interface ToolbarEventParams<D = any> extends VxeComponentEventParams {
     $toolbar: VxeToolbarConstructor
     $table: VxeTableConstructor<D>
-    $grid: VxeGridConstructor<D>
+    $grid: VxeGridConstructor<D> | null | undefined
   }
 
   export interface ButtonClickEventParams<D = any> extends ToolbarEventParams<D> {

package/types/ui/commands.d.ts

@@ -20,7 +20,7 @@ declare module '@vxe-ui/core' {
     }
 
     export interface TableCommandMethodParams {
-      $grid: VxeGridConstructor | null
+      $grid: VxeGridConstructor | null | undefined
       $table: VxeTableConstructor
       button?: VxeToolbarPropTypes.ButtonConfig | null
       code?: string

package/types/ui/interceptor.d.ts

@@ -1,5 +1,5 @@
-import { VxeTableConstructor, VxeTableDefines, VxeTablePropTypes, VxeTablePrivateMethods } from '../components/table'
-import { VxeGridConstructor, VxeGridPrivateMethods } from '../components/grid'
+import { VxeTableConstructor, VxeTableDefines, VxeTablePropTypes } from '../components/table'
+import { VxeGridConstructor } from '../components/grid'
 
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define */
 
@@ -17,8 +17,8 @@ declare module '@vxe-ui/core' {
     export type Type = HookType | EventType
 
     export interface InterceptorParams {
-      $grid?: VxeGridConstructor<any> & VxeGridPrivateMethods<any>
-      $table: VxeTableConstructor<any> & VxeTablePrivateMethods<any>
+      $grid: VxeGridConstructor | null | undefined
+      $table: VxeTableConstructor
       $event: Event
     }
 

package/types/ui/menus.d.ts

@@ -1,6 +1,5 @@
-import { VxeTableConstructor, VxeTableDefines, VxeTablePrivateMethods } from '../components/table'
+import { VxeTableConstructor, VxeTableDefines } from '../components/table'
 import { VxeGridConstructor } from '../components/grid'
-import { VxeGlobalRendererHandles } from '@vxe-ui/core'
 
 /* eslint-disable no-use-before-define */
 
@@ -20,8 +19,8 @@ declare module '@vxe-ui/core' {
     }
 
     export interface TableMenuMethodParams extends VxeGlobalRendererHandles.RenderCellParams {
-      $grid: VxeGridConstructor | null
-      $table: VxeTableConstructor & VxeTablePrivateMethods
+      $grid: VxeGridConstructor | null | undefined
+      $table: VxeTableConstructor
       $event: MouseEvent
       menu: VxeTableDefines.MenuFirstOption | VxeTableDefines.MenuChildOption
     }

package/types/ui/renderer.d.ts

@@ -1,6 +1,6 @@
 import { CreateElement } from 'vue'
 import { VxeComponentStyleType, VxeComponentClassNameType, VxeComponentSlotType, VxeComponentAlignType } from '@vxe-ui/core'
-import { VxeTableConstructor, VxeTablePropTypes, VxeTableDefines, VxeTablePrivateMethods } from '../components/table'
+import { VxeTableConstructor, VxeTablePropTypes, VxeTableDefines } from '../components/table'
 import { VxeFormItemPropTypes, VxeFormItemSlotTypes, FormItemContentRenderParams, FormItemVisibleParams, FormItemResetParams } from '../components/form-item'
 import { VxeGridConstructor, VxeGridPropTypes } from '../components/grid'
 import { VxeColumnPropTypes } from '../components/column'
@@ -258,7 +258,7 @@ declare module '@vxe-ui/core' {
      */
     export interface RenderFilterParams<D = any> extends RenderTableFilterParams<D> {}
     export interface RenderTableFilterParams<D = any> {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       $panel: any
       column: {
         filters: VxeTableDefines.FilterOption[]
@@ -273,7 +273,7 @@ declare module '@vxe-ui/core' {
      */
     export interface FilterMethodParams<D = any> extends TableFilterMethodParams<D> {}
     export interface TableFilterMethodParams<D = any> {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       value: any
       option: VxeTableDefines.FilterOption
       cellValue: any
@@ -286,7 +286,7 @@ declare module '@vxe-ui/core' {
      */
     export interface FilterRemoteMethod<D = any> extends TableFilterRemoteMethod<D> {}
     export interface TableFilterRemoteMethod<D = any> extends VxeTableDefines.FilterChangeParams<D> {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
     }
 
     /**
@@ -294,7 +294,7 @@ declare module '@vxe-ui/core' {
      */
     export interface FilterResetMethodParams<D = any> extends TableFilterResetMethodParams<D> {}
     export interface TableFilterResetMethodParams<D = any> {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       options: VxeTableDefines.FilterOption[]
       column: VxeTableDefines.ColumnInfo<D>
     }
@@ -304,7 +304,7 @@ declare module '@vxe-ui/core' {
      */
     export interface FilterRecoverMethodParams<D = any> extends TableFilterRecoverMethodParams<D> {}
     export interface TableFilterRecoverMethodParams<D = any> {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       option: VxeTableDefines.FilterOption
       column: VxeTableDefines.ColumnInfo<D>
     }
@@ -317,7 +317,7 @@ declare module '@vxe-ui/core' {
 
     export interface RenderHeaderParams<D = any> extends RenderTableHeaderParams<D> {}
     export interface RenderTableHeaderParams<D = any> {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       column: VxeTableDefines.ColumnInfo<D>
       columnIndex: number
       $columnIndex: number
@@ -344,7 +344,7 @@ declare module '@vxe-ui/core' {
      */
     export interface RenderFooterParams<D = any> extends RenderTableFooterParams<D>{}
     export interface RenderTableFooterParams<D = any> {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
       column: VxeTableDefines.ColumnInfo<D>
       columnIndex: number
       _columnIndex: number
@@ -357,6 +357,7 @@ declare module '@vxe-ui/core' {
 
     export interface ExportMethodParams<D = any> extends TableExportMethodParams<D> {}
     export interface TableExportMethodParams<D = any> {
+      $table: VxeTableConstructor<D>
       row: D
       column: VxeTableDefines.ColumnInfo<D>
       options: VxeTablePropTypes.ExportHandleOptions
@@ -364,6 +365,7 @@ declare module '@vxe-ui/core' {
 
     export interface FooterExportMethodParams<D = any> extends TableFooterExportMethodParams<D> {}
     export interface TableFooterExportMethodParams<D = any> {
+      $table: VxeTableConstructor<D>
       items: any[]
       _columnIndex: number
       column: VxeTableDefines.ColumnInfo<D>
@@ -393,8 +395,8 @@ declare module '@vxe-ui/core' {
      */
     export interface RenderCellParams<D = any> extends RenderTableCellParams<D> {}
     export interface RenderTableCellParams<D = any> {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
-      $grid: VxeGridConstructor<D> | null
+      $table: VxeTableConstructor<D>
+      $grid: VxeGridConstructor<D> | null | undefined
       column: VxeTableDefines.ColumnInfo<D>
       columnIndex: number
       $columnIndex: number
@@ -426,7 +428,7 @@ declare module '@vxe-ui/core' {
      */
     export interface RenderEmptyParams<D = any> extends RenderTableEmptyParams<D> {}
     export interface RenderTableEmptyParams<D = any> {
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $table: VxeTableConstructor<D>
     }
 
     /**
@@ -505,15 +507,15 @@ declare module '@vxe-ui/core' {
 
     export interface RenderButtonOptions extends VxeToolbarPropTypes.ButtonRender { }
     export interface RenderButtonParams<D = any> {
-      $grid: VxeGridConstructor | null
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $grid: VxeGridConstructor<D> | null | undefined
+      $table: VxeTableConstructor<D>
       button: VxeToolbarPropTypes.ButtonConfig
     }
 
     export interface RenderToolOptions extends VxeToolbarPropTypes.ToolRender { }
     export interface RenderToolParams<D = any> {
-      $grid: VxeGridConstructor | null
-      $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D>
+      $grid: VxeGridConstructor<D> | null | undefined
+      $table: VxeTableConstructor<D>
       tool: VxeToolbarPropTypes.ToolConfig
     }
   }
@@ -627,7 +629,7 @@ declare module '@vxe-ui/core' {
   export namespace VxeGlobalRendererHandles {
     export interface RenderFormItemAutoFocusParams {
       $form: VxeFormConstructor
-      $grid: VxeGridConstructor | null
+      $grid: VxeGridConstructor | null | undefined
       data: any
       item: VxeFormDefines.ItemInfo
       field: string
@@ -829,19 +831,19 @@ declare module '@vxe-ui/core' {
 
     export interface RenderFormDesignWidgetSubtableDefaultViewOptions<D = any> extends VxeGlobalRendererHandles.RenderTableDefaultOptions<D> {}
     export interface RenderFormDesignWidgetSubtableDefaultViewParams<D = any> extends Omit<VxeGlobalRendererHandles.RenderTableDefaultParams<D>, '$table'> {
-      $table: (VxeTableConstructor<D> & VxeTablePrivateMethods<D>) | null
+      $table: VxeTableConstructor<D> | null
       widget: VxeFormDesignDefines.WidgetObjItem
     }
 
     export interface RenderFormDesignWidgetSubtableCellViewOptions<D = any> extends VxeGlobalRendererHandles.RenderTableCellOptions<D> {}
     export interface RenderFormDesignWidgetSubtableCellViewParams<D = any> extends Omit<VxeGlobalRendererHandles.RenderTableCellParams<D>, '$table'> {
-      $table: (VxeTableConstructor<D> & VxeTablePrivateMethods<D>) | null
+      $table: VxeTableConstructor<D> | null
       widget: VxeFormDesignDefines.WidgetObjItem
     }
 
     export interface RenderFormDesignWidgetSubtableEditViewOptions<D = any> extends VxeGlobalRendererHandles.RenderTableEditOptions<D> {}
     export interface RenderFormDesignWidgetSubtableEditViewParams<D = any> extends Omit<VxeGlobalRendererHandles.RenderTableEditParams<D>, '$table'> {
-      $table: (VxeTableConstructor<D> & VxeTablePrivateMethods<D>) | null
+      $table: VxeTableConstructor<D> | null
       widget: VxeFormDesignDefines.WidgetObjItem
     }