vxe-table 3.18.0-beta.7 → 3.18.0-beta.8

package/packages/locale/lang/uk-UA.ts

@@ -44,6 +44,7 @@ export default {
       coverProp: 'Параметр "{1}" "{0}" неодноразово визначається, що може спричинити помилку',
       uniField: 'Назва поля "{0}" неодноразово визначається, що може спричинити помилку',
       repeatKey: 'Повторіть первинний ключ {0} = "{1}", що може спричинити помилку',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: 'Метод "{0}" застарілий, будь ласка, використовуйте "{1}"',
       delProp: 'Параметр "{0}" застарілий, будь ласка, використовуйте "{1}"',
       delEvent: 'Подія "{0}" застаріла, будь ласка, використовуйте "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: 'Другий'
       }
     },
+    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}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

package/packages/locale/lang/uz-UZ.ts

@@ -44,6 +44,7 @@ export default {
       coverProp: '"{1}" parametr "{0}" parametr bir necha bor aniqlanadi, bu xatoga olib kelishi mumkin',
       uniField: '"{0}" dagi "{0}" da bir necha bor aniqlanadi, bu xatoga olib kelishi mumkin',
       repeatKey: 'Birlamchi kalit {0} = "{1}" ni takrorlash mumkin, bu xatoga olib kelishi mumkin',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: '"{0}" himoyalangan, iltimos "{1}" dan foydalaning',
       delProp: '"{0}" parametri bekor qilinadi, "{1}" dan foydalaning',
       delEvent: '"{0}" bekor qilinadi, iltimos "{1}" dan foydalaning',
@@ -536,6 +537,35 @@ export default {
         ss: 'Ikkinchi'
       }
     },
+    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}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

package/packages/locale/lang/vi-VN.ts

@@ -44,6 +44,7 @@ export default {
       coverProp: 'Tham số "{1}" của "{0}" được xác định nhiều lần, có thể gây ra lỗi',
       uniField: 'Tên trường "{0}" được xác định nhiều lần, có thể gây ra lỗi',
       repeatKey: 'Lặp lại khóa chính {0} = "{1}", có thể gây ra lỗi',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: 'Phương thức "{0}" không được dùng nữa, vui lòng sử dụng "{1}"',
       delProp: 'Tham số "{0}" không được dùng, vui lòng sử dụng "{1}"',
       delEvent: 'Sự kiện "{0}" được không dùng nữa, vui lòng sử dụng "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: 'Thứ hai'
       }
     },
+    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}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

package/packages/locale/lang/zh-CHT.ts

@@ -44,6 +44,7 @@ export default {
       coverProp: '"{0}" 的參數 "{1}" 重複定義，這可能會出現錯誤',
       uniField: '字段名 "{0}" 重複定義，這可能會出現錯誤',
       repeatKey: '主鍵重複 {0}="{1}"，這可能會出現錯誤',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: '方法 "{0}" 已廢棄，請使用 "{1}"',
       delProp: '參數 "{0}" 已廢棄，請使用 "{1}"',
       delEvent: '事件 "{0}" 已廢棄，請使用 "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: '秒'
       }
     },
+    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}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

package/packages/locale/lang/zh-CN.ts

@@ -44,6 +44,7 @@ export default {
       coverProp: '"{0}" 的参数 "{1}" 重复定义，这可能会出现错误',
       uniField: '字段名 "{0}" 重复定义，这可能会出现错误',
       repeatKey: '主键重复 {0}="{1}"，这可能会出现错误',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: '方法 "{0}" 已废弃，请使用 "{1}"',
       delProp: '参数 "{0}" 已废弃，请使用 "{1}"',
       delEvent: '事件 "{0}" 已废弃，请使用 "{1}"',
@@ -536,6 +537,37 @@ export default {
         ss: '秒'
       }
     },
+    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}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        date: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

package/packages/table/src/footer.ts

@@ -3,7 +3,7 @@ import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getClass } from '../../ui/src/utils'
 import { updateCellTitle } from '../../ui/src/dom'
-import { getCellHeight } from './util'
+import { getCalcHeight } from './util'
 
 import type { VxeTableDefines, VxeTableConstructor, VxeTablePrivateMethods, TableReactData, TableInternalData, VxeComponentStyleType } from '../../../types'
 
@@ -32,7 +32,7 @@ function renderRows (h: CreateElement, _vm: any, isOptimizeMode: boolean, tableC
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
   const cellOpts = $xeTable.computeCellOpts
   const footerCellOpts = $xeTable.computeFooterCellOpts
-  const currCellHeight = getCellHeight(footerCellOpts.height) || defaultRowHeight
+  const currCellHeight = getCalcHeight(footerCellOpts.height) || defaultRowHeight
 
   return tableColumn.map((column: any, $columnIndex: any) => {
     const { type, showFooterOverflow, footerAlign, align, footerClassName, editRender, cellRender } = column

package/packages/table/src/header.ts

@@ -2,7 +2,7 @@ import { PropType, CreateElement } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getClass } from '../../ui/src/utils'
-import { getCellHeight, convertHeaderColumnToRows } from './util'
+import { getCalcHeight, convertHeaderColumnToRows } from './util'
 
 import type { VxeTableDefines, VxeTableConstructor, VxeTablePrivateMethods, VxeColumnPropTypes, TableReactData, TableInternalData, VxeComponentStyleType } from '../../../types'
 
@@ -29,7 +29,7 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
   const cellOpts = $xeTable.computeCellOpts
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
   const headerCellOpts = $xeTable.computeHeaderCellOpts
-  const currCellHeight = getCellHeight(headerCellOpts.height) || defaultRowHeight
+  const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight
   const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = columnDragOpts
   return cols.map((column: any, $columnIndex: any) => {
     const { type, showHeaderOverflow, headerAlign, align, filters, headerClassName, editRender, cellRender } = column

package/packages/table/src/table.ts

@@ -2,7 +2,7 @@ import { CreateElement } from 'vue'
 import XEUtils from 'xe-utils'
 import { getFuncText, isEnableConf } from '../../ui/src/utils'
 import { initTpImg } from '../../ui/src/dom'
-import { createInternalData, createHandleGetRowId, getCellHeight, hasDeepKey } from './util'
+import { createInternalData, createHandleGetRowId, getCalcHeight, hasDeepKey } from './util'
 import { VxeUI } from '../../ui'
 import methods from './methods'
 import TableBodyComponent from './body'
@@ -926,11 +926,21 @@ export default {
     },
     computeHeaderCellOpts () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const $xeGantt = $xeTable.$xeGantt
       const props = $xeTable
 
       const headerCellOpts = Object.assign({}, getConfig().table.headerCellConfig, props.headerCellConfig)
+      const defaultRowHeight = $xeTable.computeDefaultRowHeight
       const cellOpts = $xeTable.computeCellOpts
-      headerCellOpts.height = XEUtils.toNumber(getCellHeight(headerCellOpts.height || cellOpts.height))
+      let headCellHeight = XEUtils.toNumber(getCalcHeight(headerCellOpts.height || cellOpts.height))
+      if ($xeGantt) {
+        const taskScaleConfs = $xeGantt.computeTaskScaleConfs
+        if (taskScaleConfs && taskScaleConfs.length > 2) {
+          const ganttMinHeadCellHeight = defaultRowHeight / 2 * taskScaleConfs.length
+          headCellHeight = Math.max(ganttMinHeadCellHeight, headCellHeight)
+        }
+      }
+      headerCellOpts.height = headCellHeight
       return headerCellOpts
     },
     computeFooterCellOpts () {
@@ -939,7 +949,7 @@ export default {
 
       const footerCellOpts = Object.assign({}, getConfig().table.footerCellConfig, props.footerCellConfig)
       const cellOpts = $xeTable.computeCellOpts
-      footerCellOpts.height = XEUtils.toNumber(getCellHeight(footerCellOpts.height || cellOpts.height))
+      footerCellOpts.height = XEUtils.toNumber(getCalcHeight(footerCellOpts.height || cellOpts.height))
       return footerCellOpts
     },
     rowOpts () {

package/packages/table/src/util.ts

@@ -315,7 +315,7 @@ function getElementMarginAndWidth (elem: HTMLElement | null) {
   return 0
 }
 
-export function getCellHeight (height: number | 'unset' | undefined | null) {
+export function getCalcHeight (height: number | 'unset' | undefined | null) {
   if (height === 'unset') {
     return 0
   }