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

package/es/table/src/header.js

@@ -1,7 +1,7 @@
 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';
 const { renderer, renderEmptyElement } = VxeUI;
 const cellType = 'header';
 const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
@@ -22,7 +22,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
     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, $columnIndex) => {
         const { type, showHeaderOverflow, headerAlign, align, filters, headerClassName, editRender, cellRender } = column;

package/es/table/src/table.js

@@ -1,7 +1,7 @@
 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';
@@ -864,10 +864,20 @@ export default {
         },
         computeHeaderCellOpts() {
             const $xeTable = this;
+            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() {
@@ -875,7 +885,7 @@ export default {
             const props = $xeTable;
             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/es/table/src/util.js

@@ -286,7 +286,7 @@ function getElementMarginAndWidth(elem) {
     }
     return 0;
 }
-export function getCellHeight(height) {
+export function getCalcHeight(height) {
     if (height === 'unset') {
         return 0;
     }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.18.0-beta.7";
+export const version = "3.18.0-beta.8";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.18.0-beta.7"}`;
+const version = `table v${"3.18.0-beta.8"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.0-beta.7";
+const version = "3.18.0-beta.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2678,7 +2678,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.0-beta.7"}`;
+const log_version = `table v${"3.18.0-beta.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3185,7 +3185,7 @@ function getElementMarginAndWidth(elem) {
   }
   return 0;
 }
-function getCellHeight(height) {
+function getCalcHeight(height) {
   if (height === 'unset') {
     return 0;
   }
@@ -19721,7 +19721,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
   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,
@@ -20173,7 +20173,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
   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, $columnIndex) => {
     const {
       type,
@@ -29557,10 +29557,20 @@ function renderBody(h, $xeTable) {
     },
     computeHeaderCellOpts() {
       const $xeTable = this;
+      const $xeGantt = $xeTable.$xeGantt;
       const props = $xeTable;
       const headerCellOpts = Object.assign({}, table_getConfig().table.headerCellConfig, props.headerCellConfig);
+      const defaultRowHeight = $xeTable.computeDefaultRowHeight;
       const cellOpts = $xeTable.computeCellOpts;
-      headerCellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getCellHeight(headerCellOpts.height || cellOpts.height));
+      let headCellHeight = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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() {
@@ -29568,7 +29578,7 @@ function renderBody(h, $xeTable) {
       const props = $xeTable;
       const footerCellOpts = Object.assign({}, table_getConfig().table.footerCellConfig, props.footerCellConfig);
       const cellOpts = $xeTable.computeCellOpts;
-      footerCellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getCellHeight(footerCellOpts.height || cellOpts.height));
+      footerCellOpts.height = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getCalcHeight(footerCellOpts.height || cellOpts.height));
       return footerCellOpts;
     },
     rowOpts() {
@@ -35189,6 +35199,7 @@ const Toolbar = VxeToolbar;
       coverProp: '"{0}" 的参数 "{1}" 重复定义，这可能会出现错误',
       uniField: '字段名 "{0}" 重复定义，这可能会出现错误',
       repeatKey: '主键重复 {0}="{1}"，这可能会出现错误',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: '方法 "{0}" 已废弃，请使用 "{1}"',
       delProp: '参数 "{0}" 已废弃，请使用 "{1}"',
       delEvent: '事件 "{0}" 已废弃，请使用 "{1}"',
@@ -35681,6 +35692,37 @@ const Toolbar = VxeToolbar;
         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: {