vxe-pc-ui 4.8.22 → 4.8.24

package/types/components/gantt.d.ts

@@ -1,5 +1,5 @@
 import { RenderFunction, SetupContext, ComputedRef, Ref } from 'vue'
-import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentBaseOptions, VxeComponentEventParams, ValueOf, VxeComponentSlotType } from '@vxe-ui/core'
+import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentBaseOptions, VxeComponentEventParams, ValueOf, VxeComponentSlotType, VxeComponentAlignType } from '@vxe-ui/core'
 import { GridPrivateRef, VxeGridProps, VxeGridPropTypes, GridPrivateComputed, GridReactData, GridInternalData, GridMethods, GridPrivateMethods, VxeGridEmits, VxeGridSlots, VxeGridListeners, VxeGridEventProps, VxeGridMethods } from './grid'
 import { VxeTablePropTypes } from './table'
 
@@ -55,15 +55,53 @@ export namespace VxeGanttPropTypes {
      */
     progressField?: string
     /**
-     * 自定义解析日期的格式
+     * 自定义解析日期的格式 yyyy-MM-dd HH:mm:ss
      */
     dateFormat?: string
   }
 
+  export interface TaskViewScaleConfs {
+    /**
+     * 年配置
+     */
+    year?: VxeGanttDefines.ScaleDefaultOptions
+    /**
+     * 季度配置
+     */
+    quarter?: VxeGanttDefines.ScaleDefaultOptions
+    /**
+     * 月配置
+     */
+    month?: VxeGanttDefines.ScaleDefaultOptions
+    /**
+     * 周配置
+     */
+    week?: VxeGanttDefines.ScaleWeekOptions
+    /**
+     * 星期配置
+     */
+    day?: VxeGanttDefines.ScaleDefaultOptions
+    /**
+     * 天配置
+     */
+    date?: VxeGanttDefines.ScaleDefaultOptions
+    /**
+     * 小时配置
+     */
+    hour?: VxeGanttDefines.ScaleDefaultOptions
+    /**
+     * 分钟配置
+     */
+    minute?: VxeGanttDefines.ScaleDefaultOptions
+    /**
+     * 秒配置
+     */
+    second?: VxeGanttDefines.ScaleDefaultOptions
+  }
+
   export interface TaskViewConfig<D = any> {
-    mode?: string
     /**
-     * 日期列头颗粒度配置
+     * 日期轴配置项
      */
     scales?: VxeGanttDefines.ColumnScaleType[] | VxeGanttDefines.ColumnScaleConfig[]
     /**
@@ -111,6 +149,25 @@ export namespace VxeGanttPropTypes {
     showCollapseTaskButton?: boolean
   }
 
+  interface BarStyleConfig {
+    /**
+     * 圆角
+     */
+    round?: boolean
+    /**
+     * 任务条的背景颜色
+     */
+    bgColor?: string
+    /**
+     * 任务条的字体颜色
+     */
+    fontColor?: string
+    /**
+     * 已完成部分任务条的背景颜色
+     */
+    completedBgColor?: string
+  }
+
   export interface TaskBarConfig<D = any> {
     /**
      * 是否显示进度条
@@ -131,40 +188,29 @@ export namespace VxeGanttPropTypes {
     /**
      * 任务条样式
      */
-    barStyle?: {
-      /**
-       * 圆角
-       */
-      round?: boolean
-      /**
-       * 任务条的背景颜色
-       */
-      bgColor?: string
-      /**
-       * 任务条的字体颜色
-       */
-      fontColor?: string
-      /**
-       * 已完成部分任务条的背景颜色
-       */
-      completedBgColor?: string
-    }
+    barStyle?: BarStyleConfig | ((params: {
+      $gantt: VxeGanttConstructor<D>
+      row: D
+    }) => BarStyleConfig)
   }
 }
 
 export interface VxeGanttProps<D = any> extends Omit<VxeGridProps<D>, 'layouts'> {
   layouts?: VxeGanttPropTypes.Layouts
   taskConfig?: VxeGanttPropTypes.TaskConfig
-  taskViewConfig?: VxeGanttPropTypes.TaskViewConfig
+  taskViewScaleConfs?: VxeGanttPropTypes.TaskViewScaleConfs
+  taskViewConfig?: VxeGanttPropTypes.TaskViewConfig<D>
   taskSplitConfig?: VxeGanttPropTypes.TaskSplitConfig
-  taskBarConfig?: VxeGanttPropTypes.TaskBarConfig
+  taskBarConfig?: VxeGanttPropTypes.TaskBarConfig<D>
 }
 
 export interface GanttPrivateComputed<D = any> extends GridPrivateComputed<D> {
   computeTaskOpts: ComputedRef<VxeGanttPropTypes.TaskConfig>
-  computeTaskViewOpts: ComputedRef<VxeGanttPropTypes.TaskViewConfig>
-  computeTaskBarOpts: ComputedRef<VxeGanttPropTypes.TaskBarConfig>
+  computeTaskViewOpts: ComputedRef<VxeGanttPropTypes.TaskViewConfig<D>>
+  computeTaskViewScaleMapsOpts: ComputedRef<VxeGanttPropTypes.TaskViewScaleConfs>
+  computeTaskBarOpts: ComputedRef<VxeGanttPropTypes.TaskBarConfig<D>>
   computeTaskSplitOpts: ComputedRef<VxeGanttPropTypes.TaskSplitConfig>
+  computeTaskScaleConfs: ComputedRef<VxeGanttDefines.ColumnScaleType[] | VxeGanttDefines.ColumnScaleConfig[] | undefined>
   computeTitleField: ComputedRef<string>
   computeStartField: ComputedRef<string>
   computeEndField: ComputedRef<string>
@@ -178,6 +224,7 @@ export interface VxeGanttPrivateComputed<D = any> extends GanttPrivateComputed<D
 export interface GanttReactData<D = any> extends GridReactData<D> {
   showLeftView: boolean
   showRightView: boolean
+  taskScaleList: VxeGanttDefines.ColumnScaleObj[]
 }
 
 export interface GanttInternalData extends GridInternalData {
@@ -234,7 +281,9 @@ export type VxeGanttEmits = [
   'task-cell-click',
   'task-cell-dblclick',
   'task-bar-click',
-  'task-bar-dblclick'
+  'task-bar-dblclick',
+  'task-view-cell-click',
+  'task-view-cell-dblclick'
 ]
 
 export namespace VxeGanttDefines {
@@ -244,17 +293,69 @@ export namespace VxeGanttDefines {
 
   export type LayoutKey = 'Form' | 'Toolbar' | 'Top' | 'Gantt' | 'Bottom' | 'Pager'
 
-  export interface GroupHeaderColumn<D = any> extends VxeGanttPropTypes.Column<D> {
-    children: VxeGanttPropTypes.Column<D>[]
+  export interface GroupColumn<D = any> {
+    scaleItem: ColumnScaleObj
+    columns: ViewColumn<D>[]
+  }
+
+  export interface ViewColumn<D = any> {
+    field: string
+    title: string
+    dateObj: VxeGanttDefines.ScaleDateObj
+    childCount?: number
+    children?: ViewColumn<D>[]
+  }
+
+  export interface ScaleDateObj {
+    yy: string
+    M: string
+    d: string
+    H: string
+    m: string
+    s: string
+    q: number
+    W: number
+    e: number
+    E: number
+  }
+
+  export interface ScaleDefaultOptions {
+    /**
+     * 标题
+     */
+    titleMethod?: (params: VxeGanttSlotTypes.TaskViewCellTitleSlotParams) => string | number
+    /**
+     * 自定义插槽模板
+     */
+    slots?: {
+      /**
+       * 自定义标题
+       */
+      title?: string | ((params: VxeGanttSlotTypes.TaskViewCellTitleSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
+    }
+  }
+
+  export interface ScaleWeekOptions extends ScaleDefaultOptions {
+    /**
+     * 设置每周的起始日期是星期几
+     */
+    startDay?: 0 | 1 | 2 | 3 | 4 | 5 | 6
   }
 
   /**
    * 日期轴类型
    */
-  export type ColumnScaleType = 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'quarter' | 'year' | '' | null
+  export type ColumnScaleType = 'second' | 'minute' | 'hour' | 'date' | 'day' | 'week' | 'month' | 'quarter' | 'year'
 
-  export interface ColumnScaleConfig {
+   export interface ColumnScaleConfig extends ScaleDefaultOptions, ScaleWeekOptions {
     type: ColumnScaleType
+    align?: VxeComponentAlignType
+  }
+
+  export interface ColumnScaleObj extends ScaleDefaultOptions, ScaleWeekOptions {
+    type: ColumnScaleType
+    align?: VxeComponentAlignType
+    level: number
   }
 
   export interface RowCacheItem<D = any> {
@@ -275,6 +376,12 @@ export namespace VxeGanttDefines {
   export interface TaskCellDblClickEventParams<D = any> extends TaskCellClickEventParams<D> {}
   export interface TaskBarClickEventParams<D = any> extends TaskBarClickParams<D>, GanttEventParams {}
   export interface TaskBarDblClickEventParams<D = any> extends TaskBarClickEventParams<D> {}
+
+  export interface TaskViewCellClickEventParams<D = any> extends GanttEventParams {
+    row: D
+    column: ViewColumn<D>
+  }
+  export interface TaskViewCellDblClickEventParams<D = any> extends TaskViewCellClickEventParams<D> {}
 }
 
 export interface VxeGanttEventProps<D = any> extends VxeGridEventProps<D> {
@@ -282,6 +389,8 @@ export interface VxeGanttEventProps<D = any> extends VxeGridEventProps<D> {
   onTaskCellDblClick?: VxeGanttEvents.TaskCellDblClick<D>
   onTaskBarClick?: VxeGanttEvents.TaskBarClick<D>
   onTaskBarDblClick?: VxeGanttEvents.TaskBarDblClick<D>
+  onTaskViewCellClick?: VxeGanttEvents.TaskViewCellClick<D>
+  onTaskViewCellDblClick?: VxeGanttEvents.TaskViewCellDblClick<D>
 }
 
 export interface VxeGanttListeners<D = any> extends VxeGridListeners<D> {
@@ -289,6 +398,8 @@ export interface VxeGanttListeners<D = any> extends VxeGridListeners<D> {
   taskCellDblClick?: VxeGanttEvents.TaskCellDblClick<D>
   taskBarClick?: VxeGanttEvents.TaskBarClick<D>
   taskBarDblClick?: VxeGanttEvents.TaskBarDblClick<D>
+  taskViewCellClick?: VxeGanttEvents.TaskViewCellClick<D>
+  taskViewCellDblClick?: VxeGanttEvents.TaskViewCellDblClick<D>
 }
 
 export namespace VxeGanttEvents {
@@ -296,6 +407,8 @@ export namespace VxeGanttEvents {
   export type TaskCellDblClick<D = any> = (params: VxeGanttDefines.TaskCellDblClickEventParams<D>) => void
   export type TaskBarClick<D = any> = (params: VxeGanttDefines.TaskBarClickEventParams<D>) => void
   export type TaskBarDblClick<D = any> = (params: VxeGanttDefines.TaskBarDblClickEventParams<D>) => void
+  export type TaskViewCellClick<D = any> = (params: VxeGanttDefines.TaskViewCellClickEventParams<D>) => void
+  export type TaskViewCellDblClick<D = any> = (params: VxeGanttDefines.TaskViewCellDblClickEventParams<D>) => void
 }
 
 export namespace VxeGanttSlotTypes {
@@ -306,6 +419,13 @@ export namespace VxeGanttSlotTypes {
   export interface TaskBarSlotParams<D = any> {
     row: D
   }
+
+  export interface TaskViewCellTitleSlotParams {
+    title: string | number
+    dateObj: VxeGanttDefines.ScaleDateObj
+    scaleObj: VxeGanttDefines.ColumnScaleObj
+    $rowIndex: number
+  }
 }
 
 export interface VxeGanttSlots<D = any> extends VxeGridSlots<D> {

package/types/components/table.d.ts

@@ -1606,6 +1606,19 @@ export namespace VxeTablePropTypes {
    * 区域配置项
    */
   export interface AreaConfig<D = any> {
+    /**
+     * 是否显示操作提示消息
+     */
+    showActionMsg?: boolean
+    /**
+     * 自定义操作提示消息
+     */
+    customModalMsg?:(params: {
+      $table: VxeTableConstructor<D>
+      type: 'fnr' | 'clip' | 'merge' | 'selected'
+      message: string
+      status: VxeModalPropTypes.Status
+    }) => void
     /**
      * 只对 mouse-config.area 启用后有效，启用多区域选取功能
      */
@@ -4876,19 +4889,19 @@ export interface TablePrivateMethods<D = any> {
   /**
    * @private
    */
-  handleColResizeMousedownEvent(evnt: MouseEvent, fixedType: 'left' | 'right' | '', params: (VxeTableDefines.CellRenderHeaderParams | VxeTableDefines.CellRenderBodyParams | VxeTableDefines.CellRenderFooterParams) & { $table: VxeTableConstructor & VxeTablePrivateMethods }): void
+  handleColResizeMousedownEvent(evnt: MouseEvent, fixedType: 'left' | 'right' | '', params: (VxeTableDefines.CellRenderHeaderParams | VxeTableDefines.CellRenderBodyParams | VxeTableDefines.CellRenderFooterParams)): void
   /**
    * @private
    */
-  handleColResizeDblclickEvent(evnt: MouseEvent, params: (VxeTableDefines.CellRenderHeaderParams | VxeTableDefines.CellRenderBodyParams | VxeTableDefines.CellRenderFooterParams) & { $table: VxeTableConstructor & VxeTablePrivateMethods }): void
+  handleColResizeDblclickEvent(evnt: MouseEvent, params: (VxeTableDefines.CellRenderHeaderParams | VxeTableDefines.CellRenderBodyParams | VxeTableDefines.CellRenderFooterParams)): void
   /**
    * @private
    */
-  handleRowResizeMousedownEvent(evnt: MouseEvent, params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }): void
+  handleRowResizeMousedownEvent(evnt: MouseEvent, params: VxeTableDefines.CellRenderBodyParams): void
   /**
    * @private
    */
-  handleRowResizeDblclickEvent(evnt: MouseEvent, params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }): void
+  handleRowResizeDblclickEvent(evnt: MouseEvent, params: VxeTableDefines.CellRenderBodyParams): void
   /**
    * @private
    */

package/types/components/tag.d.ts

@@ -27,6 +27,7 @@ export namespace VxeTagPropTypes {
   export type Title = string | number
   export type Icon = string
   export type Content = string | number
+  export type Round = boolean
   export type Size = VxeComponentSizeType
 }
 
@@ -35,6 +36,7 @@ export type VxeTagProps = {
   title?: VxeTagPropTypes.Title
   icon?: VxeTagPropTypes.Icon
   content?: VxeTagPropTypes.Content
+  round?: VxeTagPropTypes.Round
   size?: VxeTagPropTypes.Size
 }