vxe-gantt 3.1.0 → 3.1.1

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

@@ -43,7 +43,7 @@ export default defineVxeComponent({
             const progressField = $xeGantt.computeProgressField;
             const taskBarOpts = $xeGantt.computeTaskBarOpts;
             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;
@@ -69,7 +69,28 @@ 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 = {
+                click(evnt) {
+                    $xeGantt.handleTaskBarClickEvent(evnt, barParams);
+                },
+                dblclick(evnt) {
+                    $xeGantt.handleTaskBarDblclickEvent(evnt, barParams);
+                },
+                mousedown(evnt) {
+                    if ($xeGantt.handleTaskBarMousedownEvent) {
+                        $xeGantt.handleTaskBarMousedownEvent(evnt, barParams);
+                    }
+                }
+            };
+            if (showTooltip) {
+                ons.mouseover = (evnt) => {
+                    $xeGantt.triggerTaskBarTooltipEvent(evnt, Object.assign({ $event: evnt }, ctParams));
+                };
+                ons.mouseleave = (evnt) => {
+                    $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, Object.assign({ $event: evnt }, ctParams));
+                };
+            }
             return h('div', {
                 key: treeConfig ? rowid : $rowIndex,
                 attrs: {
@@ -95,19 +116,7 @@ export default defineVxeComponent({
                     attrs: {
                         rowid
                     },
-                    on: {
-                        click(evnt) {
-                            $xeGantt.handleTaskBarClickEvent(evnt, barParams);
-                        },
-                        dblclick(evnt) {
-                            $xeGantt.handleTaskBarDblclickEvent(evnt, barParams);
-                        },
-                        mousedown(evnt) {
-                            if ($xeGantt.handleTaskBarMousedownEvent) {
-                                $xeGantt.handleTaskBarMousedownEvent(evnt, barParams);
-                            }
-                        }
-                    }
+                    on: ons
                 }, taskBarSlot
                     ? $xeGantt.callSlot(taskBarSlot, barParams, h)
                     : [

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

@@ -66,18 +66,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

@@ -180,7 +180,7 @@ function handleColumnHeader($xeGanttView) {
             if (minScale.level < 17) {
                 handleData('quarter', colMaps, minCol);
             }
-            if (minScale.level < 14) {
+            if (minScale.level < 15) {
                 handleData('month', colMaps, minCol);
             }
             if (minScale.level < 13) {
@@ -189,7 +189,7 @@ function handleColumnHeader($xeGanttView) {
             if (minScale.level < 11) {
                 handleData('day', colMaps, minCol);
             }
-            if (minScale.level < 12) {
+            if (minScale.level < 9) {
                 handleData('date', colMaps, minCol);
             }
             if (minScale.level < 7) {
@@ -198,6 +198,9 @@ function handleColumnHeader($xeGanttView) {
             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 { defineVxeComponent } from '../../ui/src/comp';
 import { VxeUI } from '@vxe-ui/core';
 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 { warnLog, errLog } from '../../ui/src/log';
@@ -61,6 +61,7 @@ function createInternalData() {
     return {
         uFoot: false,
         resizeTableWidth: 0
+        // barTipTimeout: undefined
     };
 }
 export default {
@@ -68,7 +69,7 @@ export default {
     mixins: [
         globalMixins.sizeMixin
     ],
-    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
         } }),
@@ -100,7 +101,13 @@ export default {
             },
             showLeftView: true,
             showRightView: true,
-            taskScaleList: []
+            taskScaleList: [],
+            barTipStore: {
+                row: null,
+                content: '',
+                visible: false,
+                params: null
+            }
         };
         const internalData = createInternalData();
         return {
@@ -179,6 +186,11 @@ export default {
             const props = $xeGantt;
             return Object.assign({}, getConfig().gantt.taskSplitConfig, props.taskSplitConfig);
         },
+        computeTaskBarTooltipOpts() {
+            const $xeGantt = this;
+            const props = $xeGantt;
+            return Object.assign({}, getConfig().gantt.taskBarTooltipConfig, props.taskBarTooltipConfig);
+        },
         computeScaleUnit() {
             const $xeGantt = this;
             const minScale = $xeGantt.computeMinScale;
@@ -196,12 +208,19 @@ export default {
             const { taskScaleList } = reactData;
             return taskScaleList.find(item => item.type === 'week');
         },
-        computeTaskScaleConfs() {
+        computeTaskViewScales() {
             const $xeGantt = this;
             const taskViewOpts = $xeGantt.computeTaskViewOpts;
             const { scales } = taskViewOpts;
             return scales;
         },
+        /**
+         * 已废弃，保留兼容
+         * @deprecated
+         */
+        computeTaskScaleConfs() {
+            return this.computeTaskViewScales;
+        },
         computeTitleField() {
             const $xeGantt = this;
             const taskOpts = $xeGantt.computeTaskOpts;
@@ -449,7 +468,7 @@ export default {
             const $xeGantt = this;
             $xeGantt.initProxy();
         },
-        computeTaskScaleConfs() {
+        computeTaskViewScales() {
             const $xeGantt = this;
             $xeGantt.handleTaskScaleConfig();
             $xeGantt.refreshTaskView();
@@ -462,7 +481,7 @@ export default {
         handleTaskScaleConfig() {
             const $xeGantt = this;
             const reactData = $xeGantt.reactData;
-            const taskScaleConfs = $xeGantt.computeTaskScaleConfs;
+            const taskScaleConfs = $xeGantt.computeTaskViewScales;
             const taskViewScaleOpts = $xeGantt.computeTaskViewScaleOpts;
             const scaleConfs = [];
             if (taskScaleConfs) {
@@ -1564,6 +1583,27 @@ export default {
             reactData.showRightView = false;
             return $xeGantt.$nextTick();
         },
+        /**
+           * 关闭 bar tooltip
+           */
+        closeTaskBarTooltip() {
+            const $xeGantt = this;
+            const reactData = $xeGantt.reactData;
+            const { barTipStore } = reactData;
+            const $tooltip = $xeGantt.$refs.refTooltip;
+            if (barTipStore.visible) {
+                Object.assign(barTipStore, {
+                    row: null,
+                    content: null,
+                    visible: false,
+                    params: {}
+                });
+                if ($tooltip && $tooltip.close) {
+                    $tooltip.close();
+                }
+            }
+            return $xeGantt.$nextTick();
+        },
         callSlot(slotFunc, params, h) {
             const $xeGantt = this;
             const slots = $xeGantt.$scopedSlots;
@@ -1687,6 +1727,72 @@ export default {
             const $xeGantt = this;
             $xeGantt.dispatchEvent('task-bar-dblclick', params, evnt);
         },
+        triggerTaskBarTooltipEvent(evnt, params) {
+            const $xeGantt = this;
+            const reactData = $xeGantt.reactData;
+            const { barTipStore } = reactData;
+            const taskBarTooltipOpts = $xeGantt.computeTaskBarTooltipOpts;
+            const titleField = $xeGantt.computeTitleField;
+            const { contentMethod } = taskBarTooltipOpts;
+            const { row } = params;
+            let content = formatText(XEUtils.get(row, titleField));
+            if (contentMethod) {
+                content = formatText(contentMethod(params));
+            }
+            $xeGantt.handleTargetEnterEvent(barTipStore.row !== row);
+            const tipContent = formatText(content);
+            Object.assign(barTipStore, {
+                row,
+                visible: true,
+                content: tipContent,
+                params
+            });
+            $xeGantt.$nextTick(() => {
+                const $tooltip = $xeGantt.$refs.refTooltip;
+                if ($tooltip) {
+                    if ($tooltip.openByEvent) {
+                        $tooltip.openByEvent(evnt, evnt.currentTarget, tipContent);
+                    }
+                    else if ($tooltip.open) {
+                        $tooltip.open(evnt.currentTarget, tipContent);
+                    }
+                }
+            });
+        },
+        handleTargetEnterEvent(isClear) {
+            const $xeGantt = this;
+            const internalData = $xeGantt.internalData;
+            const $tooltip = $xeGantt.$refs.refTooltip;
+            clearTimeout(internalData.barTipTimeout);
+            if (isClear) {
+                $xeGantt.closeTaskBarTooltip();
+            }
+            else {
+                if ($tooltip && $tooltip.setActived) {
+                    $tooltip.setActived(true);
+                }
+            }
+        },
+        handleTaskBarTooltipLeaveEvent() {
+            const $xeGantt = this;
+            const internalData = $xeGantt.internalData;
+            const taskBarTooltipOpts = $xeGantt.computeTaskBarTooltipOpts;
+            let $tooltip = $xeGantt.$refs.refTooltip;
+            if ($tooltip && $tooltip.setActived) {
+                $tooltip.setActived(false);
+            }
+            if (taskBarTooltipOpts.enterable) {
+                internalData.barTipTimeout = setTimeout(() => {
+                    $tooltip = $xeGantt.$refs.refTooltip;
+                    if ($tooltip && $tooltip.isActived && !$tooltip.isActived()) {
+                        $xeGantt.closeTaskBarTooltip();
+                    }
+                }, taskBarTooltipOpts.leaveDelay);
+            }
+            else {
+                $xeGantt.closeTaskBarTooltip();
+            }
+        },
         handleTaskHeaderContextmenuEvent(evnt, params) {
             const $xeGantt = this;
             const $xeTable = $xeGantt.$refs.refTable;
@@ -2160,12 +2266,17 @@ export default {
             return childVNs;
         },
         renderLayout(h) {
+            const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
             const $xeGantt = this;
+            const reactData = $xeGantt.reactData;
             const slots = $xeGantt.$scopedSlots;
+            const { barTipStore } = reactData;
             const currLayoutConf = $xeGantt.computeCurrLayoutConf;
             const { headKeys, bodyKeys, footKeys } = currLayoutConf;
+            const taskBarTooltipOpts = $xeGantt.computeTaskBarTooltipOpts;
             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'
@@ -2192,7 +2303,41 @@ export default {
                 }, $xeGantt.renderChildLayout(h, footKeys)),
                 h('div', {
                     ref: 'refPopupContainerElem'
-                })
+                }),
+                h('div', {}, [
+                    /**
+                      * 任务条提示
+                      */
+                    h(VxeUITooltipComponent, {
+                        key: 'gtp',
+                        ref: 'refTooltip',
+                        props: {
+                            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
+                        },
+                        scopedSlots: taskBarTooltipSlot
+                            ? {
+                                content: () => {
+                                    const { row, content: tooltipContent } = barTipStore;
+                                    if (row) {
+                                        return h('div', {}, taskBarTooltipSlot(Object.assign({ tooltipContent, $gantt: $xeGantt }, barTipStore.params)));
+                                    }
+                                    return renderEmptyElement($xeGantt);
+                                }
+                            }
+                            : {}
+                    })
+                ])
             ];
         },
         renderVN(h) {

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 = "3.1.0";
+VxeUI.ganttVersion = "3.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${"3.1.0"}`;
+const version = `gantt v${"3.1.1"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/es/ui/src/utils.js

@@ -5,6 +5,9 @@ const { getConfig } = VxeUI;
 export function isEnableConf(conf) {
     return conf && conf.enabled !== false;
 }
+export function isEmptyValue(cellValue) {
+    return cellValue === null || cellValue === undefined || cellValue === '';
+}
 export function nextZIndex() {
     return DomZIndex.getNext();
 }
@@ -30,6 +33,9 @@ export function getFuncText(content, args) {
     }
     return '';
 }
+export function formatText(value, placeholder) {
+    return '' + (isEmptyValue(value) ? (placeholder ? VxeUI.getConfig().emptyCell : '') : value);
+}
 /**
  * 判断值为：'' | null | undefined 时都属于空值
  */

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

@@ -63,7 +63,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         showContent = taskBarOpts.showContent,
         contentMethod = taskBarOpts.contentMethod,
         barStyle = taskBarOpts.barStyle,
-        drag = taskBarOpts.drag;
+        drag = taskBarOpts.drag,
+        showTooltip = taskBarOpts.showTooltip;
       var isBarRowStyle = _xeUtils.default.isFunction(barStyle);
       var barStyObj = (barStyle ? isBarRowStyle ? barStyle(barParams) : barStyle : {}) || {};
       var round = barStyObj.round;
@@ -99,8 +100,34 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         row: row,
         $rowIndex: $rowIndex,
         rowIndex: rowIndex,
-        _rowIndex: _rowIndex
+        _rowIndex: _rowIndex,
+        $gantt: $xeGantt
       };
+      var ons = {
+        click: function click(evnt) {
+          $xeGantt.handleTaskBarClickEvent(evnt, barParams);
+        },
+        dblclick: function dblclick(evnt) {
+          $xeGantt.handleTaskBarDblclickEvent(evnt, barParams);
+        },
+        mousedown: function mousedown(evnt) {
+          if ($xeGantt.handleTaskBarMousedownEvent) {
+            $xeGantt.handleTaskBarMousedownEvent(evnt, barParams);
+          }
+        }
+      };
+      if (showTooltip) {
+        ons.mouseover = function (evnt) {
+          $xeGantt.triggerTaskBarTooltipEvent(evnt, Object.assign({
+            $event: evnt
+          }, ctParams));
+        };
+        ons.mouseleave = function (evnt) {
+          $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, Object.assign({
+            $event: evnt
+          }, ctParams));
+        };
+      }
       return h('div', {
         key: treeConfig ? rowid : $rowIndex,
         attrs: {
@@ -125,19 +152,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         attrs: {
           rowid: rowid
         },
-        on: {
-          click: function click(evnt) {
-            $xeGantt.handleTaskBarClickEvent(evnt, barParams);
-          },
-          dblclick: function dblclick(evnt) {
-            $xeGantt.handleTaskBarDblclickEvent(evnt, barParams);
-          },
-          mousedown: function mousedown(evnt) {
-            if ($xeGantt.handleTaskBarMousedownEvent) {
-              $xeGantt.handleTaskBarMousedownEvent(evnt, barParams);
-            }
-          }
-        }
+        on: ons
       }, taskBarSlot ? $xeGantt.callSlot(taskBarSlot, barParams, h) : [showProgress ? h('div', {
         class: 'vxe-gantt-view--chart-progress',
         style: vpStyle

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _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}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,a=Array(t);r<t;r++)a[r]=e[r];return a}var renderEmptyElement=_core.VxeUI.renderEmptyElement,sourceType="gantt",viewType="chart",_default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewChart",inject:{$xeGantt:{default:null},$xeGanttView:{default:null}},props:{},data:function(){return{}},computed:Object.assign({},{}),methods:{renderTaskBar:function(e,t,r,a,n,o,i){var l=this.$xeGantt,u=t.treeConfig,s=t.resizeHeightFlag,c=t.fullAllDataRowIdData,d=t.computeCellOpts,p=t.computeRowOpts,t=t.computeDefaultRowHeight,f=l.$scopedSlots,f=f.taskBar||f["task-bar"],h=l.computeTitleField,m=l.computeProgressField,y=l.computeTaskBarOpts,g={$gantt:l,row:r},w=y.showProgress,v=y.showContent,x=y.contentMethod,_=y.barStyle,y=y.drag,b=_xeUtils.default.isFunction(_),_=(_?b?_(g):_:{})||{},T=_.round,c=c[a]||{},s=0<(s?c.resizeHeight:0),c=(0,_util.getCellRestHeight)(c,d,p,t),d=(0,_utils.getStringValue)(_xeUtils.default.get(r,h)),p=w?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(r,m)))):0,t={},h={width:"".concat(p||0,"%")},k=(b&&(m=_.bgColor,p=_.completedBgColor,m&&(t.backgroundColor=m),p)&&(h.backgroundColor=p),x&&(d=(0,_utils.getStringValue)(x({row:r,title:d}))),{source:sourceType,type:viewType,row:r,$rowIndex:o,rowIndex:n,_rowIndex:i});return e("div",{key:u?a:o,attrs:{rowid:a},class:["vxe-gantt-view--chart-row",{"is--round":T,"is--drag":y,"col--rs-height":s}],style:{height:"".concat(c,"px")},on:{contextmenu:function(e){l.handleTaskBarContextmenuEvent(e,k)}}},[e("div",{class:f?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar",style:t,attrs:{rowid:a},on:{click:function(e){l.handleTaskBarClickEvent(e,g)},dblclick:function(e){l.handleTaskBarDblclickEvent(e,g)},mousedown:function(e){l.handleTaskBarMousedownEvent&&l.handleTaskBarMousedownEvent(e,g)}}},f?l.callSlot(f,g,e):[w?e("div",{class:"vxe-gantt-view--chart-progress",style:h}):renderEmptyElement(l),v?e("div",{class:"vxe-gantt-view--chart-content"},d):renderEmptyElement(l)])])},renderRows:function(i,l,e){var u=this,t=u.$xeGanttView.reactData,s=l.treeConfig,c=l.treeExpandedFlag,d=l.fullAllDataRowIdData,p=l.treeExpandedMaps,r=l.computeTreeOpts,f=r.transform,h=r.children||r.childrenField,m=t.scrollYLoad,y=[];return e.forEach(function(e,t){var r=l?l.getRowid(e):"",a=d[r]||{},n=t,o=-1,a=(a&&(n=a.index,o=a._index),y.push(u.renderTaskBar(i,l,e,r,n,t,o)),!1),n=[];!s||m||f||(n=e[h],a=!!c&&n&&0<n.length&&!!p[r]),a&&y.push.apply(y,_toConsumableArray(u.renderRows(i,l,n)))}),y},renderVN:function(e){var t=this.$xeGanttView,r=t.reactData,t=t.internalData.xeTable,r=r.tableData;return e("div",{ref:"refElem",class:"vxe-gantt-view--chart-wrapper"},t?this.renderRows(e,t,r):[])}},mounted:function(){this.$xeGanttView.internalData.elemStore["".concat("main-chart-","wrapper")]=this.$refs.refElem},destroyed:function(){this.$xeGanttView.internalData.elemStore["".concat("main-chart-","wrapper")]=null},render:function(e){return this.renderVN(e)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _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}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,a=Array(t);r<t;r++)a[r]=e[r];return a}var renderEmptyElement=_core.VxeUI.renderEmptyElement,sourceType="gantt",viewType="chart",_default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewChart",inject:{$xeGantt:{default:null},$xeGanttView:{default:null}},props:{},data:function(){return{}},computed:Object.assign({},{}),methods:{renderTaskBar:function(e,t,r,a,n,o,i){var l=this.$xeGantt,s=t.treeConfig,u=t.resizeHeightFlag,c=t.fullAllDataRowIdData,d=t.computeCellOpts,p=t.computeRowOpts,t=t.computeDefaultRowHeight,f=l.$scopedSlots,f=f.taskBar||f["task-bar"],h=l.computeTitleField,m=l.computeProgressField,g=l.computeTaskBarOpts,y={$gantt:l,row:r},v=g.showProgress,w=g.showContent,x=g.contentMethod,_=g.barStyle,b=g.drag,g=g.showTooltip,T=_xeUtils.default.isFunction(_),_=(_?T?_(y):_:{})||{},k=_.round,c=c[a]||{},u=0<(u?c.resizeHeight:0),c=(0,_util.getCellRestHeight)(c,d,p,t),d=(0,_utils.getStringValue)(_xeUtils.default.get(r,h)),p=v?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(r,m)))):0,t={},h={width:"".concat(p||0,"%")},E=(T&&(m=_.bgColor,p=_.completedBgColor,m&&(t.backgroundColor=m),p)&&(h.backgroundColor=p),x&&(d=(0,_utils.getStringValue)(x({row:r,title:d}))),{source:sourceType,type:viewType,row:r,$rowIndex:o,rowIndex:n,_rowIndex:i,$gantt:l}),T={click:function(e){l.handleTaskBarClickEvent(e,y)},dblclick:function(e){l.handleTaskBarDblclickEvent(e,y)},mousedown:function(e){l.handleTaskBarMousedownEvent&&l.handleTaskBarMousedownEvent(e,y)}};return g&&(T.mouseover=function(e){l.triggerTaskBarTooltipEvent(e,Object.assign({$event:e},E))},T.mouseleave=function(e){l.handleTaskBarTooltipLeaveEvent(e,Object.assign({$event:e},E))}),e("div",{key:s?a:o,attrs:{rowid:a},class:["vxe-gantt-view--chart-row",{"is--round":k,"is--drag":b,"col--rs-height":u}],style:{height:"".concat(c,"px")},on:{contextmenu:function(e){l.handleTaskBarContextmenuEvent(e,E)}}},[e("div",{class:f?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar",style:t,attrs:{rowid:a},on:T},f?l.callSlot(f,y,e):[v?e("div",{class:"vxe-gantt-view--chart-progress",style:h}):renderEmptyElement(l),w?e("div",{class:"vxe-gantt-view--chart-content"},d):renderEmptyElement(l)])])},renderRows:function(i,l,e){var s=this,t=s.$xeGanttView.reactData,u=l.treeConfig,c=l.treeExpandedFlag,d=l.fullAllDataRowIdData,p=l.treeExpandedMaps,r=l.computeTreeOpts,f=r.transform,h=r.children||r.childrenField,m=t.scrollYLoad,g=[];return e.forEach(function(e,t){var r=l?l.getRowid(e):"",a=d[r]||{},n=t,o=-1,a=(a&&(n=a.index,o=a._index),g.push(s.renderTaskBar(i,l,e,r,n,t,o)),!1),n=[];!u||m||f||(n=e[h],a=!!c&&n&&0<n.length&&!!p[r]),a&&g.push.apply(g,_toConsumableArray(s.renderRows(i,l,n)))}),g},renderVN:function(e){var t=this.$xeGanttView,r=t.reactData,t=t.internalData.xeTable,r=r.tableData;return e("div",{ref:"refElem",class:"vxe-gantt-view--chart-wrapper"},t?this.renderRows(e,t,r):[])}},mounted:function(){this.$xeGanttView.internalData.elemStore["".concat("main-chart-","wrapper")]=this.$refs.refElem},destroyed:function(){this.$xeGanttView.internalData.elemStore["".concat("main-chart-","wrapper")]=null},render:function(e){return this.renderVN(e)}});

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

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

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _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}}var getI18n=_core.VxeUI.getI18n,sourceType="gantt",viewType="header",_default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewHeader",inject:{$xeGantt:{default:null},$xeGanttView:{default:null}},computed:Object.assign({},{}),methods:{renderVN:function(h){var w=this.$xeGantt,e=this.$xeGanttView,t=e.reactData,a=e.internalData,g=t.headerGroups,n=t.viewCellWidth,r=a.todayDateMaps,t=a.visibleColumn,y=w.computeTaskViewOpts.showNowLine;return h("div",{ref:"refElem",class:"vxe-gantt-view--header-wrapper"},[h("div",{ref:"refHeaderScroll",class:"vxe-gantt-view--header-inner-wrapper",on:{scroll:e.triggerHeaderScrollEvent}},[h("div",{ref:"refHeaderXSpace",class:"vxe-body--x-space"}),h("table",{ref:"refHeaderTable",class:"vxe-gantt-view--header-table"},[h("colgroup",{},t.map(function(e,t){return h("col",{key:t,style:{width:"".concat(n,"px")}})})),h("thead",{},g.map(function(e,i){var u=e.scaleItem,e=e.columns,s=u.type,d=u.titleFormat,p=u.titleMethod,f=u.headerCellStyle,t=u.slots,x=t?t.title:null,m=i===g.length-1,v=m&&y?r[s]:null;return h("tr",{key:i},e.map(function(e,t){var a=e.field,n=e.childCount,r=e.dateObj,l="".concat(e.title),o=(i<g.length-1?l="day"===u.type?getI18n("vxe.gantt.dayss.w".concat(r.e)):getI18n("vxe.gantt.".concat(!i&&1<g.length?"tFullFormat":"tSimpleFormat",".").concat(s),r):m&&"week"===u.type&&(l=getI18n("vxe.gantt.tSimpleFormat.".concat(s),r)),l),c={source:sourceType,type:viewType,column:e,scaleObj:u,title:l,dateObj:r,$rowIndex:i},e=(x?o=w.callSlot(x,c,h):p?o="".concat(p(c)):d&&(o=_xeUtils.default.toDateString(r.date,d)),{});return f&&(e=_xeUtils.default.isFunction(f)?f(c):f),h("th",{key:t,class:["vxe-gantt-view--header-column",{"is--now":y&&v&&v===a}],attrs:{colspan:n||null,title:x?null:l},style:e,on:{contextmenu:function(e){w.handleTaskHeaderContextmenuEvent(e,c)}}},o)}))}))])])])}},mounted:function(){var e=this,t=e.$xeGanttView.internalData.elemStore,a="main-header-";t["".concat(a,"wrapper")]=e.$refs.refElem,t["".concat(a,"scroll")]=e.$refs.refHeaderScroll,t["".concat(a,"table")]=e.$refs.refHeaderTable,t["".concat(a,"xSpace")]=e.$refs.refHeaderXSpace},destroyed:function(){var e=this.$xeGanttView.internalData.elemStore,t="main-header-";e["".concat(t,"wrapper")]=null,e["".concat(t,"scroll")]=null,e["".concat(t,"table")]=null,e["".concat(t,"xSpace")]=null},render:function(e){return this.renderVN(e)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _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}}var getI18n=_core.VxeUI.getI18n,sourceType="gantt",viewType="header",_default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewHeader",inject:{$xeGantt:{default:null},$xeGanttView:{default:null}},computed:Object.assign({},{}),methods:{renderVN:function(h){var w=this.$xeGantt,e=this.$xeGanttView,t=e.reactData,a=e.internalData,r=t.headerGroups,n=t.viewCellWidth,l=a.todayDateMaps,t=a.visibleColumn,y=w.computeTaskViewOpts.showNowLine;return h("div",{ref:"refElem",class:"vxe-gantt-view--header-wrapper"},[h("div",{ref:"refHeaderScroll",class:"vxe-gantt-view--header-inner-wrapper",on:{scroll:e.triggerHeaderScrollEvent}},[h("div",{ref:"refHeaderXSpace",class:"vxe-body--x-space"}),h("table",{ref:"refHeaderTable",class:"vxe-gantt-view--header-table"},[h("colgroup",{},t.map(function(e,t){return h("col",{key:t,style:{width:"".concat(n,"px")}})})),h("thead",{},r.map(function(e,i){var u=e.scaleItem,e=e.columns,s=u.type,d=u.titleFormat,p=u.titleMethod,f=u.headerCellStyle,t=u.slots,x=t?t.title:null,v=i===r.length-1,m=v&&y?l[s]:null;return h("tr",{key:i},e.map(function(e,t){var a=e.field,r=e.childCount,n=e.dateObj,l="".concat(e.title),o=l="day"===u.type?getI18n("vxe.gantt.dayss.w".concat(n.e)):i||v&&"week"===u.type?getI18n("vxe.gantt.tSimpleFormat.".concat(s),n):getI18n("vxe.gantt.tFullFormat.".concat(s),n),c={source:sourceType,type:viewType,column:e,scaleObj:u,title:l,dateObj:n,$rowIndex:i},e=(x?o=w.callSlot(x,c,h):p?o="".concat(p(c)):d&&(o=_xeUtils.default.toDateString(n.date,d)),{});return f&&(e=_xeUtils.default.isFunction(f)?f(c):f),h("th",{key:t,class:["vxe-gantt-view--header-column",{"is--now":y&&m&&m===a}],attrs:{colspan:r||null,title:x?null:l},style:e,on:{contextmenu:function(e){w.handleTaskHeaderContextmenuEvent(e,c)}}},o)}))}))])])])}},mounted:function(){var e=this,t=e.$xeGanttView.internalData.elemStore,a="main-header-";t["".concat(a,"wrapper")]=e.$refs.refElem,t["".concat(a,"scroll")]=e.$refs.refHeaderScroll,t["".concat(a,"table")]=e.$refs.refHeaderTable,t["".concat(a,"xSpace")]=e.$refs.refHeaderXSpace},destroyed:function(){var e=this.$xeGanttView.internalData.elemStore,t="main-header-";e["".concat(t,"wrapper")]=null,e["".concat(t,"scroll")]=null,e["".concat(t,"table")]=null,e["".concat(t,"xSpace")]=null},render:function(e){return this.renderVN(e)}});

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

@@ -221,7 +221,7 @@ function handleColumnHeader($xeGanttView) {
       if (minScale.level < 17) {
         handleData('quarter', colMaps, minCol);
       }
-      if (minScale.level < 14) {
+      if (minScale.level < 15) {
         handleData('month', colMaps, minCol);
       }
       if (minScale.level < 13) {
@@ -230,7 +230,7 @@ function handleColumnHeader($xeGanttView) {
       if (minScale.level < 11) {
         handleData('day', colMaps, minCol);
       }
-      if (minScale.level < 12) {
+      if (minScale.level < 9) {
         handleData('date', colMaps, minCol);
       }
       if (minScale.level < 7) {
@@ -239,6 +239,9 @@ function handleColumnHeader($xeGanttView) {
       if (minScale.level < 5) {
         handleData('minute', colMaps, minCol);
       }
+      if (minScale.level < 3) {
+        handleData('second', colMaps, minCol);
+      }
       fullCols.push(minCol);
     }
     taskScaleList.forEach(function (scaleItem) {