vxe-gantt 3.1.0 → 3.1.2

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

@@ -38,6 +38,7 @@ export default defineVxeComponent({
             const { todayDateMaps } = internalData;
             const taskViewOpts = $xeGantt.computeTaskViewOpts;
             const { showNowLine, viewStyle } = taskViewOpts;
+            const scaleUnit = $xeGantt.computeScaleUnit;
             const { scaleItem } = headerGroups[headerGroups.length - 1] || {};
             const { field, dateObj } = column;
             const { cellClassName, cellStyle } = viewStyle || {};
@@ -81,7 +82,18 @@ export default defineVxeComponent({
                     }
                 }));
             }
-            const ctParams = { source: sourceType, type: viewType, dateObj, row, column, $rowIndex, rowIndex, _rowIndex };
+            const ctParams = {
+                $gantt: $xeGantt,
+                source: sourceType,
+                type: viewType,
+                scaleType: scaleUnit,
+                dateObj,
+                row,
+                column,
+                $rowIndex,
+                rowIndex,
+                _rowIndex
+            };
             return h('td', {
                 key: $columnIndex,
                 class: [
@@ -129,6 +141,7 @@ export default defineVxeComponent({
             const treeOpts = $xeTable.computeTreeOpts;
             const { transform } = treeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
+            const scaleUnit = $xeGantt.computeScaleUnit;
             const taskViewOpts = $xeGantt.computeTaskViewOpts;
             const { viewStyle } = taskViewOpts;
             const { rowClassName, rowStyle } = viewStyle || {};
@@ -164,7 +177,16 @@ export default defineVxeComponent({
                     trOns.dragend = $xeTable.handleRowDragDragendEvent;
                     trOns.dragover = $xeTable.handleRowDragDragoverEvent;
                 }
-                const rowParams = { source: sourceType, type: viewType, row, rowIndex, $rowIndex, _rowIndex };
+                const rowParams = {
+                    $gantt: $xeGantt,
+                    source: sourceType,
+                    type: viewType,
+                    scaleType: scaleUnit,
+                    row,
+                    rowIndex,
+                    $rowIndex,
+                    _rowIndex
+                };
                 trVNs.push(h('tr', {
                     key: treeConfig ? rowid : $rowIndex,
                     class: [

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

@@ -42,8 +42,9 @@ export default defineVxeComponent({
             const titleField = $xeGantt.computeTitleField;
             const progressField = $xeGantt.computeProgressField;
             const taskBarOpts = $xeGantt.computeTaskBarOpts;
-            const barParams = { $gantt: $xeGantt, row };
-            const { showProgress, showContent, contentMethod, barStyle, drag } = taskBarOpts;
+            const scaleUnit = $xeGantt.computeScaleUnit;
+            const barParams = { $gantt: $xeGantt, row, scaleType: scaleUnit };
+            const { showProgress, showContent, contentMethod, barStyle, drag, showTooltip } = taskBarOpts;
             const isBarRowStyle = XEUtils.isFunction(barStyle);
             const barStyObj = (barStyle ? (isBarRowStyle ? barStyle(barParams) : barStyle) : {}) || {};
             const { round } = barStyObj;
@@ -67,9 +68,39 @@ export default defineVxeComponent({
                 }
             }
             if (contentMethod) {
-                title = getStringValue(contentMethod({ row, title }));
+                title = getStringValue(contentMethod({ row, title, scaleType: scaleUnit }));
+            }
+            const ctParams = {
+                $gantt: $xeGantt,
+                source: sourceType,
+                type: viewType,
+                scaleType: scaleUnit,
+                row,
+                $rowIndex,
+                rowIndex,
+                _rowIndex
+            };
+            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));
+                };
             }
-            const ctParams = { source: sourceType, type: viewType, row, $rowIndex, rowIndex, _rowIndex };
             return h('div', {
                 key: treeConfig ? rowid : $rowIndex,
                 attrs: {
@@ -95,19 +126,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,75 @@ 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) {
+                const customContnet = contentMethod(params);
+                if (!XEUtils.eqNull(customContnet)) {
+                    content = `${customContnet}`;
+                }
+            }
+            $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 +2269,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 +2306,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.2";
 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.2"}`;
 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-body.js

@@ -54,6 +54,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       var taskViewOpts = $xeGantt.computeTaskViewOpts;
       var showNowLine = taskViewOpts.showNowLine,
         viewStyle = taskViewOpts.viewStyle;
+      var scaleUnit = $xeGantt.computeScaleUnit;
       var _ref = headerGroups[headerGroups.length - 1] || {},
         scaleItem = _ref.scaleItem;
       var field = column.field,
@@ -106,8 +107,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         }));
       }
       var ctParams = {
+        $gantt: $xeGantt,
         source: sourceType,
         type: viewType,
+        scaleType: scaleUnit,
         dateObj: dateObj,
         row: row,
         column: column,
@@ -170,6 +173,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       var treeOpts = $xeTable.computeTreeOpts;
       var transform = treeOpts.transform;
       var childrenField = treeOpts.children || treeOpts.childrenField;
+      var scaleUnit = $xeGantt.computeScaleUnit;
       var taskViewOpts = $xeGantt.computeTaskViewOpts;
       var viewStyle = taskViewOpts.viewStyle;
       var _ref3 = viewStyle || {},
@@ -212,8 +216,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           trOns.dragover = $xeTable.handleRowDragDragoverEvent;
         }
         var rowParams = {
+          $gantt: $xeGantt,
           source: sourceType,
           type: viewType,
+          scaleType: scaleUnit,
           row: row,
           rowIndex: rowIndex,
           $rowIndex: $rowIndex,

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_util=require("./util"),_utils=require("../../ui/src/utils"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ganttChart=_interopRequireDefault(require("./gantt-chart"));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,n=Array(t);r<t;r++)n[r]=e[r];return n}var sourceType="gantt",viewType="body",_default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewBody",inject:{$xeGantt:{default:null},$xeGanttView:{default:null}},computed:Object.assign({},{}),methods:{renderColumn:function(e,t,r,n,o,a,l,i,s){var c,u=this.$xeGanttView,d=this.$xeGantt,p=u.reactData,w=t.resizeHeightFlag,y=t.fullAllDataRowIdData,f=t.visibleColumn,h=t.computeCellOpts,m=t.computeRowOpts,v=t.computeResizableOpts.isAllRowDrag,p=p.headerGroups,u=u.internalData.todayDateMaps,g=d.computeTaskViewOpts,x=g.showNowLine,p=(p[p.length-1]||{}).scaleItem,b=i.field,_=i.dateObj,g=g.viewStyle||{},R=g.cellClassName,g=g.cellStyle,u=x&&p?u[p.type]:null,p=y[n]||{},y=0<(w?p.resizeHeight:0),w=(0,_util.getCellRestHeight)(p,h,m,t.computeDefaultRowHeight),p=[],T=(v&&m.resizable&&(c={$table:t,$grid:null,$gantt:d,seq:-1,rowid:n,row:r,rowIndex:o,$rowIndex:a,_rowIndex:l,column:f[0],columnIndex:0,$columnIndex:0,_columnIndex:0,fixed:"",source:sourceType,type:viewType,isHidden:!1,isEdit:!1,level:-1,visibleData:[],data:[],items:[]},p.push(e("div",{class:"vxe-gantt-view-cell--row-resizable",on:{mousedown:function(e){return t.handleRowResizeMousedownEvent(e,c)},dblclick:function(e){return t.handleRowResizeDblclickEvent(e,c)}}}))),{source:sourceType,type:viewType,dateObj:_,row:r,column:i,$rowIndex:a,rowIndex:o,_rowIndex:l});return e("td",{key:s,class:["vxe-gantt-view--body-column",{"is--now":x&&u===b,"col--rs-height":y},(0,_utils.getClass)(R,T)],style:g?Object.assign({},_xeUtils.default.isFunction(g)?g(T):g,{height:"".concat(w,"px")}):{height:"".concat(w,"px")},on:{click:function(e){d.handleTaskCellClickEvent(e,{row:r,column:i})},dblclick:function(e){d.handleTaskCellDblclickEvent(e,{row:r,column:i})},contextmenu:function(e){d.handleTaskBodyContextmenuEvent(e,T)}}},p)},renderRows:function(s,c,e){var u=this,t=u.$xeGanttView.reactData,d=c.treeConfig,p=c.stripe,w=c.highlightHoverRow,y=c.editConfig,f=c.treeExpandedFlag,h=c.selectRadioRow,m=c.pendingRowFlag,v=c.isRowGroupStatus,g=c.fullAllDataRowIdData,x=c.treeExpandedMaps,b=c.pendingRowMaps,_=c.computeRadioOpts,R=c.computeCheckboxOpts,T=c.computeRowOpts,r=c.computeTreeOpts,C=r.transform,D=r.children||r.childrenField,r=u.$xeGantt.computeTaskViewOpts.viewStyle||{},I=r.rowClassName,S=r.rowStyle,$=t.tableColumn,k=t.scrollYLoad,A=[];return e.forEach(function(r,n){var o=c.getRowid(r),e=g[o]||{},t={},a=n,l=-1,e=(e&&(a=e.index,l=e._index),!1),i=(y&&(e=c.isInsertByRow(r)),(T.isHover||w)&&(t.mouseenter=function(e){c.triggerHoverEvent(e,{row:r,rowIndex:a})},t.mouseleave=function(){c.clearHoverRow()}),!T.drag||v||d&&!C||(t.dragstart=c.handleRowDragDragstartEvent,t.dragend=c.handleRowDragDragendEvent,t.dragover=c.handleRowDragDragoverEvent),{source:sourceType,type:viewType,row:r,rowIndex:a,$rowIndex:n,_rowIndex:l}),e=(A.push(s("tr",{key:d?o:n,class:["vxe-gantt-view--body-row",{"row--stripe":p&&(l+1)%2==0,"is--new":e,"row--radio":_.highlight&&c.eqRow(h,r),"row--checked":R.highlight&&c.isCheckedByCheckboxRow(r),"row--pending":!!m&&!!b[o]},(0,_utils.getClass)(I,i)],style:S?_xeUtils.default.isFunction(S)?S(i):S:void 0,attrs:{rowid:o},on:t},$.map(function(e,t){return u.renderColumn(s,c,r,o,a,n,l,e,t)}))),!1),i=[];!d||k||C||(i=r[D],e=!!f&&i&&0<i.length&&!!x[o]),e&&A.push.apply(A,_toConsumableArray(u.renderRows(s,c,i)))}),A},renderVN:function(r){var t=this.$xeGantt,e=this.$xeGanttView,n=e.reactData,o=e.internalData.xeTable,a=n.tableData,l=n.tableColumn,i=n.viewCellWidth;return r("div",{ref:"refElem",class:"vxe-gantt-view--body-wrapper"},[r("div",{ref:"refBodyScroll",class:"vxe-gantt-view--body-inner-wrapper",on:{scroll:e.triggerBodyScrollEvent,contextmenu:function(e){t.handleTaskBodyContextmenuEvent(e,{source:sourceType,type:viewType,rowIndex:-1,$rowIndex:-1,_rowIndex:-1})}}},[r("div",{ref:"refBodyXSpace",class:"vxe-body--x-space"}),r("div",{ref:"refBodyYSpace",class:"vxe-body--y-space"}),r("table",{ref:"refBodyTable",class:"vxe-gantt-view--body-table"},[r("colgroup",{},l.map(function(e,t){return r("col",{key:t,style:{width:"".concat(i,"px")}})})),r("tbody",{},o?this.renderRows(r,o,a):[])]),r(_ganttChart.default)])])}},mounted:function(){var e=this,t=e.$xeGanttView.internalData.elemStore,r="main-body-";t["".concat(r,"wrapper")]=e.$refs.refElem,t["".concat(r,"scroll")]=e.$refs.refBodyScroll,t["".concat(r,"table")]=e.$refs.refBodyTable,t["".concat(r,"xSpace")]=e.$refs.refBodyXSpace,t["".concat(r,"ySpace")]=e.$refs.refBodyYSpace},destroyed:function(){var e=this.$xeGanttView.internalData.elemStore,t="main-body-";e["".concat(t,"wrapper")]=null,e["".concat(t,"scroll")]=null,e["".concat(t,"table")]=null,e["".concat(t,"xSpace")]=null,e["".concat(t,"ySpace")]=null},render:function(e){return this.renderVN(e)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_util=require("./util"),_utils=require("../../ui/src/utils"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ganttChart=_interopRequireDefault(require("./gantt-chart"));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,n=Array(t);r<t;r++)n[r]=e[r];return n}var sourceType="gantt",viewType="body",_default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewBody",inject:{$xeGantt:{default:null},$xeGanttView:{default:null}},computed:Object.assign({},{}),methods:{renderColumn:function(e,t,r,n,o,a,l,i,c){var s,u=this.$xeGanttView,d=this.$xeGantt,p=u.reactData,w=t.resizeHeightFlag,y=t.fullAllDataRowIdData,f=t.visibleColumn,m=t.computeCellOpts,g=t.computeRowOpts,h=t.computeResizableOpts.isAllRowDrag,p=p.headerGroups,u=u.internalData.todayDateMaps,v=d.computeTaskViewOpts,x=v.showNowLine,b=d.computeScaleUnit,p=(p[p.length-1]||{}).scaleItem,_=i.field,R=i.dateObj,v=v.viewStyle||{},T=v.cellClassName,v=v.cellStyle,u=x&&p?u[p.type]:null,p=y[n]||{},y=0<(w?p.resizeHeight:0),w=(0,_util.getCellRestHeight)(p,m,g,t.computeDefaultRowHeight),p=[],C=(h&&g.resizable&&(s={$table:t,$grid:null,$gantt:d,seq:-1,rowid:n,row:r,rowIndex:o,$rowIndex:a,_rowIndex:l,column:f[0],columnIndex:0,$columnIndex:0,_columnIndex:0,fixed:"",source:sourceType,type:viewType,isHidden:!1,isEdit:!1,level:-1,visibleData:[],data:[],items:[]},p.push(e("div",{class:"vxe-gantt-view-cell--row-resizable",on:{mousedown:function(e){return t.handleRowResizeMousedownEvent(e,s)},dblclick:function(e){return t.handleRowResizeDblclickEvent(e,s)}}}))),{$gantt:d,source:sourceType,type:viewType,scaleType:b,dateObj:R,row:r,column:i,$rowIndex:a,rowIndex:o,_rowIndex:l});return e("td",{key:c,class:["vxe-gantt-view--body-column",{"is--now":x&&u===_,"col--rs-height":y},(0,_utils.getClass)(T,C)],style:v?Object.assign({},_xeUtils.default.isFunction(v)?v(C):v,{height:"".concat(w,"px")}):{height:"".concat(w,"px")},on:{click:function(e){d.handleTaskCellClickEvent(e,{row:r,column:i})},dblclick:function(e){d.handleTaskCellDblclickEvent(e,{row:r,column:i})},contextmenu:function(e){d.handleTaskBodyContextmenuEvent(e,C)}}},p)},renderRows:function(c,s,e){var u=this,t=u.$xeGanttView,d=u.$xeGantt,t=t.reactData,p=s.treeConfig,w=s.stripe,y=s.highlightHoverRow,f=s.editConfig,m=s.treeExpandedFlag,g=s.selectRadioRow,h=s.pendingRowFlag,v=s.isRowGroupStatus,x=s.fullAllDataRowIdData,b=s.treeExpandedMaps,_=s.pendingRowMaps,R=s.computeRadioOpts,T=s.computeCheckboxOpts,C=s.computeRowOpts,r=s.computeTreeOpts,D=r.transform,I=r.children||r.childrenField,S=d.computeScaleUnit,r=d.computeTaskViewOpts.viewStyle||{},$=r.rowClassName,k=r.rowStyle,A=t.tableColumn,E=t.scrollYLoad,O=[];return e.forEach(function(r,n){var o=s.getRowid(r),e=x[o]||{},t={},a=n,l=-1,e=(e&&(a=e.index,l=e._index),!1),i=(f&&(e=s.isInsertByRow(r)),(C.isHover||y)&&(t.mouseenter=function(e){s.triggerHoverEvent(e,{row:r,rowIndex:a})},t.mouseleave=function(){s.clearHoverRow()}),!C.drag||v||p&&!D||(t.dragstart=s.handleRowDragDragstartEvent,t.dragend=s.handleRowDragDragendEvent,t.dragover=s.handleRowDragDragoverEvent),{$gantt:d,source:sourceType,type:viewType,scaleType:S,row:r,rowIndex:a,$rowIndex:n,_rowIndex:l}),e=(O.push(c("tr",{key:p?o:n,class:["vxe-gantt-view--body-row",{"row--stripe":w&&(l+1)%2==0,"is--new":e,"row--radio":R.highlight&&s.eqRow(g,r),"row--checked":T.highlight&&s.isCheckedByCheckboxRow(r),"row--pending":!!h&&!!_[o]},(0,_utils.getClass)($,i)],style:k?_xeUtils.default.isFunction(k)?k(i):k:void 0,attrs:{rowid:o},on:t},A.map(function(e,t){return u.renderColumn(c,s,r,o,a,n,l,e,t)}))),!1),i=[];!p||E||D||(i=r[I],e=!!m&&i&&0<i.length&&!!b[o]),e&&O.push.apply(O,_toConsumableArray(u.renderRows(c,s,i)))}),O},renderVN:function(r){var t=this.$xeGantt,e=this.$xeGanttView,n=e.reactData,o=e.internalData.xeTable,a=n.tableData,l=n.tableColumn,i=n.viewCellWidth;return r("div",{ref:"refElem",class:"vxe-gantt-view--body-wrapper"},[r("div",{ref:"refBodyScroll",class:"vxe-gantt-view--body-inner-wrapper",on:{scroll:e.triggerBodyScrollEvent,contextmenu:function(e){t.handleTaskBodyContextmenuEvent(e,{source:sourceType,type:viewType,rowIndex:-1,$rowIndex:-1,_rowIndex:-1})}}},[r("div",{ref:"refBodyXSpace",class:"vxe-body--x-space"}),r("div",{ref:"refBodyYSpace",class:"vxe-body--y-space"}),r("table",{ref:"refBodyTable",class:"vxe-gantt-view--body-table"},[r("colgroup",{},l.map(function(e,t){return r("col",{key:t,style:{width:"".concat(i,"px")}})})),r("tbody",{},o?this.renderRows(r,o,a):[])]),r(_ganttChart.default)])])}},mounted:function(){var e=this,t=e.$xeGanttView.internalData.elemStore,r="main-body-";t["".concat(r,"wrapper")]=e.$refs.refElem,t["".concat(r,"scroll")]=e.$refs.refBodyScroll,t["".concat(r,"table")]=e.$refs.refBodyTable,t["".concat(r,"xSpace")]=e.$refs.refBodyXSpace,t["".concat(r,"ySpace")]=e.$refs.refBodyYSpace},destroyed:function(){var e=this.$xeGanttView.internalData.elemStore,t="main-body-";e["".concat(t,"wrapper")]=null,e["".concat(t,"scroll")]=null,e["".concat(t,"table")]=null,e["".concat(t,"xSpace")]=null,e["".concat(t,"ySpace")]=null},render:function(e){return this.renderVN(e)}});

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

@@ -55,15 +55,18 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       var titleField = $xeGantt.computeTitleField;
       var progressField = $xeGantt.computeProgressField;
       var taskBarOpts = $xeGantt.computeTaskBarOpts;
+      var scaleUnit = $xeGantt.computeScaleUnit;
       var barParams = {
         $gantt: $xeGantt,
-        row: row
+        row: row,
+        scaleType: scaleUnit
       };
       var showProgress = taskBarOpts.showProgress,
         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;
@@ -90,17 +93,45 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       if (contentMethod) {
         title = (0, _utils.getStringValue)(contentMethod({
           row: row,
-          title: title
+          title: title,
+          scaleType: scaleUnit
         }));
       }
       var ctParams = {
+        $gantt: $xeGantt,
         source: sourceType,
         type: viewType,
+        scaleType: scaleUnit,
         row: row,
         $rowIndex: $rowIndex,
         rowIndex: rowIndex,
         _rowIndex: _rowIndex
       };
+      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 +156,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