vxe-gantt 3.1.1 → 3.1.3

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,7 +42,8 @@ export default defineVxeComponent({
             const titleField = $xeGantt.computeTitleField;
             const progressField = $xeGantt.computeProgressField;
             const taskBarOpts = $xeGantt.computeTaskBarOpts;
-            const barParams = { $gantt: $xeGantt, row };
+            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) : {}) || {};
@@ -67,9 +68,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 = {
                 click(evnt) {
                     $xeGantt.handleTaskBarClickEvent(evnt, barParams);

package/es/gantt/src/gantt.js

@@ -484,28 +484,24 @@ export default {
             const taskScaleConfs = $xeGantt.computeTaskViewScales;
             const taskViewScaleOpts = $xeGantt.computeTaskViewScaleOpts;
             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' });
         },
         initToolbar() {
@@ -1737,7 +1733,10 @@ export default {
             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}`;
+                }
             }
             $xeGantt.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 = "3.1.1";
+VxeUI.ganttVersion = "3.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${"3.1.1"}`;
+const version = `gantt v${"3.1.3"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

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,9 +55,11 @@ 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,
@@ -91,17 +93,19 @@ 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,
-        $gantt: $xeGantt
+        _rowIndex: _rowIndex
       };
       var ons = {
         click: function click(evnt) {

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,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)}});
+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"],m=l.computeTitleField,h=l.computeProgressField,y=l.computeTaskBarOpts,g=l.computeScaleUnit,v={$gantt:l,row:r,scaleType:g},w=y.showProgress,x=y.showContent,_=y.contentMethod,b=y.barStyle,T=y.drag,y=y.showTooltip,k=_xeUtils.default.isFunction(b),b=(b?k?b(v):b:{})||{},E=b.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,m)),p=w?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(r,h)))):0,t={},m={width:"".concat(p||0,"%")},A=(k&&(h=b.bgColor,p=b.completedBgColor,h&&(t.backgroundColor=h),p)&&(m.backgroundColor=p),_&&(d=(0,_utils.getStringValue)(_({row:r,title:d,scaleType:g}))),{$gantt:l,source:sourceType,type:viewType,scaleType:g,row:r,$rowIndex:o,rowIndex:n,_rowIndex:i}),k={click:function(e){l.handleTaskBarClickEvent(e,v)},dblclick:function(e){l.handleTaskBarDblclickEvent(e,v)},mousedown:function(e){l.handleTaskBarMousedownEvent&&l.handleTaskBarMousedownEvent(e,v)}};return y&&(k.mouseover=function(e){l.triggerTaskBarTooltipEvent(e,Object.assign({$event:e},A))},k.mouseleave=function(e){l.handleTaskBarTooltipLeaveEvent(e,Object.assign({$event:e},A))}),e("div",{key:s?a:o,attrs:{rowid:a},class:["vxe-gantt-view--chart-row",{"is--round":E,"is--drag":T,"col--rs-height":u}],style:{height:"".concat(c,"px")},on:{contextmenu:function(e){l.handleTaskBarContextmenuEvent(e,A)}}},[e("div",{class:f?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar",style:t,attrs:{rowid:a},on:k},f?l.callSlot(f,v,e):[w?e("div",{class:"vxe-gantt-view--chart-progress",style:m}):renderEmptyElement(l),x?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,m=r.children||r.childrenField,h=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(s.renderTaskBar(i,l,e,r,n,t,o)),!1),n=[];!u||h||f||(n=e[m],a=!!c&&n&&0<n.length&&!!p[r]),a&&y.push.apply(y,_toConsumableArray(s.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)}});

package/lib/gantt/src/gantt.js

@@ -550,36 +550,26 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var taskScaleConfs = $xeGantt.computeTaskViewScales;
       var taskViewScaleOpts = $xeGantt.computeTaskViewScaleOpts;
       var scaleConfs = [];
-      if (taskScaleConfs) {
-        var keyMaps = {};
-        taskScaleConfs.forEach(function (conf) {
-          var sConf = !conf || _xeUtils.default.isString(conf) ? {
-            type: conf
-          } : conf;
-          var type = sConf.type;
-          if (!type || !viewTypeLevelMaps[type]) {
-            (0, _log.errLog)('vxe.error.errProp', ["type=".concat(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
-        });
-      }
+      var keyMaps = {};
+      var scaleList = taskScaleConfs && taskScaleConfs.length ? taskScaleConfs : ['month', 'date'];
+      scaleList.forEach(function (conf) {
+        var sConf = !conf || _xeUtils.default.isString(conf) ? {
+          type: conf
+        } : conf;
+        var type = sConf.type;
+        if (!type || !viewTypeLevelMaps[type]) {
+          (0, _log.errLog)('vxe.error.errProp', ["type=".concat(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'
@@ -1945,7 +1935,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var row = params.row;
       var content = (0, _utils.formatText)(_xeUtils.default.get(row, titleField));
       if (contentMethod) {
-        content = (0, _utils.formatText)(contentMethod(params));
+        var customContnet = contentMethod(params);
+        if (!_xeUtils.default.eqNull(customContnet)) {
+          content = "".concat(customContnet);
+        }
       }
       $xeGantt.handleTargetEnterEvent(barTipStore.row !== row);
       var tipContent = (0, _utils.formatText)(content);