vxe-pc-ui 4.10.45 → 4.10.47

package/packages/language/nb-NO.ts

@@ -540,22 +540,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/language/pt-BR.ts

@@ -540,22 +540,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/language/ru-RU.ts

@@ -540,22 +540,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/language/th-TH.ts

@@ -540,22 +540,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/language/ug-CN.ts

@@ -540,22 +540,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/language/uk-UA.ts

@@ -540,22 +540,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/language/uz-UZ.ts

@@ -540,22 +540,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/language/vi-VN.ts

@@ -540,22 +540,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/language/zh-CHT.ts

@@ -540,22 +540,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        date: '{d}',
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/language/zh-CN.ts

@@ -540,24 +540,26 @@ export default {
     },
     gantt: {
       tFullFormat: {
-        year: '{yy}年',
-        quarter: '{yy}年第{q}季度',
-        month: '{yy}年{M}月',
-        week: '{yy}年第{W}周',
-        day: '{yy}年{M}月{E}日',
-        date: '{yy}年{M}月{d}日',
-        hour: '{yy}年 {M}月{d}日{H}时',
-        minute: '{yy}年{M}月{d}日{H}时{m}分'
+        year: '{yyyy}年',
+        quarter: '{yyyy}年第{q}季度',
+        month: '{yyyy}年{MM}月',
+        week: '{yyyy}年第{W}周',
+        day: '{yyyy}年{MM}月 {E}',
+        date: '{yyyy}年{MM}月{dd}日',
+        hour: '{yyyy}年{MM}月{dd}日{HH}时',
+        minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
+        second: '{yyyy}年{MM}月{dd}日{HH}时{mm}分{ss}秒'
       },
       tSimpleFormat: {
-        year: '{yy}年',
+        year: '{yyyy}年',
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
         day: '{d}',
         date: '{d}',
-        hour: '{H}时',
-        minute: '{m}分'
+        hour: '{HH}',
+        minute: '{mm}',
+        second: '{ss}'
       },
       dayss: {
         w0: '日',

package/packages/tooltip/src/tooltip.ts

@@ -371,9 +371,13 @@ export default defineVxeComponent({
         return handleVisible(target, content)
       },
       updatePlacement () {
+        const { visible, tipTarget } = reactData
+        let el = refElem.value
+        if (visible && tipTarget && el) {
+          updateTipStyle()
+        }
         return nextTick().then(() => {
-          const { tipTarget } = reactData
-          const el = refElem.value
+          el = refElem.value
           if (tipTarget && el) {
             updateTipStyle()
             return nextTick().then(() => {

package/types/components/gantt-plugins/extend-gantt-chart.d.ts

@@ -1,3 +1,5 @@
+import { VxeGanttConstructor, VxeGanttDefines } from '../gantt'
+
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define,@typescript-eslint/no-unused-vars */
 
 export interface VxeGanttExtendChartMethods<D = any> {
@@ -8,7 +10,9 @@ export interface VxeGanttExtendChartPrivateMethods<D = any> {
    * @private
    */
   handleTaskBarMousedownEvent(evnt: MouseEvent, params: {
-    row: any
+    $gantt: VxeGanttConstructor<D>
+    row: D
+    scaleType: VxeGanttDefines.ColumnScaleType
   }): void
 }
 

package/types/components/gantt.d.ts

@@ -2,6 +2,7 @@ import { RenderFunction, SetupContext, ComputedRef, Ref } from 'vue'
 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'
+import { VxeGanttViewInstance } from './gantt-module/gantt-view'
 import { VxeTooltipPropTypes } from './tooltip'
 
 /* eslint-disable no-use-before-define,@typescript-eslint/ban-types */
@@ -22,6 +23,7 @@ export interface VxeGanttConstructor<D = any> extends VxeComponentBaseOptions, V
 }
 
 export interface GanttPrivateRef<D = any> extends GridPrivateRef<D> {
+  refGanttView: Ref<VxeGanttViewInstance | undefined>
   refGanttContainerElem: Ref<HTMLDivElement | undefined>
   refClassifyWrapperElem: Ref<HTMLDivElement | undefined>
 }
@@ -124,6 +126,19 @@ export namespace VxeGanttPropTypes {
       minWidth?: number | string
       maxWidth?: number | string
     }
+    /**
+     * 网格样式
+     */
+    gridding?: {
+      /**
+       * 左侧间距多少列
+       */
+      leftSpacing?: number
+      /**
+       * 右侧间距多少列
+       */
+      rightSpacing?: number
+    }
     /**
      * 任务视图样式
      */
@@ -319,6 +334,8 @@ export namespace VxeGanttPropTypes {
     dragStartMethod?(params: {
       $gantt: VxeGanttConstructor<D>
       row: D
+      startDate: Date
+      endDate: Date
     }): boolean
     /**
      * 拖拽结束时是否允许行拖拽移动任务条日期的方法，该方法的返回值用来决定是否允许被拖拽移动到指定日期
@@ -326,7 +343,24 @@ export namespace VxeGanttPropTypes {
     dragEndMethod?(params: {
       $gantt: VxeGanttConstructor<D>
       row: D
+      startDate: Date
+      endDate: Date
+      targetStartDate: Date
+      targetEndDate: Date
     }): Promise<boolean> | boolean
+    /**
+     * 自定义拖拽结束时赋值的方法
+     */
+    dragSetMethod?(params: {
+      $gantt: VxeGanttConstructor<D>
+      row: D
+      startDate: Date
+      endDate: Date
+      targetStartDate: Date
+      targetEndDate: Date
+      startValue: any
+      endValue: any
+    }): void
   }
 }
 
@@ -387,6 +421,7 @@ export interface GanttReactData<D = any> extends GridReactData<D> {
 export interface GanttInternalData extends GridInternalData {
   resizeTableWidth: number
   barTipTimeout?: any
+  dragBarRow?: any
 }
 
 export interface GanttMethods<D = any> extends Omit<GridMethods<D>, 'dispatchEvent'> {
@@ -509,18 +544,29 @@ export namespace VxeGanttDefines {
   export interface ScaleDateObj {
     date: Date
     yy: string
+    yyyy: string
     M: string
+    MM: string
     d: string
+    dd: string
     H: string
+    HH: string
     m: string
+    mm: string
     s: string
+    ss: string
     q: number
-    W: number
+    W: string
+    WW: string
     e: number
     E: number
   }
 
   export interface ScaleDefaultOptions {
+    /**
+     * 日期绑定值的格式
+     */
+    valueFormat?: string
     /**
      * 自定义时间轴-列头单元格标题
      */