vxe-gantt 3.6.6 → 3.6.8

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

@@ -40,7 +40,7 @@ export default defineVxeComponent({
             const { showNowLine, viewStyle } = taskViewOpts;
             const scaleUnit = $xeGantt.computeScaleUnit;
             const { scaleItem } = headerGroups[headerGroups.length - 1] || {};
-            const { field, dateObj } = column;
+            const { field, dateObj, startDateObj, endDateObj } = column;
             const { cellClassName, cellStyle } = viewStyle || {};
             const todayValue = showNowLine && scaleItem ? todayDateMaps[scaleItem.type] : null;
             const rowRest = fullAllDataRowIdData[rowid] || {};
@@ -86,6 +86,8 @@ export default defineVxeComponent({
                 type: viewType,
                 scaleType: scaleUnit,
                 dateObj,
+                startDateObj,
+                endDateObj,
                 row,
                 column,
                 $rowIndex,

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

@@ -28,6 +28,8 @@ export default defineVxeComponent({
             const { headerGroups, viewCellWidth } = reactData;
             const { todayDateMaps, visibleColumn } = internalData;
             const taskViewOpts = $xeGantt.computeTaskViewOpts;
+            const minScale = $xeGantt.computeMinScale;
+            const scaleStep = $xeGantt.computeScaleStep;
             const { showNowLine } = taskViewOpts;
             return h('div', {
                 ref: 'refElem',
@@ -64,17 +66,31 @@ export default defineVxeComponent({
                             return h('tr', {
                                 key: $rowIndex
                             }, columns.map((column, cIndex) => {
-                                const { field, childCount, dateObj } = column;
+                                const { field, childCount, dateObj, startDateObj, endDateObj } = column;
                                 let label = `${column.title}`;
-                                if (scaleItem.type === 'day') {
-                                    label = getI18n(`vxe.gantt.dayss.w${dateObj.e}`);
+                                if ((isLast || (minScale && (minScale.type === 'date' || minScale.type === 'day') && (type === 'date' || type === 'day'))) && scaleStep > 1) {
+                                    label = getI18n(`vxe.gantt.stepFormat.${type}`, {
+                                        start: startDateObj,
+                                        end: endDateObj,
+                                        eStartLabel: getI18n(`vxe.gantt.dayss.w${startDateObj.e}`),
+                                        eEndLabel: getI18n(`vxe.gantt.dayss.w${endDateObj.e}`)
+                                    });
                                 }
                                 else {
-                                    if ($rowIndex) {
-                                        label = getI18n(`vxe.gantt.tSimpleFormat.${type}`, dateObj);
+                                    if (type === 'day') {
+                                        if ($rowIndex) {
+                                            label = getI18n(`vxe.gantt.tSimpleFormat.${type}`, {
+                                                eLabel: getI18n(`vxe.gantt.dayss.w${dateObj.e}`)
+                                            });
+                                        }
+                                        else {
+                                            label = getI18n(`vxe.gantt.tFullFormat.${type}`, {
+                                                eLabel: getI18n(`vxe.gantt.dayss.w${dateObj.e}`)
+                                            });
+                                        }
                                     }
                                     else {
-                                        if (isLast && scaleItem.type === 'week') {
+                                        if ($rowIndex) {
                                             label = getI18n(`vxe.gantt.tSimpleFormat.${type}`, dateObj);
                                         }
                                         else {
@@ -83,7 +99,17 @@ export default defineVxeComponent({
                                     }
                                 }
                                 let cellVNs = label;
-                                const ctParams = { source: sourceType, type: viewType, column, scaleObj: scaleItem, title: label, dateObj: dateObj, $rowIndex };
+                                const ctParams = {
+                                    source: sourceType,
+                                    type: viewType,
+                                    column,
+                                    scaleObj: scaleItem,
+                                    title: label,
+                                    dateObj,
+                                    startDateObj,
+                                    endDateObj,
+                                    $rowIndex
+                                };
                                 if (titleSlot) {
                                     cellVNs = $xeGantt.callSlot(titleSlot, ctParams, h);
                                 }

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

@@ -117,6 +117,8 @@ function handleColumnHeader($xeGanttView) {
     const minScale = $xeGantt.computeMinScale;
     const weekScale = $xeGantt.computeWeekScale;
     const scaleDateList = $xeGanttView.computeScaleDateList;
+    const scaleStep = $xeGantt.computeScaleStep;
+    const weekStartDay = weekScale ? weekScale.startDay : undefined;
     const fullCols = [];
     const groupCols = [];
     if (minScale && scaleUnit && scaleDateList.length) {
@@ -162,65 +164,88 @@ function handleColumnHeader($xeGanttView) {
                 currGpCol.children.push(minCol);
             }
         };
-        for (let i = 0; i < scaleDateList.length; i++) {
-            const itemDate = scaleDateList[i];
-            let [yy, yyyy, M, MM, d, dd, H, HH, m, mm, s, ss] = XEUtils.toDateString(itemDate, 'yy-yyyy-M-MM-d-dd-H-HH-m-mm-s-ss').split('-');
-            const e = itemDate.getDay();
+        const createDateObj = (date) => {
+            let [yy, yyyy, M, MM, d, dd, H, HH, m, mm, s, ss] = XEUtils.toDateString(date, 'yy-yyyy-M-MM-d-dd-H-HH-m-mm-s-ss').split('-');
+            const e = date.getDay();
             const E = e + 1;
-            const q = Math.ceil((itemDate.getMonth() + 1) / 3);
-            const W = `${XEUtils.getYearWeek(itemDate, weekScale ? weekScale.startDay : undefined)}`;
+            const q = Math.ceil((date.getMonth() + 1) / 3);
+            const W = `${XEUtils.getYearWeek(date, weekScale ? weekScale.startDay : undefined)}`;
             const WW = XEUtils.padStart(W, 2, '0');
             if (isMinWeek && checkWeekOfsetYear(W, M)) {
                 yyyy = `${Number(yyyy) + 1}`;
                 M = '1';
                 MM = '0' + M;
             }
-            const dateObj = { date: itemDate, yy, yyyy, M, MM, d, dd, H, HH, m, mm, s, ss, q, W, WW, E, e };
+            return { date, yy, yyyy, M, MM, d, dd, H, HH, m, mm, s, ss, q, W, WW, E, e };
+        };
+        for (let i = 0; i < scaleDateList.length; i++) {
+            const itemDate = scaleDateList[i];
+            const dateObj = createDateObj(itemDate);
+            const { yyyy, MM, dd, HH, mm, ss, q, W, E } = dateObj;
+            const startDateObj = dateObj;
             const colMaps = {
                 year: {
                     field: yyyy,
                     title: yyyy,
-                    dateObj
+                    dateObj,
+                    startDateObj,
+                    endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatYear(itemDate, scaleStep - 1)) : startDateObj
                 },
                 quarter: {
                     field: `${yyyy}_q${q}`,
                     title: `${q}`,
-                    dateObj
+                    dateObj,
+                    startDateObj,
+                    endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatQuarter(itemDate, scaleStep - 1)) : startDateObj
                 },
                 month: {
                     field: `${yyyy}_${MM}`,
                     title: MM,
-                    dateObj
+                    dateObj,
+                    startDateObj,
+                    endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatMonth(itemDate, scaleStep - 1)) : startDateObj
                 },
                 week: {
                     field: `${yyyy}_W${W}`,
                     title: `${W}`,
-                    dateObj
+                    dateObj,
+                    startDateObj,
+                    endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatWeek(itemDate, scaleStep - 1, weekStartDay, weekStartDay)) : startDateObj
                 },
                 day: {
                     field: `${yyyy}_${MM}_${dd}_E${E}`,
                     title: `${E}`,
-                    dateObj
+                    dateObj,
+                    startDateObj,
+                    endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatDay(itemDate, scaleStep - 1)) : startDateObj
                 },
                 date: {
                     field: `${yyyy}_${MM}_${dd}`,
                     title: dd,
-                    dateObj
+                    dateObj,
+                    startDateObj,
+                    endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatDay(itemDate, scaleStep - 1)) : startDateObj
                 },
                 hour: {
                     field: `${yyyy}_${MM}_${dd}_${HH}`,
                     title: HH,
-                    dateObj
+                    dateObj,
+                    startDateObj,
+                    endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatHours(itemDate, scaleStep - 1)) : startDateObj
                 },
                 minute: {
                     field: `${yyyy}_${MM}_${dd}_${HH}_${mm}`,
                     title: mm,
-                    dateObj
+                    dateObj,
+                    startDateObj,
+                    endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatMinutes(itemDate, scaleStep - 1)) : startDateObj
                 },
                 second: {
                     field: `${yyyy}_${MM}_${dd}_${HH}_${mm}_${ss}`,
                     title: ss,
-                    dateObj
+                    dateObj,
+                    startDateObj,
+                    endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatSeconds(itemDate, scaleStep - 1)) : startDateObj
                 }
             };
             const minCol = colMaps[minScale.type];
@@ -324,7 +349,7 @@ function createChartRender($xeGanttView, fullCols) {
                         let currStep = scaleStep - 1;
                         while (currStep) {
                             const currStr = XEUtils.toDateString(XEUtils.getWhatYear(dateObj.date, scaleStep - currStep), renderFormat);
-                            indexMaps[currStr] = i + currRatio;
+                            indexMaps[currStr] = i + ((scaleStep - currStep) * currRatio);
                             currStep--;
                         }
                     }
@@ -370,7 +395,7 @@ function createChartRender($xeGanttView, fullCols) {
                         let currStep = scaleStep - 1;
                         while (currStep) {
                             const currStr = XEUtils.toDateString(XEUtils.getWhatQuarter(dateObj.date, scaleStep - currStep), renderFormat);
-                            indexMaps[currStr] = i + currRatio;
+                            indexMaps[currStr] = i + ((scaleStep - currStep) * currRatio);
                             currStep--;
                         }
                     }
@@ -416,7 +441,7 @@ function createChartRender($xeGanttView, fullCols) {
                         let currStep = scaleStep - 1;
                         while (currStep) {
                             const currStr = XEUtils.toDateString(XEUtils.getWhatMonth(dateObj.date, scaleStep - currStep), renderFormat);
-                            indexMaps[currStr] = i + currRatio;
+                            indexMaps[currStr] = i + ((scaleStep - currStep) * currRatio);
                             currStep--;
                         }
                     }
@@ -468,7 +493,7 @@ function createChartRender($xeGanttView, fullCols) {
                                 yyyy = `${Number(yyyy) + 1}`;
                             }
                             const currStr = `${yyyy}-${W}`;
-                            indexMaps[currStr] = i + currRatio;
+                            indexMaps[currStr] = i + ((scaleStep - currStep) * currRatio);
                             currStep--;
                         }
                     }
@@ -515,7 +540,7 @@ function createChartRender($xeGanttView, fullCols) {
                         let currStep = scaleStep - 1;
                         while (currStep) {
                             const currStr = XEUtils.toDateString(XEUtils.getWhatDay(dateObj.date, scaleStep - currStep), renderFormat);
-                            indexMaps[currStr] = i + currRatio;
+                            indexMaps[currStr] = i + ((scaleStep - currStep) * currRatio);
                             currStep--;
                         }
                     }
@@ -558,7 +583,7 @@ function createChartRender($xeGanttView, fullCols) {
                         let currStep = scaleStep - 1;
                         while (currStep) {
                             const currStr = XEUtils.toDateString(XEUtils.getWhatHours(dateObj.date, scaleStep - currStep), renderFormat);
-                            indexMaps[currStr] = i + currRatio;
+                            indexMaps[currStr] = i + ((scaleStep - currStep) * currRatio);
                             currStep--;
                         }
                     }
@@ -601,7 +626,7 @@ function createChartRender($xeGanttView, fullCols) {
                         let currStep = scaleStep - 1;
                         while (currStep) {
                             const currStr = XEUtils.toDateString(XEUtils.getWhatMinutes(dateObj.date, scaleStep - currStep), renderFormat);
-                            indexMaps[currStr] = i + currRatio;
+                            indexMaps[currStr] = i + ((scaleStep - currStep) * currRatio);
                             currStep--;
                         }
                     }
@@ -644,7 +669,7 @@ function createChartRender($xeGanttView, fullCols) {
                         let currStep = scaleStep - 1;
                         while (currStep) {
                             const yyyyMM = XEUtils.toDateString(XEUtils.getWhatSeconds(dateObj.date, scaleStep - currStep), renderFormat);
-                            indexMaps[yyyyMM] = i + currRatio;
+                            indexMaps[yyyyMM] = i + ((scaleStep - currStep) * currRatio);
                             currStep--;
                         }
                     }
@@ -1518,7 +1543,7 @@ export default defineVxeComponent({
             let rightSize = ganttReactData.currRightSpacing + XEUtils.toNumber(gridding ? gridding.rightSpacing || 0 : 0);
             if (scaleStep > 0) {
                 leftSize *= scaleStep;
-                rightSize *= rightSize;
+                rightSize *= scaleStep;
             }
             switch (type) {
                 case 'year': {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { setConfig, setIcon } = VxeUI;
-VxeUI.ganttVersion = "3.6.6";
+VxeUI.ganttVersion = "3.6.8";
 const ymdFormat = 'yyyy-MM-dd';
 const ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const ganttVersion = `gantt v${"3.6.6"}`;
+const ganttVersion = `gantt v${"3.6.8"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';

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

@@ -58,7 +58,9 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       var _ref = headerGroups[headerGroups.length - 1] || {},
         scaleItem = _ref.scaleItem;
       var field = column.field,
-        dateObj = column.dateObj;
+        dateObj = column.dateObj,
+        startDateObj = column.startDateObj,
+        endDateObj = column.endDateObj;
       var _ref2 = viewStyle || {},
         cellClassName = _ref2.cellClassName,
         cellStyle = _ref2.cellStyle;
@@ -110,6 +112,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         type: viewType,
         scaleType: scaleUnit,
         dateObj: dateObj,
+        startDateObj: startDateObj,
+        endDateObj: endDateObj,
         row: row,
         column: column,
         $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,c){var s,u=this.$xeGanttView,d=this.$xeGantt,p=u.reactData,w=t.resizeHeightFlag,y=t.fullAllDataRowIdData,f=t.visibleColumn,m=t.computeCellOpts,v=t.computeRowOpts,g=t.computeResizableOpts.isAllRowDrag,p=p.headerGroups,u=u.internalData.todayDateMaps,h=d.computeTaskViewOpts,x=h.showNowLine,b=d.computeScaleUnit,p=(p[p.length-1]||{}).scaleItem,_=i.field,R=i.dateObj,h=h.viewStyle||{},T=h.cellClassName,h=h.cellStyle,u=x&&p?u[p.type]:null,p=y[n]||{},y=w?(0,_util.getCellRestHeight)(p,m,v,t.computeDefaultRowHeight):0,w=[],C=(g&&v.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:[]},w.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:T||h?_:c,class:["vxe-gantt-view--body-column",{"is--now":x&&u===_},(0,_utils.getClass)(T,C)],style:h?Object.assign({},_xeUtils.default.isFunction(h)?h(C):h,{height:"".concat(y,"px")}):{height:"".concat(y,"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)}}},w)},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,v=s.selectRadioRow,g=s.pendingRowFlag,h=s.isRowGroupStatus,x=s.fullAllDataRowIdData,b=s.treeExpandedMaps,_=s.pendingRowMaps,R=s.computeRadioOpts,T=s.computeCheckboxOpts,C=s.computeRowOpts,r=s.computeTreeOpts,S=r.transform,D=r.children||r.childrenField,I=d.computeScaleUnit,r=d.computeTaskViewOpts.viewStyle||{},$=r.rowClassName,k=r.rowStyle,A=r.cellClassName,E=r.cellStyle,O=t.tableColumn,B=t.scrollYLoad,G=[];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||h||p&&!S||(t.dragstart=s.handleRowDragDragstartEvent,t.dragend=s.handleRowDragDragendEvent,t.dragover=s.handleRowDragDragoverEvent),{$gantt:d,source:sourceType,type:viewType,scaleType:I,row:r,rowIndex:a,$rowIndex:n,_rowIndex:l}),e=(G.push(c("tr",{key:$||k||A||E?o:n,class:["vxe-gantt-view--body-row",{"row--stripe":w&&(l+1)%2==0,"is--new":e,"row--radio":R.highlight&&s.eqRow(v,r),"row--checked":T.highlight&&s.isCheckedByCheckboxRow(r),"row--pending":!!g&&!!_[o]},(0,_utils.getClass)($,i)],style:k?_xeUtils.default.isFunction(k)?k(i)||void 0:k:void 0,attrs:{rowid:o},on:t},O.map(function(e,t){return u.renderColumn(c,s,r,o,a,n,l,e,t)}))),!1),i=[];!p||B||S||(i=r[D],e=!!m&&i&&0<i.length&&!!b[o]),e&&G.push.apply(G,_toConsumableArray(u.renderRows(c,s,i)))}),G},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,a=Array(t);r<t;r++)a[r]=e[r];return a}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,a,n,o,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,v=t.computeRowOpts,g=t.computeResizableOpts.isAllRowDrag,p=p.headerGroups,u=u.internalData.todayDateMaps,h=d.computeTaskViewOpts,x=h.showNowLine,b=d.computeScaleUnit,p=(p[p.length-1]||{}).scaleItem,_=i.field,R=i.dateObj,D=i.startDateObj,T=i.endDateObj,h=h.viewStyle||{},C=h.cellClassName,h=h.cellStyle,u=x&&p?u[p.type]:null,p=y[a]||{},y=w?(0,_util.getCellRestHeight)(p,m,v,t.computeDefaultRowHeight):0,w=[],S=(g&&v.resizable&&(s={$table:t,$grid:null,$gantt:d,seq:-1,rowid:a,row:r,rowIndex:n,$rowIndex:o,_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:[]},w.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,startDateObj:D,endDateObj:T,row:r,column:i,$rowIndex:o,rowIndex:n,_rowIndex:l});return e("td",{key:C||h?_:c,class:["vxe-gantt-view--body-column",{"is--now":x&&u===_},(0,_utils.getClass)(C,S)],style:h?Object.assign({},_xeUtils.default.isFunction(h)?h(S):h,{height:"".concat(y,"px")}):{height:"".concat(y,"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,S)}}},w)},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,v=s.selectRadioRow,g=s.pendingRowFlag,h=s.isRowGroupStatus,x=s.fullAllDataRowIdData,b=s.treeExpandedMaps,_=s.pendingRowMaps,R=s.computeRadioOpts,D=s.computeCheckboxOpts,T=s.computeRowOpts,r=s.computeTreeOpts,C=r.transform,S=r.children||r.childrenField,I=d.computeScaleUnit,r=d.computeTaskViewOpts.viewStyle||{},$=r.rowClassName,k=r.rowStyle,A=r.cellClassName,O=r.cellStyle,E=t.tableColumn,B=t.scrollYLoad,G=[];return e.forEach(function(r,a){var n=s.getRowid(r),e=x[n]||{},t={},o=a,l=-1,e=(e&&(o=e.index,l=e._index),!1),i=(f&&(e=s.isInsertByRow(r)),(T.isHover||y)&&(t.mouseenter=function(e){s.triggerHoverEvent(e,{row:r,rowIndex:o})},t.mouseleave=function(){s.clearHoverRow()}),!T.drag||h||p&&!C||(t.dragstart=s.handleRowDragDragstartEvent,t.dragend=s.handleRowDragDragendEvent,t.dragover=s.handleRowDragDragoverEvent),{$gantt:d,source:sourceType,type:viewType,scaleType:I,row:r,rowIndex:o,$rowIndex:a,_rowIndex:l}),e=(G.push(c("tr",{key:$||k||A||O?n:a,class:["vxe-gantt-view--body-row",{"row--stripe":w&&(l+1)%2==0,"is--new":e,"row--radio":R.highlight&&s.eqRow(v,r),"row--checked":D.highlight&&s.isCheckedByCheckboxRow(r),"row--pending":!!g&&!!_[n]},(0,_utils.getClass)($,i)],style:k?_xeUtils.default.isFunction(k)?k(i)||void 0:k:void 0,attrs:{rowid:n},on:t},E.map(function(e,t){return u.renderColumn(c,s,r,n,o,a,l,e,t)}))),!1),i=[];!p||B||C||(i=r[S],e=!!m&&i&&0<i.length&&!!b[n]),e&&G.push.apply(G,_toConsumableArray(u.renderRows(c,s,i)))}),G},renderVN:function(r){var t=this.$xeGantt,e=this.$xeGanttView,a=e.reactData,n=e.internalData.xeTable,o=a.tableData,l=a.tableColumn,i=a.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",{},n?this.renderRows(r,n,o):[])]),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-header.js

@@ -37,6 +37,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       var todayDateMaps = internalData.todayDateMaps,
         visibleColumn = internalData.visibleColumn;
       var taskViewOpts = $xeGantt.computeTaskViewOpts;
+      var minScale = $xeGantt.computeMinScale;
+      var scaleStep = $xeGantt.computeScaleStep;
       var showNowLine = taskViewOpts.showNowLine;
       return h('div', {
         ref: 'refElem',
@@ -76,15 +78,30 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         }, columns.map(function (column, cIndex) {
           var field = column.field,
             childCount = column.childCount,
-            dateObj = column.dateObj;
+            dateObj = column.dateObj,
+            startDateObj = column.startDateObj,
+            endDateObj = column.endDateObj;
           var label = "".concat(column.title);
-          if (scaleItem.type === 'day') {
-            label = getI18n("vxe.gantt.dayss.w".concat(dateObj.e));
+          if ((isLast || minScale && (minScale.type === 'date' || minScale.type === 'day') && (type === 'date' || type === 'day')) && scaleStep > 1) {
+            label = getI18n("vxe.gantt.stepFormat.".concat(type), {
+              start: startDateObj,
+              end: endDateObj,
+              eStartLabel: getI18n("vxe.gantt.dayss.w".concat(startDateObj.e)),
+              eEndLabel: getI18n("vxe.gantt.dayss.w".concat(endDateObj.e))
+            });
           } else {
-            if ($rowIndex) {
-              label = getI18n("vxe.gantt.tSimpleFormat.".concat(type), dateObj);
+            if (type === 'day') {
+              if ($rowIndex) {
+                label = getI18n("vxe.gantt.tSimpleFormat.".concat(type), {
+                  eLabel: getI18n("vxe.gantt.dayss.w".concat(dateObj.e))
+                });
+              } else {
+                label = getI18n("vxe.gantt.tFullFormat.".concat(type), {
+                  eLabel: getI18n("vxe.gantt.dayss.w".concat(dateObj.e))
+                });
+              }
             } else {
-              if (isLast && scaleItem.type === 'week') {
+              if ($rowIndex) {
                 label = getI18n("vxe.gantt.tSimpleFormat.".concat(type), dateObj);
               } else {
                 label = getI18n("vxe.gantt.tFullFormat.".concat(type), dateObj);
@@ -99,6 +116,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             scaleObj: scaleItem,
             title: label,
             dateObj: dateObj,
+            startDateObj: startDateObj,
+            endDateObj: endDateObj,
             $rowIndex: $rowIndex
           };
           if (titleSlot) {

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

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

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

@@ -140,6 +140,8 @@ function handleColumnHeader($xeGanttView) {
   var minScale = $xeGantt.computeMinScale;
   var weekScale = $xeGantt.computeWeekScale;
   var scaleDateList = $xeGanttView.computeScaleDateList;
+  var scaleStep = $xeGantt.computeScaleStep;
+  var weekStartDay = weekScale ? weekScale.startDay : undefined;
   var fullCols = [];
   var groupCols = [];
   if (minScale && scaleUnit && scaleDateList.length) {
@@ -185,9 +187,8 @@ function handleColumnHeader($xeGanttView) {
         currGpCol.children.push(minCol);
       }
     };
-    for (var i = 0; i < scaleDateList.length; i++) {
-      var itemDate = scaleDateList[i];
-      var _XEUtils$toDateString3 = _xeUtils.default.toDateString(itemDate, 'yy-yyyy-M-MM-d-dd-H-HH-m-mm-s-ss').split('-'),
+    var createDateObj = function createDateObj(date) {
+      var _XEUtils$toDateString3 = _xeUtils.default.toDateString(date, 'yy-yyyy-M-MM-d-dd-H-HH-m-mm-s-ss').split('-'),
         _XEUtils$toDateString4 = _slicedToArray(_XEUtils$toDateString3, 12),
         yy = _XEUtils$toDateString4[0],
         yyyy = _XEUtils$toDateString4[1],
@@ -201,18 +202,18 @@ function handleColumnHeader($xeGanttView) {
         mm = _XEUtils$toDateString4[9],
         s = _XEUtils$toDateString4[10],
         ss = _XEUtils$toDateString4[11];
-      var e = itemDate.getDay();
+      var e = date.getDay();
       var E = e + 1;
-      var q = Math.ceil((itemDate.getMonth() + 1) / 3);
-      var W = "".concat(_xeUtils.default.getYearWeek(itemDate, weekScale ? weekScale.startDay : undefined));
+      var q = Math.ceil((date.getMonth() + 1) / 3);
+      var W = "".concat(_xeUtils.default.getYearWeek(date, weekScale ? weekScale.startDay : undefined));
       var WW = _xeUtils.default.padStart(W, 2, '0');
       if (isMinWeek && checkWeekOfsetYear(W, M)) {
         yyyy = "".concat(Number(yyyy) + 1);
         M = '1';
         MM = '0' + M;
       }
-      var dateObj = {
-        date: itemDate,
+      return {
+        date: date,
         yy: yy,
         yyyy: yyyy,
         M: M,
@@ -231,51 +232,83 @@ function handleColumnHeader($xeGanttView) {
         E: E,
         e: e
       };
+    };
+    for (var i = 0; i < scaleDateList.length; i++) {
+      var itemDate = scaleDateList[i];
+      var dateObj = createDateObj(itemDate);
+      var yyyy = dateObj.yyyy,
+        MM = dateObj.MM,
+        dd = dateObj.dd,
+        HH = dateObj.HH,
+        mm = dateObj.mm,
+        ss = dateObj.ss,
+        q = dateObj.q,
+        W = dateObj.W,
+        E = dateObj.E;
+      var startDateObj = dateObj;
       var colMaps = {
         year: {
           field: yyyy,
           title: yyyy,
-          dateObj: dateObj
+          dateObj: dateObj,
+          startDateObj: startDateObj,
+          endDateObj: scaleStep > 1 ? createDateObj(_xeUtils.default.getWhatYear(itemDate, scaleStep - 1)) : startDateObj
         },
         quarter: {
           field: "".concat(yyyy, "_q").concat(q),
           title: "".concat(q),
-          dateObj: dateObj
+          dateObj: dateObj,
+          startDateObj: startDateObj,
+          endDateObj: scaleStep > 1 ? createDateObj(_xeUtils.default.getWhatQuarter(itemDate, scaleStep - 1)) : startDateObj
         },
         month: {
           field: "".concat(yyyy, "_").concat(MM),
           title: MM,
-          dateObj: dateObj
+          dateObj: dateObj,
+          startDateObj: startDateObj,
+          endDateObj: scaleStep > 1 ? createDateObj(_xeUtils.default.getWhatMonth(itemDate, scaleStep - 1)) : startDateObj
         },
         week: {
           field: "".concat(yyyy, "_W").concat(W),
           title: "".concat(W),
-          dateObj: dateObj
+          dateObj: dateObj,
+          startDateObj: startDateObj,
+          endDateObj: scaleStep > 1 ? createDateObj(_xeUtils.default.getWhatWeek(itemDate, scaleStep - 1, weekStartDay, weekStartDay)) : startDateObj
         },
         day: {
           field: "".concat(yyyy, "_").concat(MM, "_").concat(dd, "_E").concat(E),
           title: "".concat(E),
-          dateObj: dateObj
+          dateObj: dateObj,
+          startDateObj: startDateObj,
+          endDateObj: scaleStep > 1 ? createDateObj(_xeUtils.default.getWhatDay(itemDate, scaleStep - 1)) : startDateObj
         },
         date: {
           field: "".concat(yyyy, "_").concat(MM, "_").concat(dd),
           title: dd,
-          dateObj: dateObj
+          dateObj: dateObj,
+          startDateObj: startDateObj,
+          endDateObj: scaleStep > 1 ? createDateObj(_xeUtils.default.getWhatDay(itemDate, scaleStep - 1)) : startDateObj
         },
         hour: {
           field: "".concat(yyyy, "_").concat(MM, "_").concat(dd, "_").concat(HH),
           title: HH,
-          dateObj: dateObj
+          dateObj: dateObj,
+          startDateObj: startDateObj,
+          endDateObj: scaleStep > 1 ? createDateObj(_xeUtils.default.getWhatHours(itemDate, scaleStep - 1)) : startDateObj
         },
         minute: {
           field: "".concat(yyyy, "_").concat(MM, "_").concat(dd, "_").concat(HH, "_").concat(mm),
           title: mm,
-          dateObj: dateObj
+          dateObj: dateObj,
+          startDateObj: startDateObj,
+          endDateObj: scaleStep > 1 ? createDateObj(_xeUtils.default.getWhatMinutes(itemDate, scaleStep - 1)) : startDateObj
         },
         second: {
           field: "".concat(yyyy, "_").concat(MM, "_").concat(dd, "_").concat(HH, "_").concat(mm, "_").concat(ss),
           title: ss,
-          dateObj: dateObj
+          dateObj: dateObj,
+          startDateObj: startDateObj,
+          endDateObj: scaleStep > 1 ? createDateObj(_xeUtils.default.getWhatSeconds(itemDate, scaleStep - 1)) : startDateObj
         }
       };
       var minCol = colMaps[minScale.type];
@@ -381,7 +414,7 @@ function createChartRender($xeGanttView, fullCols) {
               var currStep = scaleStep - 1;
               while (currStep) {
                 var _currStr = _xeUtils.default.toDateString(_xeUtils.default.getWhatYear(dateObj.date, scaleStep - currStep), renderFormat);
-                indexMaps[_currStr] = i + currRatio;
+                indexMaps[_currStr] = i + (scaleStep - currStep) * currRatio;
                 currStep--;
               }
             }
@@ -429,7 +462,7 @@ function createChartRender($xeGanttView, fullCols) {
               var currStep = scaleStep - 1;
               while (currStep) {
                 var _currStr2 = _xeUtils.default.toDateString(_xeUtils.default.getWhatQuarter(dateObj.date, scaleStep - currStep), _renderFormat);
-                _indexMaps[_currStr2] = i + currRatio;
+                _indexMaps[_currStr2] = i + (scaleStep - currStep) * currRatio;
                 currStep--;
               }
             }
@@ -477,7 +510,7 @@ function createChartRender($xeGanttView, fullCols) {
               var currStep = scaleStep - 1;
               while (currStep) {
                 var _currStr3 = _xeUtils.default.toDateString(_xeUtils.default.getWhatMonth(dateObj.date, scaleStep - currStep), _renderFormat2);
-                _indexMaps2[_currStr3] = i + currRatio;
+                _indexMaps2[_currStr3] = i + (scaleStep - currStep) * currRatio;
                 currStep--;
               }
             }
@@ -534,7 +567,7 @@ function createChartRender($xeGanttView, fullCols) {
                   yyyy = "".concat(Number(yyyy) + 1);
                 }
                 var _currStr4 = "".concat(yyyy, "-").concat(W);
-                _indexMaps3[_currStr4] = i + currRatio;
+                _indexMaps3[_currStr4] = i + (scaleStep - currStep) * currRatio;
                 currStep--;
               }
             }
@@ -583,7 +616,7 @@ function createChartRender($xeGanttView, fullCols) {
               var currStep = scaleStep - 1;
               while (currStep) {
                 var _currStr5 = _xeUtils.default.toDateString(_xeUtils.default.getWhatDay(dateObj.date, scaleStep - currStep), _renderFormat3);
-                _indexMaps4[_currStr5] = i + currRatio;
+                _indexMaps4[_currStr5] = i + (scaleStep - currStep) * currRatio;
                 currStep--;
               }
             }
@@ -628,7 +661,7 @@ function createChartRender($xeGanttView, fullCols) {
               var currStep = scaleStep - 1;
               while (currStep) {
                 var _currStr6 = _xeUtils.default.toDateString(_xeUtils.default.getWhatHours(dateObj.date, scaleStep - currStep), _renderFormat4);
-                _indexMaps5[_currStr6] = i + currRatio;
+                _indexMaps5[_currStr6] = i + (scaleStep - currStep) * currRatio;
                 currStep--;
               }
             }
@@ -673,7 +706,7 @@ function createChartRender($xeGanttView, fullCols) {
               var currStep = scaleStep - 1;
               while (currStep) {
                 var _currStr7 = _xeUtils.default.toDateString(_xeUtils.default.getWhatMinutes(dateObj.date, scaleStep - currStep), _renderFormat5);
-                _indexMaps6[_currStr7] = i + currRatio;
+                _indexMaps6[_currStr7] = i + (scaleStep - currStep) * currRatio;
                 currStep--;
               }
             }
@@ -718,7 +751,7 @@ function createChartRender($xeGanttView, fullCols) {
               var currStep = scaleStep - 1;
               while (currStep) {
                 var _yyyyMM = _xeUtils.default.toDateString(_xeUtils.default.getWhatSeconds(dateObj.date, scaleStep - currStep), _renderFormat6);
-                _indexMaps7[_yyyyMM] = i + currRatio;
+                _indexMaps7[_yyyyMM] = i + (scaleStep - currStep) * currRatio;
                 currStep--;
               }
             }
@@ -1628,7 +1661,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       var rightSize = ganttReactData.currRightSpacing + _xeUtils.default.toNumber(gridding ? gridding.rightSpacing || 0 : 0);
       if (scaleStep > 0) {
         leftSize *= scaleStep;
-        rightSize *= rightSize;
+        rightSize *= scaleStep;
       }
       switch (type) {
         case 'year':