vxe-pc-ui 4.5.24 → 4.5.26

package/types/components/column.d.ts

@@ -140,6 +140,10 @@ export namespace VxeColumnPropTypes {
     cellType?: VxeColumnPropTypes.CellType
   }
 
+  /**
+   * 设置为分组节点
+   */
+  export type RowGroupNode = boolean
   /**
    * 设置为树节点
    */
@@ -170,8 +174,15 @@ export namespace VxeColumnPropTypes {
   export type HeaderExportMethod<D = any> = (params: HeaderExportParams<D>) => string | number
 
   interface FooterExportParams<D = any> {
-    $table: VxeTableConstructor<D>,
+    $table: VxeTableConstructor<D>
+    /**
+     * @deprecated
+     */
     items: any[]
+    /**
+     * @deprecated
+     */
+    itemIndex: number
     row: any
     column: VxeTableDefines.ColumnInfo<D>
     _columnIndex: number
@@ -490,6 +501,10 @@ export interface VxeColumnProps<D = any> {
    * 筛选模板配置项
    */
   filterRender?: VxeColumnPropTypes.FilterRender
+  /**
+   * 设置为分组节点
+   */
+  rowGroupNode?: VxeColumnPropTypes.RowGroupNode
   /**
    * 设置为树节点
    */

package/types/components/grid.d.ts

@@ -428,6 +428,7 @@ export namespace VxeGridDefines {
   export interface FilterChangeEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.FilterChangeEventParams<D> { }
   export interface FilterVisibleEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.FilterVisibleEventParams<D> { }
   export interface ResizableChangeEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.ResizableChangeEventParams<D> { }
+  export interface ToggleRowGroupExpandEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.ToggleRowGroupExpandEventParams<D> { }
   export interface ToggleRowExpandEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.ToggleRowExpandEventParams<D> { }
   export interface ToggleTreeExpandEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.ToggleTreeExpandEventParams<D> { }
   export interface MenuClickEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.MenuClickEventParams<D> { }
@@ -513,6 +514,7 @@ export interface VxeGridEventProps<D = any> {
   onFilterChange?: VxeGridEvents.FilterChange<D>
   onFilterVisible?: VxeGridEvents.FilterVisible<D>
   onResizableChange?: VxeGridEvents.ResizableChange<D>
+  onToggleRowGroupExpand?: VxeGridEvents.ToggleRowGroupExpand<D>
   onToggleRowExpand?: VxeGridEvents.ToggleRowExpand<D>
   onToggleTreeExpand?: VxeGridEvents.ToggleTreeExpand<D>
   onMenuClick?: VxeGridEvents.MenuClick<D>
@@ -583,6 +585,7 @@ export interface VxeGridListeners<D = any> {
   filterChange?: VxeGridEvents.FilterChange<D>
   filterVisible?: VxeGridEvents.FilterVisible<D>
   resizableChange?: VxeGridEvents.ResizableChange<D>
+  toggleRowGroupExpand?: VxeGridEvents.ToggleRowGroupExpand<D>
   toggleRowExpand?: VxeGridEvents.ToggleRowExpand<D>
   toggleTreeExpand?: VxeGridEvents.ToggleTreeExpand<D>
   menuClick?: VxeGridEvents.MenuClick<D>
@@ -653,6 +656,7 @@ export namespace VxeGridEvents {
   export type FilterChange<D = any> = (params: VxeGridDefines.FilterChangeEventParams<D>) => void
   export type FilterVisible<D = any> = (params: VxeGridDefines.FilterVisibleEventParams<D>) => void
   export type ResizableChange<D = any> = (params: VxeGridDefines.ResizableChangeEventParams<D>) => void
+  export type ToggleRowGroupExpand<D = any> = (params: VxeGridDefines.ToggleRowGroupExpandEventParams<D>) => void
   export type ToggleRowExpand<D = any> = (params: VxeGridDefines.ToggleRowExpandEventParams<D>) => void
   export type ToggleTreeExpand<D = any> = (params: VxeGridDefines.ToggleTreeExpandEventParams<D>) => void
   export type MenuClick<D = any> = (params: VxeGridDefines.MenuClickEventParams<D>) => void
@@ -737,16 +741,16 @@ export namespace VxeGridSlotTypes {
     isEdit: boolean
     isHidden: boolean
 
+    // 混用多组件不具名插槽
+    field: string
+    item: any
+    data: any
+
     /**
      * @deprecated
      * @private
      */
     visibleData: D[]
-    /**
-      * @deprecated
-      * @private
-      */
-    data: D[]
     /**
       * 已废弃
       * @deprecated