vxe-gantt 4.1.1 → 4.1.3

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

@@ -11,7 +11,7 @@ export default defineVxeComponent({
     setup() {
         const $xeGantt = inject('$xeGantt', {});
         const $xeGanttView = inject('$xeGanttView', {});
-        const { computeTaskViewOpts } = $xeGantt.getComputeMaps();
+        const { computeTaskViewOpts, computeScaleUnit } = $xeGantt.getComputeMaps();
         const { reactData, internalData } = $xeGanttView;
         const refElem = ref();
         const refBodyScroll = ref();
@@ -33,6 +33,7 @@ export default defineVxeComponent({
             const { todayDateMaps } = internalData;
             const taskViewOpts = computeTaskViewOpts.value;
             const { showNowLine, viewStyle } = taskViewOpts;
+            const scaleUnit = computeScaleUnit.value;
             const { scaleItem } = headerGroups[headerGroups.length - 1] || {};
             const { field, dateObj } = column;
             const { cellClassName, cellStyle } = viewStyle || {};
@@ -74,7 +75,18 @@ export default defineVxeComponent({
                     onDblclick: (evnt) => $xeTable.handleRowResizeDblclickEvent(evnt, cellParams)
                 }));
             }
-            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: [
@@ -117,6 +129,7 @@ export default defineVxeComponent({
             const treeOpts = computeTreeOpts.value;
             const { transform } = treeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
+            const scaleUnit = computeScaleUnit.value;
             const taskViewOpts = computeTaskViewOpts.value;
             const { viewStyle } = taskViewOpts;
             const { rowClassName, rowStyle } = viewStyle || {};
@@ -152,7 +165,16 @@ export default defineVxeComponent({
                     trOns.onDragend = $xeTable.handleRowDragDragendEvent;
                     trOns.onDragover = $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', Object.assign({ key: treeConfig ? rowid : $rowIndex, class: [
                         'vxe-gantt-view--body-row',
                         {

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

@@ -13,7 +13,7 @@ export default defineVxeComponent({
         const $xeGantt = inject('$xeGantt', {});
         const $xeGanttView = inject('$xeGanttView', {});
         const { reactData, internalData } = $xeGanttView;
-        const { computeProgressField, computeTitleField, computeTaskBarOpts } = $xeGantt.getComputeMaps();
+        const { computeProgressField, computeTitleField, computeTaskBarOpts, computeScaleUnit } = $xeGantt.getComputeMaps();
         const refElem = ref();
         const renderTaskBar = ($xeTable, row, rowid, rowIndex, $rowIndex, _rowIndex) => {
             const tableProps = $xeTable.props;
@@ -31,7 +31,8 @@ export default defineVxeComponent({
             const titleField = computeTitleField.value;
             const progressField = computeProgressField.value;
             const taskBarOpts = computeTaskBarOpts.value;
-            const barParams = { $gantt: $xeGantt, row };
+            const scaleUnit = computeScaleUnit.value;
+            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) : {}) || {};
@@ -56,9 +57,18 @@ export default defineVxeComponent({
                 }
             }
             if (contentMethod) {
-                title = getStringValue(contentMethod({ row, title }));
+                title = getStringValue(contentMethod({ row, title, scaleType: scaleUnit }));
             }
-            const ctParams = { source: sourceType, type: viewType, row, $rowIndex, rowIndex, _rowIndex, $gantt: $xeGantt };
+            const ctParams = {
+                $gantt: $xeGantt,
+                source: sourceType,
+                type: viewType,
+                scaleType: scaleUnit,
+                row,
+                $rowIndex,
+                rowIndex,
+                _rowIndex
+            };
             const ons = {
                 onClick(evnt) {
                     $xeGantt.handleTaskBarClickEvent(evnt, barParams);

package/es/gantt/src/gantt.js

@@ -379,6 +379,7 @@ export default defineVxeComponent({
             refForm,
             refToolbar,
             refPager,
+            refGanttView,
             refGanttContainerElem,
             refClassifyWrapperElem,
             refPopupContainerElem
@@ -423,28 +424,24 @@ export default defineVxeComponent({
             const taskScaleConfs = computeTaskViewScales.value;
             const taskViewScaleOpts = computeTaskViewScaleOpts.value;
             const scaleConfs = [];
-            if (taskScaleConfs) {
-                const keyMaps = {};
-                taskScaleConfs.forEach(conf => {
-                    const sConf = !conf || XEUtils.isString(conf) ? { type: conf } : conf;
-                    const { type } = sConf;
-                    if (!type || !viewTypeLevelMaps[type]) {
-                        errLog('vxe.error.errProp', [`type=${type}`, XEUtils.keys(viewTypeLevelMaps).join(',')]);
-                        return;
-                    }
-                    if (keyMaps[type]) {
-                        errLog('vxe.error.repeatProp', ['type', type]);
-                        return;
-                    }
-                    keyMaps[type] = true;
-                    scaleConfs.push(Object.assign({}, type ? taskViewScaleOpts[type] || {} : {}, sConf, {
-                        level: getViewTypeLevel(type)
-                    }));
-                });
-            }
-            if (!scaleConfs.length) {
-                scaleConfs.push({ type: 'month', level: viewTypeLevelMaps.month }, { type: 'date', level: viewTypeLevelMaps.date });
-            }
+            const keyMaps = {};
+            const scaleList = (taskScaleConfs && taskScaleConfs.length ? taskScaleConfs : ['month', 'date']);
+            scaleList.forEach(conf => {
+                const sConf = !conf || XEUtils.isString(conf) ? { type: conf } : conf;
+                const { type } = sConf;
+                if (!type || !viewTypeLevelMaps[type]) {
+                    errLog('vxe.error.errProp', [`type=${type}`, XEUtils.keys(viewTypeLevelMaps).join(',')]);
+                    return;
+                }
+                if (keyMaps[type]) {
+                    errLog('vxe.error.repeatProp', ['type', type]);
+                    return;
+                }
+                keyMaps[type] = true;
+                scaleConfs.push(Object.assign({}, type ? taskViewScaleOpts[type] || {} : {}, sConf, {
+                    level: getViewTypeLevel(type)
+                }));
+            });
             reactData.taskScaleList = XEUtils.orderBy(scaleConfs, { field: 'level', order: 'desc' });
         };
         const initToolbar = () => {
@@ -1645,7 +1642,10 @@ export default defineVxeComponent({
                 const { row } = params;
                 let content = formatText(XEUtils.get(row, titleField));
                 if (contentMethod) {
-                    content = formatText(contentMethod(params));
+                    const customContnet = contentMethod(params);
+                    if (!XEUtils.eqNull(customContnet)) {
+                        content = `${customContnet}`;
+                    }
                 }
                 handleTargetEnterEvent(barTipStore.row !== row);
                 const tipContent = formatText(content);

package/es/ui/index.js

@@ -1,7 +1,9 @@
 import { VxeUI } from '@vxe-ui/core';
 import { errLog } from './src/log';
 const { setConfig, setIcon, checkVersion } = VxeUI;
-VxeUI.ganttVersion = "4.1.1";
+VxeUI.ganttVersion = "4.1.3";
+const ymdFormat = 'yyyy-MM-dd';
+const ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({
     gantt: {
         // size: null,
@@ -44,8 +46,33 @@ setConfig({
             enterable: true
         },
         taskViewScaleConfig: {
+            year: {
+                valueFormat: ymdFormat
+            },
+            quarter: {
+                valueFormat: ymdFormat
+            },
+            month: {
+                valueFormat: ymdFormat
+            },
             week: {
-                startDay: 1
+                startDay: 1,
+                valueFormat: ymdFormat
+            },
+            day: {
+                valueFormat: ymdFormat
+            },
+            date: {
+                valueFormat: ymdFormat
+            },
+            hour: {
+                valueFormat: ymdhmsFormat
+            },
+            minute: {
+                valueFormat: ymdhmsFormat
+            },
+            second: {
+                valueFormat: ymdhmsFormat
             }
         },
         taskViewConfig: {

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

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

@@ -19,7 +19,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     const $xeGantt = (0, _vue.inject)('$xeGantt', {});
     const $xeGanttView = (0, _vue.inject)('$xeGanttView', {});
     const {
-      computeTaskViewOpts
+      computeTaskViewOpts,
+      computeScaleUnit
     } = $xeGantt.getComputeMaps();
     const {
       reactData,
@@ -64,6 +65,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         showNowLine,
         viewStyle
       } = taskViewOpts;
+      const scaleUnit = computeScaleUnit.value;
       const {
         scaleItem
       } = headerGroups[headerGroups.length - 1] || {};
@@ -114,8 +116,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         }));
       }
       const ctParams = {
+        $gantt: $xeGantt,
         source: sourceType,
         type: viewType,
+        scaleType: scaleUnit,
         dateObj,
         row,
         column,
@@ -186,6 +190,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         transform
       } = treeOpts;
       const childrenField = treeOpts.children || treeOpts.childrenField;
+      const scaleUnit = computeScaleUnit.value;
       const taskViewOpts = computeTaskViewOpts.value;
       const {
         viewStyle
@@ -233,8 +238,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           trOns.onDragover = $xeTable.handleRowDragDragoverEvent;
         }
         const rowParams = {
+          $gantt: $xeGantt,
           source: sourceType,
           type: viewType,
+          scaleType: scaleUnit,
           row,
           rowIndex,
           $rowIndex,

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_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}}let sourceType="gantt",viewType="body";var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewBody",setup(){let D=(0,_vue.inject)("$xeGantt",{}),o=(0,_vue.inject)("$xeGanttView",{}),S=D.getComputeMaps().computeTaskViewOpts,{reactData:q,internalData:R}=o,r=(0,_vue.ref)(),n=(0,_vue.ref)(),i=(0,_vue.ref)(),u=(0,_vue.ref)(),s=(0,_vue.ref)(),$=(l,a,e,o,r,n,t,i)=>{var u=l.reactData.resizeHeightFlag,{fullAllDataRowIdData:s,visibleColumn:d}=l.internalData,{computeCellOpts:v,computeRowOpts:c,computeDefaultRowHeight:p,computeResizableOpts:w}=l.getComputeMaps(),v=v.value,c=c.value,p=p.value,w=w.value.isAllRowDrag,g=q.headerGroups,h=R.todayDateMaps,{showNowLine:x,viewStyle:_}=S.value,g=(g[g.length-1]||{}).scaleItem,{field:y,dateObj:m}=t,{cellClassName:_,cellStyle:b}=_||{},h=x&&g?h[g.type]:null,g=s[e]||{},s=0<(u?g.resizeHeight:0),u=(0,_util.getCellRestHeight)(g,v,c,p),g=[];if(w&&c.resizable){let t={$table:l,$grid:null,$gantt:D,seq:-1,rowid:e,row:a,rowIndex:o,$rowIndex:r,_rowIndex:n,column:d[0],columnIndex:0,$columnIndex:0,_columnIndex:0,fixed:"",source:sourceType,type:viewType,isHidden:!1,isEdit:!1,level:-1,visibleData:[],data:[],items:[]};g.push((0,_vue.h)("div",{class:"vxe-gantt-view-cell--row-resizable",onMousedown:e=>l.handleRowResizeMousedownEvent(e,t),onDblclick:e=>l.handleRowResizeDblclickEvent(e,t)}))}let f={source:sourceType,type:viewType,dateObj:m,row:a,column:t,$rowIndex:r,rowIndex:o,_rowIndex:n};return(0,_vue.h)("td",{key:i,class:["vxe-gantt-view--body-column",{"is--now":x&&h===y,"col--rs-height":s},(0,_utils.getClass)(_,f)],style:b?Object.assign({},_xeUtils.default.isFunction(b)?b(f):b,{height:u+"px"}):{height:u+"px"},onClick(e){D.handleTaskCellClickEvent(e,{row:a,column:t})},onDblclick(e){D.handleTaskCellDblclickEvent(e,{row:a,column:t})},onContextmenu(e){D.handleTaskBodyContextmenuEvent(e,f)}},g)},H=(d,e)=>{let{treeConfig:v,stripe:c,highlightHoverRow:p,editConfig:w}=d.props,{treeExpandedFlag:g,selectRadioRow:h,pendingRowFlag:x,isRowGroupStatus:_}=d.reactData,{fullAllDataRowIdData:y,treeExpandedMaps:m,pendingRowMaps:b}=d.internalData;var{computeRadioOpts:t,computeCheckboxOpts:l,computeTreeOpts:a,computeRowOpts:o}=d.getComputeMaps();let f=t.value,D=l.value,R=o.value;t=a.value;let C=t.transform,I=t.children||t.childrenField;l=S.value.viewStyle;let{rowClassName:k,rowStyle:T}=l||{},{tableColumn:E,scrollYLoad:M}=q,O=[];return e.forEach((l,a)=>{let o=d.getRowid(l);var e=y[o]||{},t={};let r=a,n=-1,i=(e&&(r=e.index,n=e._index),!1);w&&(i=d.isInsertByRow(l)),(R.isHover||p)&&(t.onMouseenter=e=>{d.triggerHoverEvent(e,{row:l,rowIndex:r})},t.onMouseleave=()=>{d.clearHoverRow()}),!R.drag||_||v&&!C||(t.onDragstart=d.handleRowDragDragstartEvent,t.onDragend=d.handleRowDragDragendEvent,t.onDragover=d.handleRowDragDragoverEvent);e={source:sourceType,type:viewType,row:l,rowIndex:r,$rowIndex:a,_rowIndex:n};O.push((0,_vue.h)("tr",Object.assign({key:v?o:a,class:["vxe-gantt-view--body-row",{"row--stripe":c&&(n+1)%2==0,"is--new":i,"row--radio":f.highlight&&d.eqRow(h,l),"row--checked":D.highlight&&d.isCheckedByCheckboxRow(l),"row--pending":!!x&&!!b[o]},(0,_utils.getClass)(k,e)],rowid:o,style:T?_xeUtils.default.isFunction(T)?T(e):T:void 0},t),E.map((e,t)=>$(d,l,o,r,a,n,e,t))));let u=!1,s=[];!v||M||C||(s=l[I],u=!!g&&s&&0<s.length&&!!m[o]),u&&O.push(...H(d,s))}),O};return(0,_vue.onMounted)(()=>{var e=R.elemStore,t="main-body-";e[t+"wrapper"]=r,e[t+"scroll"]=n,e[t+"table"]=i,e[t+"xSpace"]=u,e[t+"ySpace"]=s}),(0,_vue.onUnmounted)(()=>{var e=R.elemStore,t="main-body-";e[t+"wrapper"]=null,e[t+"scroll"]=null,e[t+"table"]=null,e[t+"xSpace"]=null,e[t+"ySpace"]=null}),()=>{var e=o.internalData.xeTable;let{tableData:t,tableColumn:l,viewCellWidth:a}=q;return(0,_vue.h)("div",{ref:r,class:"vxe-gantt-view--body-wrapper"},[(0,_vue.h)("div",{ref:n,class:"vxe-gantt-view--body-inner-wrapper",onScroll:o.triggerBodyScrollEvent,onContextmenu(e){D.handleTaskBodyContextmenuEvent(e,{source:sourceType,type:viewType,rowIndex:-1,$rowIndex:-1,_rowIndex:-1})}},[(0,_vue.h)("div",{ref:u,class:"vxe-body--x-space"}),(0,_vue.h)("div",{ref:s,class:"vxe-body--y-space"}),(0,_vue.h)("table",{ref:i,class:"vxe-gantt-view--body-table"},[(0,_vue.h)("colgroup",{},l.map((e,t)=>(0,_vue.h)("col",{key:t,style:{width:a+"px"}}))),(0,_vue.h)("tbody",{},e?H(e,t):[])]),(0,_vue.h)(_ganttChart.default)])])}}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_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}}let sourceType="gantt",viewType="body";var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewBody",setup(){let $=(0,_vue.inject)("$xeGantt",{}),o=(0,_vue.inject)("$xeGanttView",{}),{computeTaskViewOpts:q,computeScaleUnit:H}=$.getComputeMaps(),{reactData:j,internalData:R}=o,r=(0,_vue.ref)(),n=(0,_vue.ref)(),i=(0,_vue.ref)(),u=(0,_vue.ref)(),s=(0,_vue.ref)(),z=(l,a,e,o,r,n,t,i)=>{var u=l.reactData.resizeHeightFlag,{fullAllDataRowIdData:s,visibleColumn:d}=l.internalData,{computeCellOpts:v,computeRowOpts:c,computeDefaultRowHeight:p,computeResizableOpts:w}=l.getComputeMaps(),v=v.value,c=c.value,p=p.value,w=w.value.isAllRowDrag,g=j.headerGroups,h=R.todayDateMaps,{showNowLine:x,viewStyle:y}=q.value,_=H.value,g=(g[g.length-1]||{}).scaleItem,{field:m,dateObj:b}=t,{cellClassName:y,cellStyle:f}=y||{},h=x&&g?h[g.type]:null,g=s[e]||{},s=0<(u?g.resizeHeight:0),u=(0,_util.getCellRestHeight)(g,v,c,p),g=[];if(w&&c.resizable){let t={$table:l,$grid:null,$gantt:$,seq:-1,rowid:e,row:a,rowIndex:o,$rowIndex:r,_rowIndex:n,column:d[0],columnIndex:0,$columnIndex:0,_columnIndex:0,fixed:"",source:sourceType,type:viewType,isHidden:!1,isEdit:!1,level:-1,visibleData:[],data:[],items:[]};g.push((0,_vue.h)("div",{class:"vxe-gantt-view-cell--row-resizable",onMousedown:e=>l.handleRowResizeMousedownEvent(e,t),onDblclick:e=>l.handleRowResizeDblclickEvent(e,t)}))}let D={$gantt:$,source:sourceType,type:viewType,scaleType:_,dateObj:b,row:a,column:t,$rowIndex:r,rowIndex:o,_rowIndex:n};return(0,_vue.h)("td",{key:i,class:["vxe-gantt-view--body-column",{"is--now":x&&h===m,"col--rs-height":s},(0,_utils.getClass)(y,D)],style:f?Object.assign({},_xeUtils.default.isFunction(f)?f(D):f,{height:u+"px"}):{height:u+"px"},onClick(e){$.handleTaskCellClickEvent(e,{row:a,column:t})},onDblclick(e){$.handleTaskCellDblclickEvent(e,{row:a,column:t})},onContextmenu(e){$.handleTaskBodyContextmenuEvent(e,D)}},g)},B=(d,e)=>{let{treeConfig:v,stripe:c,highlightHoverRow:p,editConfig:w}=d.props,{treeExpandedFlag:g,selectRadioRow:h,pendingRowFlag:x,isRowGroupStatus:y}=d.reactData,{fullAllDataRowIdData:_,treeExpandedMaps:m,pendingRowMaps:b}=d.internalData;var{computeRadioOpts:t,computeCheckboxOpts:l,computeTreeOpts:a,computeRowOpts:o}=d.getComputeMaps();let f=t.value,D=l.value,R=o.value;t=a.value;let C=t.transform,I=t.children||t.childrenField,T=H.value;l=q.value.viewStyle;let{rowClassName:k,rowStyle:E}=l||{},{tableColumn:S,scrollYLoad:M}=j,O=[];return e.forEach((l,a)=>{let o=d.getRowid(l);var e=_[o]||{},t={};let r=a,n=-1,i=(e&&(r=e.index,n=e._index),!1);w&&(i=d.isInsertByRow(l)),(R.isHover||p)&&(t.onMouseenter=e=>{d.triggerHoverEvent(e,{row:l,rowIndex:r})},t.onMouseleave=()=>{d.clearHoverRow()}),!R.drag||y||v&&!C||(t.onDragstart=d.handleRowDragDragstartEvent,t.onDragend=d.handleRowDragDragendEvent,t.onDragover=d.handleRowDragDragoverEvent);e={$gantt:$,source:sourceType,type:viewType,scaleType:T,row:l,rowIndex:r,$rowIndex:a,_rowIndex:n};O.push((0,_vue.h)("tr",Object.assign({key:v?o:a,class:["vxe-gantt-view--body-row",{"row--stripe":c&&(n+1)%2==0,"is--new":i,"row--radio":f.highlight&&d.eqRow(h,l),"row--checked":D.highlight&&d.isCheckedByCheckboxRow(l),"row--pending":!!x&&!!b[o]},(0,_utils.getClass)(k,e)],rowid:o,style:E?_xeUtils.default.isFunction(E)?E(e):E:void 0},t),S.map((e,t)=>z(d,l,o,r,a,n,e,t))));let u=!1,s=[];!v||M||C||(s=l[I],u=!!g&&s&&0<s.length&&!!m[o]),u&&O.push(...B(d,s))}),O};return(0,_vue.onMounted)(()=>{var e=R.elemStore,t="main-body-";e[t+"wrapper"]=r,e[t+"scroll"]=n,e[t+"table"]=i,e[t+"xSpace"]=u,e[t+"ySpace"]=s}),(0,_vue.onUnmounted)(()=>{var e=R.elemStore,t="main-body-";e[t+"wrapper"]=null,e[t+"scroll"]=null,e[t+"table"]=null,e[t+"xSpace"]=null,e[t+"ySpace"]=null}),()=>{var e=o.internalData.xeTable;let{tableData:t,tableColumn:l,viewCellWidth:a}=j;return(0,_vue.h)("div",{ref:r,class:"vxe-gantt-view--body-wrapper"},[(0,_vue.h)("div",{ref:n,class:"vxe-gantt-view--body-inner-wrapper",onScroll:o.triggerBodyScrollEvent,onContextmenu(e){$.handleTaskBodyContextmenuEvent(e,{source:sourceType,type:viewType,rowIndex:-1,$rowIndex:-1,_rowIndex:-1})}},[(0,_vue.h)("div",{ref:u,class:"vxe-body--x-space"}),(0,_vue.h)("div",{ref:s,class:"vxe-body--y-space"}),(0,_vue.h)("table",{ref:i,class:"vxe-gantt-view--body-table"},[(0,_vue.h)("colgroup",{},l.map((e,t)=>(0,_vue.h)("col",{key:t,style:{width:a+"px"}}))),(0,_vue.h)("tbody",{},e?B(e,t):[])]),(0,_vue.h)(_ganttChart.default)])])}}});

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

@@ -28,7 +28,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     const {
       computeProgressField,
       computeTitleField,
-      computeTaskBarOpts
+      computeTaskBarOpts,
+      computeScaleUnit
     } = $xeGantt.getComputeMaps();
     const refElem = (0, _vue.ref)();
     const renderTaskBar = ($xeTable, row, rowid, rowIndex, $rowIndex, _rowIndex) => {
@@ -57,9 +58,11 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       const titleField = computeTitleField.value;
       const progressField = computeProgressField.value;
       const taskBarOpts = computeTaskBarOpts.value;
+      const scaleUnit = computeScaleUnit.value;
       const barParams = {
         $gantt: $xeGantt,
-        row
+        row,
+        scaleType: scaleUnit
       };
       const {
         showProgress,
@@ -99,17 +102,19 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       if (contentMethod) {
         title = (0, _utils.getStringValue)(contentMethod({
           row,
-          title
+          title,
+          scaleType: scaleUnit
         }));
       }
       const ctParams = {
+        $gantt: $xeGantt,
         source: sourceType,
         type: viewType,
+        scaleType: scaleUnit,
         row,
         $rowIndex,
         rowIndex,
-        _rowIndex,
-        $gantt: $xeGantt
+        _rowIndex
       };
       const ons = {
         onClick(evnt) {

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 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):[])}}});
+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 C=(0,_vue.inject)("$xeGantt",{}),a=(0,_vue.inject)("$xeGanttView",{}),{reactData:r,internalData:t}=a,{computeProgressField:D,computeTitleField:M,computeTaskBarOpts:B,computeScaleUnit:q}=C.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:c}=e.getComputeMaps(),e=e.value,s=s.value,c=c.value,v=C.context.slots,v=v.taskBar||v["task-bar"],d=M.value,p=D.value,g=B.value,h=q.value;let m={$gantt:C,row:t,scaleType:h};var{showProgress:g,showContent:w,contentMethod:x,barStyle:_,drag:f,showTooltip:T}=g,E=_xeUtils.default.isFunction(_),_=(_?E?_(m):_:{})||{},k=_.round,i=i[a]||{},u=0<(u?i.resizeHeight:0),i=(0,_util.getCellRestHeight)(i,e,s,c);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:c,completedBgColor:d}=_,c&&(e.backgroundColor=c),d)&&(s.backgroundColor=d),x&&(b=(0,_utils.getStringValue)(x({row:t,title:b,scaleType:h})));let y={$gantt:C,source:sourceType,type:viewType,scaleType:h,row:t,$rowIndex:l,rowIndex:r,_rowIndex:n};p={onClick(e){C.handleTaskBarClickEvent(e,m)},onDblclick(e){C.handleTaskBarDblclickEvent(e,m)},onMousedown(e){C.handleTaskBarMousedownEvent&&C.handleTaskBarMousedownEvent(e,m)}};return T&&(p.onMouseover=e=>{var t=Object.assign({$event:e},y);C.triggerTaskBarTooltipEvent(e,t),C.dispatchEvent("task-bar-mouseenter",t,e)},p.onMouseleave=e=>{var t=Object.assign({$event:e},y);C.handleTaskBarTooltipLeaveEvent(e,t),C.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":f,"col--rs-height":u}],style:{height:i+"px"},onContextmenu(e){C.handleTaskBarContextmenuEvent(e,y)}},[(0,_vue.h)("div",Object.assign({class:v?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar",style:e,rowid:a},p),v?C.callSlot(v,m):[g?(0,_vue.h)("div",{class:"vxe-gantt-view--chart-progress",style:s}):renderEmptyElement(C),w?(0,_vue.h)("div",{class:"vxe-gantt-view--chart-content"},b):renderEmptyElement(C)])])},x=(i,e)=>{let s=i.props.treeConfig,c=i.reactData.treeExpandedFlag,{fullAllDataRowIdData:v,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=v[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=!!c&&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.js

@@ -466,6 +466,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       refForm,
       refToolbar,
       refPager,
+      refGanttView,
       refGanttContainerElem,
       refClassifyWrapperElem,
       refPopupContainerElem
@@ -510,38 +511,28 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       const taskScaleConfs = computeTaskViewScales.value;
       const taskViewScaleOpts = computeTaskViewScaleOpts.value;
       const scaleConfs = [];
-      if (taskScaleConfs) {
-        const keyMaps = {};
-        taskScaleConfs.forEach(conf => {
-          const sConf = !conf || _xeUtils.default.isString(conf) ? {
-            type: conf
-          } : conf;
-          const {
-            type
-          } = sConf;
-          if (!type || !viewTypeLevelMaps[type]) {
-            (0, _log.errLog)('vxe.error.errProp', [`type=${type}`, _xeUtils.default.keys(viewTypeLevelMaps).join(',')]);
-            return;
-          }
-          if (keyMaps[type]) {
-            (0, _log.errLog)('vxe.error.repeatProp', ['type', type]);
-            return;
-          }
-          keyMaps[type] = true;
-          scaleConfs.push(Object.assign({}, type ? taskViewScaleOpts[type] || {} : {}, sConf, {
-            level: getViewTypeLevel(type)
-          }));
-        });
-      }
-      if (!scaleConfs.length) {
-        scaleConfs.push({
-          type: 'month',
-          level: viewTypeLevelMaps.month
-        }, {
-          type: 'date',
-          level: viewTypeLevelMaps.date
-        });
-      }
+      const keyMaps = {};
+      const scaleList = taskScaleConfs && taskScaleConfs.length ? taskScaleConfs : ['month', 'date'];
+      scaleList.forEach(conf => {
+        const sConf = !conf || _xeUtils.default.isString(conf) ? {
+          type: conf
+        } : conf;
+        const {
+          type
+        } = sConf;
+        if (!type || !viewTypeLevelMaps[type]) {
+          (0, _log.errLog)('vxe.error.errProp', [`type=${type}`, _xeUtils.default.keys(viewTypeLevelMaps).join(',')]);
+          return;
+        }
+        if (keyMaps[type]) {
+          (0, _log.errLog)('vxe.error.repeatProp', ['type', type]);
+          return;
+        }
+        keyMaps[type] = true;
+        scaleConfs.push(Object.assign({}, type ? taskViewScaleOpts[type] || {} : {}, sConf, {
+          level: getViewTypeLevel(type)
+        }));
+      });
       reactData.taskScaleList = _xeUtils.default.orderBy(scaleConfs, {
         field: 'level',
         order: 'desc'
@@ -1956,7 +1947,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         } = params;
         let content = (0, _utils.formatText)(_xeUtils.default.get(row, titleField));
         if (contentMethod) {
-          content = (0, _utils.formatText)(contentMethod(params));
+          const customContnet = contentMethod(params);
+          if (!_xeUtils.default.eqNull(customContnet)) {
+            content = `${customContnet}`;
+          }
         }
         handleTargetEnterEvent(barTipStore.row !== row);
         const tipContent = (0, _utils.formatText)(content);