vxe-pc-ui 4.6.23 → 4.6.25

package/types/components/table-plugins/extend-pivot-table.d.ts

@@ -1,3 +1,4 @@
+import { DefineVxeComponentOptions } from '@vxe-ui/core'
 import { VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines } from '../table'
 
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define,@typescript-eslint/no-unused-vars */
@@ -14,6 +15,12 @@ export interface VxeTableExtendPivotTablePrivateMethods<D = any> {
    * @private
    */
   getPivotTableAggregateCellAggValue(params: VxeTableDefines.CellRenderBodyParams<D> & { $table: VxeTableConstructor<D> & VxeTablePrivateMethods<D> }): string
+  /**
+   * @private
+   */
+  getPivotTableAggregateSimplePanel(): DefineVxeComponentOptions<{
+    customStore: VxeTableDefines.VxeTableCustomStoreObj
+  }, object>
 }
 
 declare module '../table' {

package/types/components/table.d.ts

@@ -822,16 +822,26 @@ export namespace VxeTablePropTypes {
      * 是否启用 localStorage 本地保存，会将列操作状态保留在本地（需要有 id）
      */
     storage?: boolean | VxeTableDefines.VxeTableCustomStorageObj
+    /**
+     * 只对 storage 有效，缓存项的配置
+     */
+    storeOptions?: VxeTableDefines.VxeTableCustomStorageObj
+    /**
+     * 只对 storage 有效，用于重写默认的恢复自定义配置逻辑，用于实现服务端保存
+     */
     restoreStore?(params: {
       $table: VxeTableConstructor<D>
       id: string
       type: 'restore'
       storeData: VxeTableDefines.CustomStoreData
     }): VxeTableDefines.CustomStoreData | Promise<VxeTableDefines.CustomStoreData>
+    /**
+     * 只对 storage 有效，重写默认的保存方法，用于实现服务端保存
+     */
     updateStore?(params: {
       $table: VxeTableConstructor<D>
       id: string
-      type: 'reset' | 'confirm' | 'update:width' | 'update:fixed' | 'update:sort' | 'update:visible'
+      type: 'reset' | 'confirm' | 'update:width' | 'update:fixed' | 'update:sort' | 'update:visible' | 'update:rowGroup' | 'update:aggFunc'
       storeData: VxeTableDefines.CustomStoreData
     }): Promise<any>
     mode?: 'default' | 'modal' | 'drawer' | 'simple' | 'popup' | '' | null
@@ -863,6 +873,9 @@ export namespace VxeTablePropTypes {
       maskClosable?: VxeDrawerPropTypes.MaskClosable
     }
     trigger?: 'manual' | 'hover' | 'click' | '' | null
+    /**
+     * 是否实时同步操作
+     */
     immediate?: boolean
     placement?: 'left' | 'right' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right'
     /**
@@ -879,10 +892,30 @@ export namespace VxeTablePropTypes {
       $table: VxeTableConstructor<D>
       column: VxeTableDefines.ColumnInfo<D>
     }): boolean
+    /**
+     * 是否允许个性化列显示与隐藏
+     */
     allowVisible?: boolean
+    /**
+     * 是否允许自定义冻结列
+     */
     allowFixed?: boolean
+    /**
+     * 是否允许自定义排序
+     */
     allowSort?: boolean
+    /**
+     * 是否允许自定义调整列宽
+     */
     allowResizable?: boolean
+    /**
+     * 允许自定义聚合分组配置
+     */
+    allowGroup?: boolean
+    /**
+     * 允许自定义聚合函数配置
+     */
+    allowValues?: boolean
     showFooter?: boolean
     icon?: string
     resetButtonText?: string
@@ -1780,6 +1813,16 @@ export namespace VxeTablePropTypes {
      * 用于排除指定列允许不允许被复制粘贴
      */
     excludeFields?: string[]
+    /**
+     * 重写表头单元格复制取值的方法，将表头单元格复制到剪贴板
+     */
+    copyHeaderMethod?(params: {
+      $table: VxeTableConstructor<DT> & VxeTablePrivateMethods<DT>
+      $grid: VxeGridConstructor<DT> | null | undefined
+      isCut: boolean
+      column: VxeTableDefines.ColumnInfo<DT>
+      title: string
+    }): string
     /**
      * 重写单元格复制取值的方法，将单元格复制到剪贴板
      */
@@ -3272,6 +3315,8 @@ export interface TablePrivateComputed<D = any> {
     x: boolean
     y: boolean
   }>
+  computeRowGroupFields: ComputedRef<string[] | null | undefined>
+  computeRowGroupColumns: ComputedRef<VxeTableDefines.ColumnInfo<D>[]>
 
   /**
    * @deprecated
@@ -3505,6 +3550,7 @@ export interface TableReactData<D = any> {
 
   isRowGroupStatus: boolean
   rowGroupList: VxeTableDefines.RowGroupItem[]
+  aggHandleFields: string[]
 
   rowGroupExpandedFlag: number
   rowExpandedFlag: number
@@ -5712,10 +5758,30 @@ export namespace VxeTableDefines {
   }
 
   export interface VxeTableCustomStorageObj {
+    /**
+     * 显示/隐藏列状态
+     */
     visible?: boolean
+    /**
+     * 列拖拽调整顺序
+     */
     resizable?: boolean
+    /**
+     * 冻结列状态
+     */
     fixed?: boolean
+    /**
+     * 列顺序
+     */
     sort?: boolean
+    /**
+     * 聚合分组字段
+     */
+    rowGroup?: boolean
+    /**
+     * 聚合函数
+     */
+    aggFunc?: boolean
   }
 
   export interface ExtortSheetMethodParams {

package/types/components/toolbar.d.ts

@@ -36,7 +36,7 @@ export namespace VxeToolbarPropTypes {
   export type Resizable = boolean | ResizableConfig
   export interface ResizableOpts extends ResizableConfig { }
 
-  interface RefreshConfig {
+  interface RefreshOptions {
     queryMethod?(params: { [key: string]: any }): any
     code?: 'query' | 'reload' | '' | null
     icon?: string
@@ -46,35 +46,30 @@ export namespace VxeToolbarPropTypes {
      */
     query?(params: { [key: string]: any }): Promise<any>
   }
-  export type Refresh = boolean | RefreshConfig
-  export interface RefreshOpts extends RefreshConfig { }
+  export type Refresh = boolean | RefreshOptions
 
-  interface ImportConfig {
+  interface ImportOptions {
     icon?: string
   }
-  export type Import = boolean | ImportConfig
-  export interface ImportOpts extends ImportConfig { }
+  export type Import = boolean | ImportOptions
 
-  interface ExportConfig {
+  interface ExportOptions {
     icon?: string
   }
-  export type Export = boolean | ExportConfig
-  export interface ExportOpts extends ExportConfig { }
+  export type Export = boolean | ExportOptions
 
-  export interface PrintConfig {
+  export interface PrintOptions {
     icon?: string
   }
-  export type Print = boolean | PrintConfig
-  export interface PrintOpts extends PrintConfig { }
+  export type Print = boolean | PrintOptions
 
-  interface ZoomConfig {
+  interface ZoomOptions {
     iconIn?: string
     iconOut?: string
   }
-  export type Zoom = boolean | ZoomConfig
-  export interface ZoomOpts extends ZoomConfig { }
+  export type Zoom = boolean | ZoomOptions
 
-  interface CustomConfig {
+  interface CustomOptions {
     icon?: string
 
     /**
@@ -123,8 +118,7 @@ export namespace VxeToolbarPropTypes {
      */
     isFooter?: boolean
   }
-  export type Custom = boolean | CustomConfig
-  export interface CustomOpts extends CustomConfig { }
+  export type Custom = boolean | CustomOptions
 
   interface ButtonAndToolConfig extends VxeButtonProps {
     code?: string
@@ -205,20 +199,32 @@ export type VxeToolbarProps = {
    * 刷新按钮配置
    */
   refresh?: VxeToolbarPropTypes.Refresh
+  refreshOptions?: VxeToolbarPropTypes.RefreshOptions
   /**
    * 导入按钮配置
    */
   import?: VxeToolbarPropTypes.Import
+  importOptions?: VxeToolbarPropTypes.ImportOptions
   /**
    * 导出按钮配置
    */
   export?: VxeToolbarPropTypes.Export
+  exportOptions?: VxeToolbarPropTypes.ExportOptions
+  /**
+   * 打印按钮配置项
+   */
   print?: VxeToolbarPropTypes.Print
+  printOptions?: VxeToolbarPropTypes.PrintOptions
+  /**
+   * 最大化按钮配置项
+   */
   zoom?: VxeToolbarPropTypes.Zoom
+  zoomOptions?: VxeToolbarPropTypes.ZoomOptions
   /**
    * 自定义列配置
    */
   custom?: VxeToolbarPropTypes.Custom
+  customOptions?: VxeToolbarPropTypes.CustomOptions
   /**
    * 按钮列表
    */

package/types/ui/global-icon.d.ts

@@ -31,6 +31,9 @@ declare module '@vxe-ui/core' {
     TABLE_DRAG_DISABLED?: string
     TABLE_ROW_GROUP_OPEN?: string
     TABLE_ROW_GROUP_CLOSE?: string
+    TABLE_AGGREGATION_GROUPING?: string
+    TABLE_AGGREGATION_VALUES?: string
+    TABLE_AGGREGATION_DELETE?: string
 
     // toolbar
     TOOLBAR_TOOLS_REFRESH?: string