vxe-gantt 4.1.0 → 4.1.1

package/es/gantt/src/emits.js

@@ -3,6 +3,8 @@ export const ganttEmits = [
     ...gridEmits,
     'task-cell-click',
     'task-cell-dblclick',
+    'task-bar-mouseenter',
+    'task-bar-mouseleave',
     'task-bar-click',
     'task-bar-dblclick',
     'task-view-cell-click',

package/es/gantt/src/gantt-chart.js

@@ -32,7 +32,7 @@ export default defineVxeComponent({
             const progressField = computeProgressField.value;
             const taskBarOpts = computeTaskBarOpts.value;
             const barParams = { $gantt: $xeGantt, row };
-            const { showProgress, showContent, contentMethod, barStyle, drag } = taskBarOpts;
+            const { showProgress, showContent, contentMethod, barStyle, drag, showTooltip } = taskBarOpts;
             const isBarRowStyle = XEUtils.isFunction(barStyle);
             const barStyObj = (barStyle ? (isBarRowStyle ? barStyle(barParams) : barStyle) : {}) || {};
             const { round } = barStyObj;
@@ -58,7 +58,32 @@ export default defineVxeComponent({
             if (contentMethod) {
                 title = getStringValue(contentMethod({ row, title }));
             }
-            const ctParams = { source: sourceType, type: viewType, row, $rowIndex, rowIndex, _rowIndex };
+            const ctParams = { source: sourceType, type: viewType, row, $rowIndex, rowIndex, _rowIndex, $gantt: $xeGantt };
+            const ons = {
+                onClick(evnt) {
+                    $xeGantt.handleTaskBarClickEvent(evnt, barParams);
+                },
+                onDblclick(evnt) {
+                    $xeGantt.handleTaskBarDblclickEvent(evnt, barParams);
+                },
+                onMousedown(evnt) {
+                    if ($xeGantt.handleTaskBarMousedownEvent) {
+                        $xeGantt.handleTaskBarMousedownEvent(evnt, barParams);
+                    }
+                }
+            };
+            if (showTooltip) {
+                ons.onMouseover = (evnt) => {
+                    const ttParams = Object.assign({ $event: evnt }, ctParams);
+                    $xeGantt.triggerTaskBarTooltipEvent(evnt, ttParams);
+                    $xeGantt.dispatchEvent('task-bar-mouseenter', ttParams, evnt);
+                };
+                ons.onMouseleave = (evnt) => {
+                    const ttParams = Object.assign({ $event: evnt }, ctParams);
+                    $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, ttParams);
+                    $xeGantt.dispatchEvent('task-bar-mouseleave', ttParams, evnt);
+                };
+            }
             return h('div', {
                 key: treeConfig ? rowid : $rowIndex,
                 rowid,
@@ -74,22 +99,7 @@ export default defineVxeComponent({
                     $xeGantt.handleTaskBarContextmenuEvent(evnt, ctParams);
                 }
             }, [
-                h('div', {
-                    class: taskBarSlot ? 'vxe-gantt-view--chart-custom-bar' : 'vxe-gantt-view--chart-bar',
-                    style: vbStyle,
-                    rowid,
-                    onClick(evnt) {
-                        $xeGantt.handleTaskBarClickEvent(evnt, barParams);
-                    },
-                    onDblclick(evnt) {
-                        $xeGantt.handleTaskBarDblclickEvent(evnt, barParams);
-                    },
-                    onMousedown(evnt) {
-                        if ($xeGantt.handleTaskBarMousedownEvent) {
-                            $xeGantt.handleTaskBarMousedownEvent(evnt, barParams);
-                        }
-                    }
-                }, taskBarSlot
+                h('div', Object.assign({ class: taskBarSlot ? 'vxe-gantt-view--chart-custom-bar' : 'vxe-gantt-view--chart-bar', style: vbStyle, rowid }, ons), taskBarSlot
                     ? $xeGantt.callSlot(taskBarSlot, barParams)
                     : [
                         showProgress

package/es/gantt/src/gantt-header.js

@@ -56,18 +56,21 @@ export default defineVxeComponent({
                             }, columns.map((column, cIndex) => {
                                 const { field, childCount, dateObj } = column;
                                 let label = `${column.title}`;
-                                if ($rowIndex < headerGroups.length - 1) {
-                                    if (scaleItem.type === 'day') {
-                                        label = getI18n(`vxe.gantt.dayss.w${dateObj.e}`);
-                                    }
-                                    else {
-                                        label = getI18n(`vxe.gantt.${!$rowIndex && headerGroups.length > 1 ? 'tFullFormat' : 'tSimpleFormat'}.${type}`, dateObj);
-                                    }
+                                if (scaleItem.type === 'day') {
+                                    label = getI18n(`vxe.gantt.dayss.w${dateObj.e}`);
                                 }
                                 else {
-                                    if (isLast && scaleItem.type === 'week') {
+                                    if ($rowIndex) {
                                         label = getI18n(`vxe.gantt.tSimpleFormat.${type}`, dateObj);
                                     }
+                                    else {
+                                        if (isLast && scaleItem.type === 'week') {
+                                            label = getI18n(`vxe.gantt.tSimpleFormat.${type}`, dateObj);
+                                        }
+                                        else {
+                                            label = getI18n(`vxe.gantt.tFullFormat.${type}`, dateObj);
+                                        }
+                                    }
                                 }
                                 let cellVNs = label;
                                 const ctParams = { source: sourceType, type: viewType, column, scaleObj: scaleItem, title: label, dateObj: dateObj, $rowIndex };

package/es/gantt/src/gantt-view.js

@@ -306,7 +306,7 @@ export default defineVxeComponent({
                     if (minScale.level < 17) {
                         handleData('quarter', colMaps, minCol);
                     }
-                    if (minScale.level < 14) {
+                    if (minScale.level < 15) {
                         handleData('month', colMaps, minCol);
                     }
                     if (minScale.level < 13) {
@@ -315,7 +315,7 @@ export default defineVxeComponent({
                     if (minScale.level < 11) {
                         handleData('day', colMaps, minCol);
                     }
-                    if (minScale.level < 12) {
+                    if (minScale.level < 9) {
                         handleData('date', colMaps, minCol);
                     }
                     if (minScale.level < 7) {
@@ -324,6 +324,9 @@ export default defineVxeComponent({
                     if (minScale.level < 5) {
                         handleData('minute', colMaps, minCol);
                     }
+                    if (minScale.level < 3) {
+                        handleData('second', colMaps, minCol);
+                    }
                     fullCols.push(minCol);
                 }
                 taskScaleList.forEach(scaleItem => {

package/es/gantt/src/gantt.js

@@ -1,7 +1,7 @@
 import { h, ref, computed, provide, reactive, onUnmounted, watch, nextTick, onMounted } from 'vue';
 import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
-import { getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils';
+import { getLastZIndex, nextZIndex, isEnableConf, formatText } from '../../ui/src/utils';
 import { getOffsetHeight, getPaddingTopBottomSize, getDomNode, toCssUnit, addClass, removeClass } from '../../ui/src/dom';
 import { getSlotVNs } from '../../ui/src/vn';
 import { VxeUI } from '@vxe-ui/core';
@@ -19,6 +19,7 @@ function createInternalData() {
     return {
         uFoot: false,
         resizeTableWidth: 0
+        // barTipTimeout: undefined
     };
 }
 const viewTypeLevelMaps = {
@@ -38,7 +39,7 @@ function getViewTypeLevel(type) {
 export default defineVxeComponent({
     name: 'VxeGantt',
     mixins: [],
-    props: Object.assign(Object.assign({}, tableProps), { columns: Array, pagerConfig: Object, proxyConfig: Object, toolbarConfig: Object, formConfig: Object, zoomConfig: Object, layouts: Array, taskConfig: Object, taskViewScaleConfig: Object, taskViewConfig: Object, taskBarConfig: Object, taskSplitConfig: Object, taskBarResizeConfig: Object, taskBarDragConfig: Object, size: {
+    props: Object.assign(Object.assign({}, tableProps), { columns: Array, pagerConfig: Object, proxyConfig: Object, toolbarConfig: Object, formConfig: Object, zoomConfig: Object, layouts: Array, taskConfig: Object, taskViewScaleConfig: Object, taskViewConfig: Object, taskBarConfig: Object, taskBarTooltipConfig: Object, taskSplitConfig: Object, taskBarResizeConfig: Object, taskBarDragConfig: Object, size: {
             type: String,
             default: () => getConfig().gantt.size || getConfig().size
         } }),
@@ -52,6 +53,7 @@ export default defineVxeComponent({
         const VxeUIPagerComponent = VxeUI.getComponent('VxePager');
         const VxeTableComponent = VxeUI.getComponent('VxeTable');
         const VxeToolbarComponent = VxeUI.getComponent('VxeToolbar');
+        const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
         const { computeSize } = useFns.useSize(props);
         const reactData = reactive({
             tableLoading: false,
@@ -70,7 +72,13 @@ export default defineVxeComponent({
             },
             showLeftView: true,
             showRightView: true,
-            taskScaleList: []
+            taskScaleList: [],
+            barTipStore: {
+                row: null,
+                content: '',
+                visible: false,
+                params: null
+            }
         });
         const internalData = createInternalData();
         const refElem = ref();
@@ -89,6 +97,7 @@ export default defineVxeComponent({
         const refPagerWrapper = ref();
         const refTableWrapper = ref();
         const refGanttWrapper = ref();
+        const refTooltip = ref();
         const refResizableSplitTip = ref();
         const extendTableMethods = (methodKeys) => {
             const funcs = {};
@@ -155,6 +164,9 @@ export default defineVxeComponent({
         const computeTaskSplitOpts = computed(() => {
             return Object.assign({}, getConfig().gantt.taskSplitConfig, props.taskSplitConfig);
         });
+        const computeTaskBarTooltipOpts = computed(() => {
+            return Object.assign({}, getConfig().gantt.taskBarTooltipConfig, props.taskBarTooltipConfig);
+        });
         const computeScaleUnit = computed(() => {
             const minScale = computeMinScale.value;
             return minScale ? minScale.type : 'date';
@@ -167,7 +179,7 @@ export default defineVxeComponent({
             const { taskScaleList } = reactData;
             return taskScaleList.find(item => item.type === 'week');
         });
-        const computeTaskScaleConfs = computed(() => {
+        const computeTaskViewScales = computed(() => {
             const taskViewOpts = computeTaskViewOpts.value;
             const { scales } = taskViewOpts;
             return scales;
@@ -384,7 +396,8 @@ export default defineVxeComponent({
             computeTaskBarDragOpts,
             computeTaskBarResizeOpts,
             computeTaskSplitOpts,
-            computeTaskScaleConfs,
+            computeTaskBarTooltipOpts,
+            computeTaskViewScales,
             computeScaleUnit,
             computeMinScale,
             computeWeekScale,
@@ -396,6 +409,7 @@ export default defineVxeComponent({
             computeScrollbarXToTop,
             computeScrollbarYToLeft
         };
+        computeMaps.computeTaskScaleConfs = computeTaskViewScales;
         const $xeGantt = {
             xID,
             props: props,
@@ -406,7 +420,7 @@ export default defineVxeComponent({
             getComputeMaps: () => computeMaps
         };
         const handleTaskScaleConfig = () => {
-            const taskScaleConfs = computeTaskScaleConfs.value;
+            const taskScaleConfs = computeTaskViewScales.value;
             const taskViewScaleOpts = computeTaskViewScaleOpts.value;
             const scaleConfs = [];
             if (taskScaleConfs) {
@@ -860,6 +874,18 @@ export default defineVxeComponent({
         const dispatchEvent = (type, params, evnt) => {
             emit(type, createEvent(evnt, { $grid: null, $gantt: $xeGantt }, params));
         };
+        const handleTargetEnterEvent = (isClear) => {
+            const $tooltip = refTooltip.value;
+            clearTimeout(internalData.barTipTimeout);
+            if (isClear) {
+                $xeGantt.closeTaskBarTooltip();
+            }
+            else {
+                if ($tooltip && $tooltip.setActived) {
+                    $tooltip.setActived(true);
+                }
+            }
+        };
         const ganttMethods = {
             dispatchEvent,
             getEl() {
@@ -1475,6 +1501,25 @@ export default defineVxeComponent({
             hideTaskView() {
                 reactData.showRightView = false;
                 return nextTick();
+            },
+            /**
+             * 关闭 bar tooltip
+             */
+            closeTaskBarTooltip() {
+                const { barTipStore } = reactData;
+                const $tooltip = refTooltip.value;
+                if (barTipStore.visible) {
+                    Object.assign(barTipStore, {
+                        row: null,
+                        content: null,
+                        visible: false,
+                        params: {}
+                    });
+                    if ($tooltip && $tooltip.close) {
+                        $tooltip.close();
+                    }
+                }
+                return nextTick();
             }
         };
         const ganttPrivateMethods = {
@@ -1592,6 +1637,54 @@ export default defineVxeComponent({
             handleTaskBarDblclickEvent(evnt, params) {
                 $xeGantt.dispatchEvent('task-bar-dblclick', params, evnt);
             },
+            triggerTaskBarTooltipEvent(evnt, params) {
+                const { barTipStore } = reactData;
+                const taskBarTooltipOpts = computeTaskBarTooltipOpts.value;
+                const titleField = computeTitleField.value;
+                const { contentMethod } = taskBarTooltipOpts;
+                const { row } = params;
+                let content = formatText(XEUtils.get(row, titleField));
+                if (contentMethod) {
+                    content = formatText(contentMethod(params));
+                }
+                handleTargetEnterEvent(barTipStore.row !== row);
+                const tipContent = formatText(content);
+                Object.assign(barTipStore, {
+                    row,
+                    visible: true,
+                    content: tipContent,
+                    params
+                });
+                nextTick(() => {
+                    const $tooltip = refTooltip.value;
+                    if ($tooltip) {
+                        if ($tooltip.openByEvent) {
+                            $tooltip.openByEvent(evnt, evnt.currentTarget, tipContent);
+                        }
+                        else if ($tooltip.open) {
+                            $tooltip.open(evnt.currentTarget, tipContent);
+                        }
+                    }
+                });
+            },
+            handleTaskBarTooltipLeaveEvent() {
+                const taskBarTooltipOpts = computeTaskBarTooltipOpts.value;
+                let $tooltip = refTooltip.value;
+                if ($tooltip && $tooltip.setActived) {
+                    $tooltip.setActived(false);
+                }
+                if (taskBarTooltipOpts.enterable) {
+                    internalData.barTipTimeout = setTimeout(() => {
+                        $tooltip = refTooltip.value;
+                        if ($tooltip && $tooltip.isActived && !$tooltip.isActived()) {
+                            $xeGantt.closeTaskBarTooltip();
+                        }
+                    }, taskBarTooltipOpts.leaveDelay);
+                }
+                else {
+                    $xeGantt.closeTaskBarTooltip();
+                }
+            },
             handleTaskHeaderContextmenuEvent(evnt, params) {
                 const $xeTable = refTable.value;
                 if ($xeTable) {
@@ -2009,10 +2102,13 @@ export default defineVxeComponent({
             return childVNs;
         };
         const renderLayout = () => {
+            const { barTipStore } = reactData;
             const currLayoutConf = computeCurrLayoutConf.value;
             const { headKeys, bodyKeys, footKeys } = currLayoutConf;
+            const taskBarTooltipOpts = computeTaskBarTooltipOpts.value;
             const asideLeftSlot = slots.asideLeft || slots['aside-left'];
             const asideRightSlot = slots.asideRight || slots['aside-right'];
+            const taskBarTooltipSlot = slots.taskBarTooltip || slots['task-bar-tooltip'];
             return [
                 h('div', {
                     class: 'vxe-gantt--layout-header-wrapper'
@@ -2039,7 +2135,38 @@ export default defineVxeComponent({
                 }, renderChildLayout(footKeys)),
                 h('div', {
                     ref: refPopupContainerElem
-                })
+                }),
+                h('div', {}, [
+                    /**
+                      * 任务条提示
+                      */
+                    h(VxeUITooltipComponent, {
+                        key: 'gtp',
+                        ref: refTooltip,
+                        theme: taskBarTooltipOpts.theme,
+                        enterable: taskBarTooltipOpts.enterable,
+                        enterDelay: taskBarTooltipOpts.enterDelay,
+                        leaveDelay: taskBarTooltipOpts.leaveDelay,
+                        useHTML: taskBarTooltipOpts.useHTML,
+                        width: taskBarTooltipOpts.width,
+                        height: taskBarTooltipOpts.height,
+                        minWidth: taskBarTooltipOpts.minWidth,
+                        minHeight: taskBarTooltipOpts.minHeight,
+                        maxWidth: taskBarTooltipOpts.maxWidth,
+                        maxHeight: taskBarTooltipOpts.maxHeight,
+                        isArrow: false
+                    }, taskBarTooltipSlot
+                        ? {
+                            content: () => {
+                                const { row, content: tooltipContent } = barTipStore;
+                                if (row) {
+                                    return h('div', {}, taskBarTooltipSlot(Object.assign({ tooltipContent, $gantt: $xeGantt }, barTipStore.params)));
+                                }
+                                return renderEmptyElement($xeGantt);
+                            }
+                        }
+                        : {})
+                ])
             ];
         };
         const renderVN = () => {
@@ -2088,7 +2215,7 @@ export default defineVxeComponent({
         watch(() => props.proxyConfig, () => {
             initProxy();
         });
-        watch(computeTaskScaleConfs, () => {
+        watch(computeTaskViewScales, () => {
             handleTaskScaleConfig();
             $xeGantt.refreshTaskView();
         });

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI } from '@vxe-ui/core';
 import { errLog } from './src/log';
 const { setConfig, setIcon, checkVersion } = VxeUI;
-VxeUI.ganttVersion = "4.1.0";
+VxeUI.ganttVersion = "4.1.1";
 setConfig({
     gantt: {
         // size: null,
@@ -40,6 +40,9 @@ setConfig({
             // beforeSave: null,
             // afterSave: null
         },
+        taskBarTooltipConfig: {
+            enterable: true
+        },
         taskViewScaleConfig: {
             week: {
                 startDay: 1

package/es/ui/src/log.js

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

package/lib/gantt/src/emits.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ganttEmits = void 0;
 var _gridEmits = require("./grid-emits");
-const ganttEmits = exports.ganttEmits = [..._gridEmits.gridEmits, 'task-cell-click', 'task-cell-dblclick', 'task-bar-click', 'task-bar-dblclick', 'task-view-cell-click', 'task-view-cell-dblclick'];
+const ganttEmits = exports.ganttEmits = [..._gridEmits.gridEmits, 'task-cell-click', 'task-cell-dblclick', 'task-bar-mouseenter', 'task-bar-mouseleave', 'task-bar-click', 'task-bar-dblclick', 'task-view-cell-click', 'task-view-cell-dblclick'];

package/lib/gantt/src/emits.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.ganttEmits=void 0;var _gridEmits=require("./grid-emits");let ganttEmits=exports.ganttEmits=[..._gridEmits.gridEmits,"task-cell-click","task-cell-dblclick","task-bar-click","task-bar-dblclick","task-view-cell-click","task-view-cell-dblclick"];
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.ganttEmits=void 0;var _gridEmits=require("./grid-emits");let ganttEmits=exports.ganttEmits=[..._gridEmits.gridEmits,"task-cell-click","task-cell-dblclick","task-bar-mouseenter","task-bar-mouseleave","task-bar-click","task-bar-dblclick","task-view-cell-click","task-view-cell-dblclick"];

package/lib/gantt/src/gantt-chart.js

@@ -66,7 +66,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         showContent,
         contentMethod,
         barStyle,
-        drag
+        drag,
+        showTooltip
       } = taskBarOpts;
       const isBarRowStyle = _xeUtils.default.isFunction(barStyle);
       const barStyObj = (barStyle ? isBarRowStyle ? barStyle(barParams) : barStyle : {}) || {};
@@ -107,8 +108,38 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         row,
         $rowIndex,
         rowIndex,
-        _rowIndex
+        _rowIndex,
+        $gantt: $xeGantt
       };
+      const ons = {
+        onClick(evnt) {
+          $xeGantt.handleTaskBarClickEvent(evnt, barParams);
+        },
+        onDblclick(evnt) {
+          $xeGantt.handleTaskBarDblclickEvent(evnt, barParams);
+        },
+        onMousedown(evnt) {
+          if ($xeGantt.handleTaskBarMousedownEvent) {
+            $xeGantt.handleTaskBarMousedownEvent(evnt, barParams);
+          }
+        }
+      };
+      if (showTooltip) {
+        ons.onMouseover = evnt => {
+          const ttParams = Object.assign({
+            $event: evnt
+          }, ctParams);
+          $xeGantt.triggerTaskBarTooltipEvent(evnt, ttParams);
+          $xeGantt.dispatchEvent('task-bar-mouseenter', ttParams, evnt);
+        };
+        ons.onMouseleave = evnt => {
+          const ttParams = Object.assign({
+            $event: evnt
+          }, ctParams);
+          $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, ttParams);
+          $xeGantt.dispatchEvent('task-bar-mouseleave', ttParams, evnt);
+        };
+      }
       return (0, _vue.h)('div', {
         key: treeConfig ? rowid : $rowIndex,
         rowid,
@@ -123,22 +154,11 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         onContextmenu(evnt) {
           $xeGantt.handleTaskBarContextmenuEvent(evnt, ctParams);
         }
-      }, [(0, _vue.h)('div', {
+      }, [(0, _vue.h)('div', Object.assign({
         class: taskBarSlot ? 'vxe-gantt-view--chart-custom-bar' : 'vxe-gantt-view--chart-bar',
         style: vbStyle,
-        rowid,
-        onClick(evnt) {
-          $xeGantt.handleTaskBarClickEvent(evnt, barParams);
-        },
-        onDblclick(evnt) {
-          $xeGantt.handleTaskBarDblclickEvent(evnt, barParams);
-        },
-        onMousedown(evnt) {
-          if ($xeGantt.handleTaskBarMousedownEvent) {
-            $xeGantt.handleTaskBarMousedownEvent(evnt, barParams);
-          }
-        }
-      }, taskBarSlot ? $xeGantt.callSlot(taskBarSlot, barParams) : [showProgress ? (0, _vue.h)('div', {
+        rowid
+      }, ons), taskBarSlot ? $xeGantt.callSlot(taskBarSlot, barParams) : [showProgress ? (0, _vue.h)('div', {
         class: 'vxe-gantt-view--chart-progress',
         style: vpStyle
       }) : renderEmptyElement($xeGantt), showContent ? (0, _vue.h)('div', {

package/lib/gantt/src/gantt-chart.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_core=require("@vxe-ui/core"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderEmptyElement=_core.VxeUI.renderEmptyElement,sourceType="gantt",viewType="chart";var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewChart",setup(){let k=(0,_vue.inject)("$xeGantt",{}),a=(0,_vue.inject)("$xeGanttView",{}),{reactData:r,internalData:t}=a,{computeProgressField:y,computeTitleField:b,computeTaskBarOpts:M}=k.getComputeMaps(),l=(0,_vue.ref)(),x=(e,t,a,r,l,n)=>{var o=e.props.treeConfig,u=e.reactData.resizeHeightFlag,i=e.internalData.fullAllDataRowIdData,{computeCellOpts:e,computeRowOpts:s,computeDefaultRowHeight:d}=e.getComputeMaps(),e=e.value,s=s.value,d=d.value,c=k.context.slots,c=c.taskBar||c["task-bar"],p=b.value,v=y.value,h=M.value;let g={$gantt:k,row:t};var{showProgress:h,showContent:m,contentMethod:x,barStyle:_,drag:w}=h,f=_xeUtils.default.isFunction(_),_=(_?f?_(g):_:{})||{},C=_.round,i=i[a]||{},u=0<(u?i.resizeHeight:0),i=(0,_util.getCellRestHeight)(i,e,s,d);let D=(0,_utils.getStringValue)(_xeUtils.default.get(t,p));e={},s={width:`${(h?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(t,v)))):0)||0}%`};f&&({bgColor:d,completedBgColor:p}=_,d&&(e.backgroundColor=d),p)&&(s.backgroundColor=p),x&&(D=(0,_utils.getStringValue)(x({row:t,title:D})));let E={source:sourceType,type:viewType,row:t,$rowIndex:l,rowIndex:r,_rowIndex:n};return(0,_vue.h)("div",{key:o?a:l,rowid:a,class:["vxe-gantt-view--chart-row",{"is--round":C,"is--drag":w,"col--rs-height":u}],style:{height:i+"px"},onContextmenu(e){k.handleTaskBarContextmenuEvent(e,E)}},[(0,_vue.h)("div",{class:c?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar",style:e,rowid:a,onClick(e){k.handleTaskBarClickEvent(e,g)},onDblclick(e){k.handleTaskBarDblclickEvent(e,g)},onMousedown(e){k.handleTaskBarMousedownEvent&&k.handleTaskBarMousedownEvent(e,g)}},c?k.callSlot(c,g):[h?(0,_vue.h)("div",{class:"vxe-gantt-view--chart-progress",style:s}):renderEmptyElement(k),m?(0,_vue.h)("div",{class:"vxe-gantt-view--chart-content"},D):renderEmptyElement(k)])])},_=(i,e)=>{let s=i.props.treeConfig,d=i.reactData.treeExpandedFlag,{fullAllDataRowIdData:c,treeExpandedMaps:p}=i.internalData;var t=i.getComputeMaps().computeTreeOpts,t=t.value;let v=t.transform,h=t.children||t.childrenField,g=r.scrollYLoad,m=[];return e.forEach((e,t)=>{var a=i?i.getRowid(e):"",r=c[a]||{};let l=t,n=-1,o=(r&&(l=r.index,n=r._index),m.push(x(i,e,a,l,t,n)),!1),u=[];!s||g||v||(u=e[h],o=!!d&&u&&0<u.length&&!!p[a]),o&&m.push(..._(i,u))}),m};return(0,_vue.onMounted)(()=>{var e=t.elemStore;e["main-chart-wrapper"]=l}),(0,_vue.onUnmounted)(()=>{var e=t.elemStore;e["main-chart-wrapper"]=null}),()=>{var e=a.internalData.xeTable,t=r.tableData;return(0,_vue.h)("div",{ref:l,class:"vxe-gantt-view--chart-wrapper"},e?_(e,t):[])}}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_core=require("@vxe-ui/core"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderEmptyElement=_core.VxeUI.renderEmptyElement,sourceType="gantt",viewType="chart";var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewChart",setup(){let T=(0,_vue.inject)("$xeGantt",{}),a=(0,_vue.inject)("$xeGanttView",{}),{reactData:r,internalData:t}=a,{computeProgressField:D,computeTitleField:y,computeTaskBarOpts:M}=T.getComputeMaps(),l=(0,_vue.ref)(),w=(e,t,a,r,l,n)=>{var o=e.props.treeConfig,u=e.reactData.resizeHeightFlag,i=e.internalData.fullAllDataRowIdData,{computeCellOpts:e,computeRowOpts:s,computeDefaultRowHeight:v}=e.getComputeMaps(),e=e.value,s=s.value,v=v.value,c=T.context.slots,c=c.taskBar||c["task-bar"],d=y.value,p=D.value,g=M.value;let h={$gantt:T,row:t};var{showProgress:g,showContent:m,contentMethod:w,barStyle:x,drag:_,showTooltip:f}=g,E=_xeUtils.default.isFunction(x),x=(x?E?x(h):x:{})||{},k=x.round,i=i[a]||{},u=0<(u?i.resizeHeight:0),i=(0,_util.getCellRestHeight)(i,e,s,v);let b=(0,_utils.getStringValue)(_xeUtils.default.get(t,d));e={},s={width:`${(g?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(t,p)))):0)||0}%`};E&&({bgColor:v,completedBgColor:d}=x,v&&(e.backgroundColor=v),d)&&(s.backgroundColor=d),w&&(b=(0,_utils.getStringValue)(w({row:t,title:b})));let C={source:sourceType,type:viewType,row:t,$rowIndex:l,rowIndex:r,_rowIndex:n,$gantt:T};p={onClick(e){T.handleTaskBarClickEvent(e,h)},onDblclick(e){T.handleTaskBarDblclickEvent(e,h)},onMousedown(e){T.handleTaskBarMousedownEvent&&T.handleTaskBarMousedownEvent(e,h)}};return f&&(p.onMouseover=e=>{var t=Object.assign({$event:e},C);T.triggerTaskBarTooltipEvent(e,t),T.dispatchEvent("task-bar-mouseenter",t,e)},p.onMouseleave=e=>{var t=Object.assign({$event:e},C);T.handleTaskBarTooltipLeaveEvent(e,t),T.dispatchEvent("task-bar-mouseleave",t,e)}),(0,_vue.h)("div",{key:o?a:l,rowid:a,class:["vxe-gantt-view--chart-row",{"is--round":k,"is--drag":_,"col--rs-height":u}],style:{height:i+"px"},onContextmenu(e){T.handleTaskBarContextmenuEvent(e,C)}},[(0,_vue.h)("div",Object.assign({class:c?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar",style:e,rowid:a},p),c?T.callSlot(c,h):[g?(0,_vue.h)("div",{class:"vxe-gantt-view--chart-progress",style:s}):renderEmptyElement(T),m?(0,_vue.h)("div",{class:"vxe-gantt-view--chart-content"},b):renderEmptyElement(T)])])},x=(i,e)=>{let s=i.props.treeConfig,v=i.reactData.treeExpandedFlag,{fullAllDataRowIdData:c,treeExpandedMaps:d}=i.internalData;var t=i.getComputeMaps().computeTreeOpts,t=t.value;let p=t.transform,g=t.children||t.childrenField,h=r.scrollYLoad,m=[];return e.forEach((e,t)=>{var a=i?i.getRowid(e):"",r=c[a]||{};let l=t,n=-1,o=(r&&(l=r.index,n=r._index),m.push(w(i,e,a,l,t,n)),!1),u=[];!s||h||p||(u=e[g],o=!!v&&u&&0<u.length&&!!d[a]),o&&m.push(...x(i,u))}),m};return(0,_vue.onMounted)(()=>{var e=t.elemStore;e["main-chart-wrapper"]=l}),(0,_vue.onUnmounted)(()=>{var e=t.elemStore;e["main-chart-wrapper"]=null}),()=>{var e=a.internalData.xeTable,t=r.tableData;return(0,_vue.h)("div",{ref:l,class:"vxe-gantt-view--chart-wrapper"},e?x(e,t):[])}}});

package/lib/gantt/src/gantt-header.js

@@ -86,15 +86,17 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             dateObj
           } = column;
           let label = `${column.title}`;
-          if ($rowIndex < headerGroups.length - 1) {
-            if (scaleItem.type === 'day') {
-              label = getI18n(`vxe.gantt.dayss.w${dateObj.e}`);
-            } else {
-              label = getI18n(`vxe.gantt.${!$rowIndex && headerGroups.length > 1 ? 'tFullFormat' : 'tSimpleFormat'}.${type}`, dateObj);
-            }
+          if (scaleItem.type === 'day') {
+            label = getI18n(`vxe.gantt.dayss.w${dateObj.e}`);
           } else {
-            if (isLast && scaleItem.type === 'week') {
+            if ($rowIndex) {
               label = getI18n(`vxe.gantt.tSimpleFormat.${type}`, dateObj);
+            } else {
+              if (isLast && scaleItem.type === 'week') {
+                label = getI18n(`vxe.gantt.tSimpleFormat.${type}`, dateObj);
+              } else {
+                label = getI18n(`vxe.gantt.tFullFormat.${type}`, dateObj);
+              }
             }
           }
           let cellVNs = label;

package/lib/gantt/src/gantt-header.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_core=require("@vxe-ui/core"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let getI18n=_core.VxeUI.getI18n,sourceType="gantt",viewType="header";var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewHeader",setup(){let f=(0,_vue.inject)("$xeGantt",{}),t=(0,_vue.inject)("$xeGanttView",{}),r=f.getComputeMaps().computeTaskViewOpts,{reactData:n,internalData:u}=t,o=(0,_vue.ref)(),i=(0,_vue.ref)(),v=(0,_vue.ref)(),s=(0,_vue.ref)();return(0,_vue.onMounted)(()=>{var e=u.elemStore,t="main-header-";e[t+"wrapper"]=o,e[t+"scroll"]=i,e[t+"table"]=v,e[t+"xSpace"]=s}),(0,_vue.onUnmounted)(()=>{var e=u.elemStore,t="main-header-";e[t+"wrapper"]=null,e[t+"scroll"]=null,e[t+"table"]=null,e[t+"xSpace"]=null}),()=>{let{headerGroups:g,viewCellWidth:l}=n,{todayDateMaps:a,visibleColumn:e}=u;let w=r.value.showNowLine;return(0,_vue.h)("div",{ref:o,class:"vxe-gantt-view--header-wrapper"},[(0,_vue.h)("div",{ref:i,class:"vxe-gantt-view--header-inner-wrapper",onScroll:t.triggerHeaderScrollEvent},[(0,_vue.h)("div",{ref:s,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:v,class:"vxe-gantt-view--header-table"},[(0,_vue.h)("colgroup",{},e.map((e,t)=>(0,_vue.h)("col",{key:t,style:{width:l+"px"}}))),(0,_vue.h)("thead",{},g.map(({scaleItem:v,columns:e},s)=>{let{type:p,titleFormat:d,titleMethod:c,headerCellStyle:_,slots:t}=v,h=t?t.title:null,m=s===g.length-1,x=m&&w?a[p]:null;return(0,_vue.h)("tr",{key:s},e.map((e,t)=>{var{field:l,childCount:a,dateObj:r}=e;let n=""+e.title,u=(s<g.length-1?n="day"===v.type?getI18n("vxe.gantt.dayss.w"+r.e):getI18n(`vxe.gantt.${!s&&1<g.length?"tFullFormat":"tSimpleFormat"}.`+p,r):m&&"week"===v.type&&(n=getI18n("vxe.gantt.tSimpleFormat."+p,r)),n),o={source:sourceType,type:viewType,column:e,scaleObj:v,title:n,dateObj:r,$rowIndex:s},i=(h?u=f.callSlot(h,o):c?u=""+c(o):d&&(u=_xeUtils.default.toDateString(r.date,d)),{});return _&&(i=_xeUtils.default.isFunction(_)?_(o):_),(0,_vue.h)("th",{key:t,class:["vxe-gantt-view--header-column",{"is--now":w&&x&&x===l}],colspan:a||null,title:h?null:n,style:i,onContextmenu(e){f.handleTaskHeaderContextmenuEvent(e,o)}},u)}))}))])])])}}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_core=require("@vxe-ui/core"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let getI18n=_core.VxeUI.getI18n,sourceType="gantt",viewType="header";var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewHeader",setup(){let f=(0,_vue.inject)("$xeGantt",{}),t=(0,_vue.inject)("$xeGanttView",{}),n=f.getComputeMaps().computeTaskViewOpts,{reactData:u,internalData:o}=t,i=(0,_vue.ref)(),v=(0,_vue.ref)(),s=(0,_vue.ref)(),d=(0,_vue.ref)();return(0,_vue.onMounted)(()=>{var e=o.elemStore,t="main-header-";e[t+"wrapper"]=i,e[t+"scroll"]=v,e[t+"table"]=s,e[t+"xSpace"]=d}),(0,_vue.onUnmounted)(()=>{var e=o.elemStore,t="main-header-";e[t+"wrapper"]=null,e[t+"scroll"]=null,e[t+"table"]=null,e[t+"xSpace"]=null}),()=>{let{headerGroups:l,viewCellWidth:a}=u,{todayDateMaps:r,visibleColumn:e}=o;let w=n.value.showNowLine;return(0,_vue.h)("div",{ref:i,class:"vxe-gantt-view--header-wrapper"},[(0,_vue.h)("div",{ref:v,class:"vxe-gantt-view--header-inner-wrapper",onScroll:t.triggerHeaderScrollEvent},[(0,_vue.h)("div",{ref:d,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:s,class:"vxe-gantt-view--header-table"},[(0,_vue.h)("colgroup",{},e.map((e,t)=>(0,_vue.h)("col",{key:t,style:{width:a+"px"}}))),(0,_vue.h)("thead",{},l.map(({scaleItem:v,columns:e},s)=>{let{type:d,titleFormat:p,titleMethod:c,headerCellStyle:_,slots:t}=v,x=t?t.title:null,h=s===l.length-1,m=h&&w?r[d]:null;return(0,_vue.h)("tr",{key:s},e.map((e,t)=>{var{field:l,childCount:a,dateObj:r}=e;let n=""+e.title,u=n="day"===v.type?getI18n("vxe.gantt.dayss.w"+r.e):s||h&&"week"===v.type?getI18n("vxe.gantt.tSimpleFormat."+d,r):getI18n("vxe.gantt.tFullFormat."+d,r),o={source:sourceType,type:viewType,column:e,scaleObj:v,title:n,dateObj:r,$rowIndex:s},i=(x?u=f.callSlot(x,o):c?u=""+c(o):p&&(u=_xeUtils.default.toDateString(r.date,p)),{});return _&&(i=_xeUtils.default.isFunction(_)?_(o):_),(0,_vue.h)("th",{key:t,class:["vxe-gantt-view--header-column",{"is--now":w&&m&&m===l}],colspan:a||null,title:x?null:n,style:i,onContextmenu(e){f.handleTaskHeaderContextmenuEvent(e,o)}},u)}))}))])])])}}});

package/lib/gantt/src/gantt-view.js

@@ -351,7 +351,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           if (minScale.level < 17) {
             handleData('quarter', colMaps, minCol);
           }
-          if (minScale.level < 14) {
+          if (minScale.level < 15) {
             handleData('month', colMaps, minCol);
           }
           if (minScale.level < 13) {
@@ -360,7 +360,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           if (minScale.level < 11) {
             handleData('day', colMaps, minCol);
           }
-          if (minScale.level < 12) {
+          if (minScale.level < 9) {
             handleData('date', colMaps, minCol);
           }
           if (minScale.level < 7) {
@@ -369,6 +369,9 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           if (minScale.level < 5) {
             handleData('minute', colMaps, minCol);
           }
+          if (minScale.level < 3) {
+            handleData('second', colMaps, minCol);
+          }
           fullCols.push(minCol);
         }
         taskScaleList.forEach(scaleItem => {