vxe-pc-ui 4.10.46 → 4.10.48

package/packages/language/ja-JP.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/ko-KR.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/ms-MY.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/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/calendar.d.ts

@@ -38,6 +38,7 @@ export namespace VxeCalendarPropTypes {
   export type ValueFormat = string
   export type FestivalMethod = (params: VxeCalendarDefines.DateFestivalParams) => VxeCalendarDefines.DateFestivalInfo | null | void
   export type DisabledMethod = (params: VxeCalendarDefines.DateDisabledParams) => boolean
+  export type CellStyle = (params: VxeCalendarDefines.CellStyleParams) => void | null | Partial<CSSStyleDeclaration>
 }
 
 export type VxeCalendarProps = {
@@ -56,6 +57,7 @@ export type VxeCalendarProps = {
   valueFormat?: VxeCalendarPropTypes.ValueFormat
   festivalMethod?: VxeCalendarPropTypes.FestivalMethod
   disabledMethod?: VxeCalendarPropTypes.DisabledMethod
+  cellStyle?: VxeCalendarPropTypes.CellStyle
 }
 
 export interface CalendarPrivateComputed {
@@ -101,7 +103,7 @@ export namespace VxeCalendarDefines {
     $calendar: VxeCalendarConstructor
   }
 
-  export type DatePanelType = 'year' | 'quarter' | 'month' | 'week' | 'day'
+  export type DatePanelType = 'year' | 'quarter' | 'month' | 'week' | 'day' | 'date'
 
   interface DateFestivalItem {
     /**
@@ -144,6 +146,13 @@ export namespace VxeCalendarDefines {
     date: Date
   }
 
+  export interface CellStyleParams {
+    $calendar: VxeCalendarConstructor
+    type: string
+    viewType: DatePanelType
+    date: Date
+  }
+
   export interface InputEventParams extends CalendarEventParams {
     value: string
   }

package/types/components/gantt.d.ts

@@ -126,6 +126,19 @@ export namespace VxeGanttPropTypes {
       minWidth?: number | string
       maxWidth?: number | string
     }
+    /**
+     * 网格样式
+     */
+    gridding?: {
+      /**
+       * 左侧间距多少列
+       */
+      leftSpacing?: number
+      /**
+       * 右侧间距多少列
+       */
+      rightSpacing?: number
+    }
     /**
      * 任务视图样式
      */
@@ -149,7 +162,7 @@ export namespace VxeGanttPropTypes {
       /**
        * 行样式
        */
-      rowStyle?: ((params: {
+      rowStyle?: Partial<CSSStyleDeclaration> | ((params: {
         source: string
         type: string
         scaleType: VxeGanttDefines.ColumnScaleType
@@ -157,7 +170,7 @@ export namespace VxeGanttPropTypes {
         rowIndex: number
         $rowIndex: number
         _rowIndex: number
-      }) => Partial<CSSStyleDeclaration>)
+      }) => void | null | Partial<CSSStyleDeclaration>)
       /**
        * 给单元格附加 className
        */
@@ -175,7 +188,7 @@ export namespace VxeGanttPropTypes {
       /**
        * 单元格样式
        */
-      cellStyle?: ((params: {
+      cellStyle?: Partial<CSSStyleDeclaration> | ((params: {
         source: string
         type: string
         scaleType: VxeGanttDefines.ColumnScaleType
@@ -185,7 +198,7 @@ export namespace VxeGanttPropTypes {
         rowIndex: number
         $rowIndex: number
         _rowIndex: number
-      }) => Partial<CSSStyleDeclaration>)
+      }) => void | null | Partial<CSSStyleDeclaration>)
     }
   }
 
@@ -408,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'> {
@@ -530,13 +544,20 @@ 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
   }
@@ -557,7 +578,7 @@ export namespace VxeGanttDefines {
     /**
      * 自定义时间轴-列头单元格样式
      */
-    headerCellStyle?: CSSStyleDeclaration | ((params: VxeGanttSlotTypes.TaskViewHeaderCellStyleSlotParams) => Partial<CSSStyleDeclaration>)
+    headerCellStyle?: CSSStyleDeclaration | ((params: VxeGanttSlotTypes.TaskViewHeaderCellStyleSlotParams) => void | null | Partial<CSSStyleDeclaration>)
     /**
      * 自定义插槽模板
      */