vxe-gantt 4.6.6 → 4.6.7

package/dist/all.esm.js

@@ -6,7 +6,7 @@ import DomZIndex from 'dom-zindex';
 import { VxeTable } from 'vxe-table';
 
 const { setConfig: setConfig$1, setIcon } = VxeUI;
-VxeUI.ganttVersion = "4.6.6";
+VxeUI.ganttVersion = "4.6.7";
 const ymdFormat = 'yyyy-MM-dd';
 const ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig$1({
@@ -115,7 +115,7 @@ setIcon({
 });
 
 const { log } = VxeUI;
-const ganttVersion = `gantt v${"4.6.6"}`;
+const ganttVersion = `gantt v${"4.6.7"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
@@ -451,7 +451,7 @@ var GanttViewHeaderComponent = defineVxeComponent({
     setup() {
         const $xeGantt = inject('$xeGantt', {});
         const $xeGanttView = inject('$xeGanttView', {});
-        const { computeTaskViewOpts } = $xeGantt.getComputeMaps();
+        const { computeTaskViewOpts, computeScaleStep, computeMinScale } = $xeGantt.getComputeMaps();
         const { reactData, internalData } = $xeGanttView;
         const refElem = ref();
         const refHeaderScroll = ref();
@@ -461,6 +461,8 @@ var GanttViewHeaderComponent = defineVxeComponent({
             const { headerGroups, viewCellWidth } = reactData;
             const { todayDateMaps, visibleColumn } = internalData;
             const taskViewOpts = computeTaskViewOpts.value;
+            const minScale = computeMinScale.value;
+            const scaleStep = computeScaleStep.value;
             const { showNowLine } = taskViewOpts;
             return h('div', {
                 ref: refElem,
@@ -495,17 +497,31 @@ var GanttViewHeaderComponent = 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$1(`vxe.gantt.dayss.w${dateObj.e}`);
+                                if ((isLast || (minScale && (minScale.type === 'date' || minScale.type === 'day') && (type === 'date' || type === 'day'))) && scaleStep > 1) {
+                                    label = getI18n$1(`vxe.gantt.stepFormat.${type}`, {
+                                        start: startDateObj,
+                                        end: endDateObj,
+                                        eStartLabel: getI18n$1(`vxe.gantt.dayss.w${startDateObj.e}`),
+                                        eEndLabel: getI18n$1(`vxe.gantt.dayss.w${endDateObj.e}`)
+                                    });
                                 }
                                 else {
-                                    if ($rowIndex) {
-                                        label = getI18n$1(`vxe.gantt.tSimpleFormat.${type}`, dateObj);
+                                    if (type === 'day') {
+                                        if ($rowIndex) {
+                                            label = getI18n$1(`vxe.gantt.tSimpleFormat.${type}`, {
+                                                eLabel: getI18n$1(`vxe.gantt.dayss.w${dateObj.e}`)
+                                            });
+                                        }
+                                        else {
+                                            label = getI18n$1(`vxe.gantt.tFullFormat.${type}`, {
+                                                eLabel: getI18n$1(`vxe.gantt.dayss.w${dateObj.e}`)
+                                            });
+                                        }
                                     }
                                     else {
-                                        if (isLast && scaleItem.type === 'week') {
+                                        if ($rowIndex) {
                                             label = getI18n$1(`vxe.gantt.tSimpleFormat.${type}`, dateObj);
                                         }
                                         else {
@@ -514,7 +530,17 @@ var GanttViewHeaderComponent = defineVxeComponent({
                                     }
                                 }
                                 let cellVNs = label;
-                                const ctParams = { source: sourceType$4, type: viewType$3, column, scaleObj: scaleItem, title: label, dateObj: dateObj, $rowIndex };
+                                const ctParams = {
+                                    source: sourceType$4,
+                                    type: viewType$3,
+                                    column,
+                                    scaleObj: scaleItem,
+                                    title: label,
+                                    dateObj,
+                                    startDateObj,
+                                    endDateObj,
+                                    $rowIndex
+                                };
                                 if (titleSlot) {
                                     cellVNs = $xeGantt.callSlot(titleSlot, ctParams);
                                 }
@@ -1022,7 +1048,7 @@ var GanttViewBodyComponent = defineVxeComponent({
             const { showNowLine, viewStyle } = taskViewOpts;
             const scaleUnit = computeScaleUnit.value;
             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] || {};
@@ -1066,6 +1092,8 @@ var GanttViewBodyComponent = defineVxeComponent({
                 type: viewType$1,
                 scaleType: scaleUnit,
                 dateObj,
+                startDateObj,
+                endDateObj,
                 row,
                 column,
                 $rowIndex,
@@ -1393,7 +1421,7 @@ var GanttViewComponent = 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': {
@@ -1561,6 +1589,8 @@ var GanttViewComponent = defineVxeComponent({
             const minScale = computeMinScale.value;
             const weekScale = computeWeekScale.value;
             const scaleDateList = computeScaleDateList.value;
+            const scaleStep = computeScaleStep.value;
+            const weekStartDay = weekScale ? weekScale.startDay : undefined;
             const fullCols = [];
             const groupCols = [];
             if (minScale && scaleUnit && scaleDateList.length) {
@@ -1606,65 +1636,88 @@ var GanttViewComponent = defineVxeComponent({
                         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];

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

@@ -35,7 +35,7 @@ export default defineVxeComponent({
             const { showNowLine, viewStyle } = taskViewOpts;
             const scaleUnit = computeScaleUnit.value;
             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] || {};
@@ -79,6 +79,8 @@ export default defineVxeComponent({
                 type: viewType,
                 scaleType: scaleUnit,
                 dateObj,
+                startDateObj,
+                endDateObj,
                 row,
                 column,
                 $rowIndex,

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

@@ -10,7 +10,7 @@ export default defineVxeComponent({
     setup() {
         const $xeGantt = inject('$xeGantt', {});
         const $xeGanttView = inject('$xeGanttView', {});
-        const { computeTaskViewOpts } = $xeGantt.getComputeMaps();
+        const { computeTaskViewOpts, computeScaleStep, computeMinScale } = $xeGantt.getComputeMaps();
         const { reactData, internalData } = $xeGanttView;
         const refElem = ref();
         const refHeaderScroll = ref();
@@ -20,6 +20,8 @@ export default defineVxeComponent({
             const { headerGroups, viewCellWidth } = reactData;
             const { todayDateMaps, visibleColumn } = internalData;
             const taskViewOpts = computeTaskViewOpts.value;
+            const minScale = computeMinScale.value;
+            const scaleStep = computeScaleStep.value;
             const { showNowLine } = taskViewOpts;
             return h('div', {
                 ref: refElem,
@@ -54,17 +56,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 {
@@ -73,7 +89,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);
                                 }

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

@@ -114,7 +114,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': {
@@ -282,6 +282,8 @@ export default defineVxeComponent({
             const minScale = computeMinScale.value;
             const weekScale = computeWeekScale.value;
             const scaleDateList = computeScaleDateList.value;
+            const scaleStep = computeScaleStep.value;
+            const weekStartDay = weekScale ? weekScale.startDay : undefined;
             const fullCols = [];
             const groupCols = [];
             if (minScale && scaleUnit && scaleDateList.length) {
@@ -327,65 +329,88 @@ export default defineVxeComponent({
                         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];

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { setConfig, setIcon } = VxeUI;
-VxeUI.ganttVersion = "4.6.6";
+VxeUI.ganttVersion = "4.6.7";
 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${"4.6.6"}`;
+const ganttVersion = `gantt v${"4.6.7"}`;
 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

@@ -71,7 +71,9 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       } = headerGroups[headerGroups.length - 1] || {};
       const {
         field,
-        dateObj
+        dateObj,
+        startDateObj,
+        endDateObj
       } = column;
       const {
         cellClassName,
@@ -119,6 +121,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         type: viewType,
         scaleType: scaleUnit,
         dateObj,
+        startDateObj,
+        endDateObj,
         row,
         column,
         $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 H=(0,_vue.inject)("$xeGantt",{}),o=(0,_vue.inject)("$xeGanttView",{}),{computeTaskViewOpts:j,computeScaleUnit:z}=H.getComputeMaps(),{reactData:B,internalData:C}=o,r=(0,_vue.ref)(),n=(0,_vue.ref)(),i=(0,_vue.ref)(),u=(0,_vue.ref)(),s=(0,_vue.ref)(),F=(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=B.headerGroups,h=C.todayDateMaps,{showNowLine:x,viewStyle:y}=j.value,_=z.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=u?(0,_util.getCellRestHeight)(g,v,c,p):0,u=[];if(w&&c.resizable){let t={$table:l,$grid:null,$gantt:H,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:[]};u.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:H,source:sourceType,type:viewType,scaleType:_,dateObj:b,row:a,column:t,$rowIndex:r,rowIndex:o,_rowIndex:n};return(0,_vue.h)("td",{key:y||f?m:i,class:["vxe-gantt-view--body-column",{"is--now":x&&h===m},(0,_utils.getClass)(y,D)],style:f?Object.assign({},_xeUtils.default.isFunction(f)?f(D):f,{height:s+"px"}):{height:s+"px"},onClick(e){H.handleTaskCellClickEvent(e,{row:a,column:t})},onDblclick(e){H.handleTaskCellDblclickEvent(e,{row:a,column:t})},onContextmenu(e){H.handleTaskBodyContextmenuEvent(e,D)}},u)},G=(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,C=o.value;t=a.value;let R=t.transform,I=t.children||t.childrenField,T=z.value;l=j.value.viewStyle;let{rowClassName:k,rowStyle:E,cellClassName:S,cellStyle:M}=l||{},{tableColumn:O,scrollYLoad:$}=B,q=[];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)),(C.isHover||p)&&(t.onMouseenter=e=>{d.triggerHoverEvent(e,{row:l,rowIndex:r})},t.onMouseleave=()=>{d.clearHoverRow()}),!C.drag||y||v&&!R||(t.onDragstart=d.handleRowDragDragstartEvent,t.onDragend=d.handleRowDragDragendEvent,t.onDragover=d.handleRowDragDragoverEvent);e={$gantt:H,source:sourceType,type:viewType,scaleType:T,row:l,rowIndex:r,$rowIndex:a,_rowIndex:n};q.push((0,_vue.h)("tr",Object.assign({key:k||E||S||M?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)||void 0:E:void 0},t),O.map((e,t)=>F(d,l,o,r,a,n,e,t))));let u=!1,s=[];!v||$||R||(s=l[I],u=!!g&&s&&0<s.length&&!!m[o]),u&&q.push(...G(d,s))}),q};return(0,_vue.onMounted)(()=>{var e=C.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=C.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}=B;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){H.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?G(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 q=(0,_vue.inject)("$xeGantt",{}),o=(0,_vue.inject)("$xeGanttView",{}),{computeTaskViewOpts:H,computeScaleUnit:z}=q.getComputeMaps(),{reactData:B,internalData:I}=o,r=(0,_vue.ref)(),n=(0,_vue.ref)(),i=(0,_vue.ref)(),u=(0,_vue.ref)(),s=(0,_vue.ref)(),F=(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=B.headerGroups,h=I.todayDateMaps,{showNowLine:x,viewStyle:y}=H.value,_=z.value,g=(g[g.length-1]||{}).scaleItem,{field:m,dateObj:b,startDateObj:D,endDateObj:f}=t,{cellClassName:y,cellStyle:C}=y||{},h=x&&g?h[g.type]:null,g=s[e]||{},s=u?(0,_util.getCellRestHeight)(g,v,c,p):0,u=[];if(w&&c.resizable){let t={$table:l,$grid:null,$gantt:q,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:[]};u.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 R={$gantt:q,source:sourceType,type:viewType,scaleType:_,dateObj:b,startDateObj:D,endDateObj:f,row:a,column:t,$rowIndex:r,rowIndex:o,_rowIndex:n};return(0,_vue.h)("td",{key:y||C?m:i,class:["vxe-gantt-view--body-column",{"is--now":x&&h===m},(0,_utils.getClass)(y,R)],style:C?Object.assign({},_xeUtils.default.isFunction(C)?C(R):C,{height:s+"px"}):{height:s+"px"},onClick(e){q.handleTaskCellClickEvent(e,{row:a,column:t})},onDblclick(e){q.handleTaskCellDblclickEvent(e,{row:a,column:t})},onContextmenu(e){q.handleTaskBodyContextmenuEvent(e,R)}},u)},G=(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 D=t.value,f=l.value,C=o.value;t=a.value;let R=t.transform,I=t.children||t.childrenField,T=z.value;l=H.value.viewStyle;let{rowClassName:k,rowStyle:O,cellClassName:E,cellStyle:S}=l||{},{tableColumn:M,scrollYLoad:$}=B,j=[];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)),(C.isHover||p)&&(t.onMouseenter=e=>{d.triggerHoverEvent(e,{row:l,rowIndex:r})},t.onMouseleave=()=>{d.clearHoverRow()}),!C.drag||y||v&&!R||(t.onDragstart=d.handleRowDragDragstartEvent,t.onDragend=d.handleRowDragDragendEvent,t.onDragover=d.handleRowDragDragoverEvent);e={$gantt:q,source:sourceType,type:viewType,scaleType:T,row:l,rowIndex:r,$rowIndex:a,_rowIndex:n};j.push((0,_vue.h)("tr",Object.assign({key:k||O||E||S?o:a,class:["vxe-gantt-view--body-row",{"row--stripe":c&&(n+1)%2==0,"is--new":i,"row--radio":D.highlight&&d.eqRow(h,l),"row--checked":f.highlight&&d.isCheckedByCheckboxRow(l),"row--pending":!!x&&!!b[o]},(0,_utils.getClass)(k,e)],rowid:o,style:O?_xeUtils.default.isFunction(O)?O(e)||void 0:O:void 0},t),M.map((e,t)=>F(d,l,o,r,a,n,e,t))));let u=!1,s=[];!v||$||R||(s=l[I],u=!!g&&s&&0<s.length&&!!m[o]),u&&j.push(...G(d,s))}),j};return(0,_vue.onMounted)(()=>{var e=I.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=I.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}=B;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){q.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?G(e,t):[])]),(0,_vue.h)(_ganttChart.default)])])}}});

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

@@ -20,7 +20,9 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     const $xeGantt = (0, _vue.inject)('$xeGantt', {});
     const $xeGanttView = (0, _vue.inject)('$xeGanttView', {});
     const {
-      computeTaskViewOpts
+      computeTaskViewOpts,
+      computeScaleStep,
+      computeMinScale
     } = $xeGantt.getComputeMaps();
     const {
       reactData,
@@ -40,6 +42,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         visibleColumn
       } = internalData;
       const taskViewOpts = computeTaskViewOpts.value;
+      const minScale = computeMinScale.value;
+      const scaleStep = computeScaleStep.value;
       const {
         showNowLine
       } = taskViewOpts;
@@ -83,16 +87,31 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           const {
             field,
             childCount,
-            dateObj
+            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 {
                 label = getI18n(`vxe.gantt.tFullFormat.${type}`, dateObj);
@@ -106,7 +125,9 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             column,
             scaleObj: scaleItem,
             title: label,
-            dateObj: dateObj,
+            dateObj,
+            startDateObj,
+            endDateObj,
             $rowIndex
           };
           if (titleSlot) {

package/lib/gantt/src/gantt-header.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"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let getI18n=_core.VxeUI.getI18n,sourceType="gantt",viewType="header";var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewHeader",setup(){let f=(0,_vue.inject)("$xeGantt",{}),t=(0,_vue.inject)("$xeGanttView",{}),n=f.getComputeMaps().computeTaskViewOpts,{reactData:u,internalData:o}=t,i=(0,_vue.ref)(),v=(0,_vue.ref)(),s=(0,_vue.ref)(),d=(0,_vue.ref)();return(0,_vue.onMounted)(()=>{var e=o.elemStore,t="main-header-";e[t+"wrapper"]=i,e[t+"scroll"]=v,e[t+"table"]=s,e[t+"xSpace"]=d}),(0,_vue.onUnmounted)(()=>{var e=o.elemStore,t="main-header-";e[t+"wrapper"]=null,e[t+"scroll"]=null,e[t+"table"]=null,e[t+"xSpace"]=null}),()=>{let{headerGroups:l,viewCellWidth:a}=u,{todayDateMaps:r,visibleColumn:e}=o;let w=n.value.showNowLine;return(0,_vue.h)("div",{ref:i,class:"vxe-gantt-view--header-wrapper"},[(0,_vue.h)("div",{ref:v,class:"vxe-gantt-view--header-inner-wrapper",onScroll:t.triggerHeaderScrollEvent},[(0,_vue.h)("div",{ref:d,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:s,class:"vxe-gantt-view--header-table"},[(0,_vue.h)("colgroup",{},e.map((e,t)=>(0,_vue.h)("col",{key:t,style:{width:a+"px"}}))),(0,_vue.h)("thead",{},l.map(({scaleItem:v,columns:e},s)=>{let{type:d,titleFormat:p,titleMethod:c,headerCellStyle:_,slots:t}=v,x=t?t.title:null,h=s===l.length-1,m=h&&w?r[d]:null;return(0,_vue.h)("tr",{key:s},e.map((e,t)=>{var{field:l,childCount:a,dateObj:r}=e;let n=""+e.title,u=n="day"===v.type?getI18n("vxe.gantt.dayss.w"+r.e):s||h&&"week"===v.type?getI18n("vxe.gantt.tSimpleFormat."+d,r):getI18n("vxe.gantt.tFullFormat."+d,r),o={source:sourceType,type:viewType,column:e,scaleObj:v,title:n,dateObj:r,$rowIndex:s},i=(x?u=f.callSlot(x,o):c?u=""+c(o):p&&(u=_xeUtils.default.toDateString(r.date,p)),{});return _&&(i=_xeUtils.default.isFunction(_)?_(o)||null:_),(0,_vue.h)("th",{key:t,class:["vxe-gantt-view--header-column",{"is--now":w&&m&&m===l}],colspan:a||null,title:x?null:n,style:i||void 0,onContextmenu(e){f.handleTaskHeaderContextmenuEvent(e,o)}},u)}))}))])])])}}});
+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"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let getI18n=_core.VxeUI.getI18n,sourceType="gantt",viewType="header";var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewHeader",setup(){let S=(0,_vue.inject)("$xeGantt",{}),n=(0,_vue.inject)("$xeGanttView",{}),{computeTaskViewOpts:u,computeScaleStep:o,computeMinScale:i}=S.getComputeMaps(),{reactData:v,internalData:s}=n,d=(0,_vue.ref)(),p=(0,_vue.ref)(),c=(0,_vue.ref)(),x=(0,_vue.ref)();return(0,_vue.onMounted)(()=>{var e=s.elemStore,t="main-header-";e[t+"wrapper"]=d,e[t+"scroll"]=p,e[t+"table"]=c,e[t+"xSpace"]=x}),(0,_vue.onUnmounted)(()=>{var e=s.elemStore,t="main-header-";e[t+"wrapper"]=null,e[t+"scroll"]=null,e[t+"table"]=null,e[t+"xSpace"]=null}),()=>{let{headerGroups:a,viewCellWidth:l}=v,{todayDateMaps:r,visibleColumn:e}=s;var t=u.value;let w=i.value,f=o.value,b=t.showNowLine;return(0,_vue.h)("div",{ref:d,class:"vxe-gantt-view--header-wrapper"},[(0,_vue.h)("div",{ref:p,class:"vxe-gantt-view--header-inner-wrapper",onScroll:n.triggerHeaderScrollEvent},[(0,_vue.h)("div",{ref:x,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:c,class:"vxe-gantt-view--header-table"},[(0,_vue.h)("colgroup",{},e.map((e,t)=>(0,_vue.h)("col",{key:t,style:{width:l+"px"}}))),(0,_vue.h)("thead",{},a.map(({scaleItem:d,columns:e},p)=>{let{type:c,titleFormat:x,titleMethod:m,headerCellStyle:_,slots:t}=d,g=t?t.title:null,h=p===a.length-1,y=h&&b?r[c]:null;return(0,_vue.h)("tr",{key:p},e.map((e,t)=>{var{field:a,childCount:l,dateObj:r,startDateObj:n,endDateObj:u}=e;let o=""+e.title,i=o=(h||w&&("date"===w.type||"day"===w.type)&&("date"===c||"day"===c))&&1<f?getI18n("vxe.gantt.stepFormat."+c,{start:n,end:u,eStartLabel:getI18n("vxe.gantt.dayss.w"+n.e),eEndLabel:getI18n("vxe.gantt.dayss.w"+u.e)}):"day"===c?p?getI18n("vxe.gantt.tSimpleFormat."+c,{eLabel:getI18n("vxe.gantt.dayss.w"+r.e)}):getI18n("vxe.gantt.tFullFormat."+c,{eLabel:getI18n("vxe.gantt.dayss.w"+r.e)}):p?getI18n("vxe.gantt.tSimpleFormat."+c,r):getI18n("vxe.gantt.tFullFormat."+c,r),v={source:sourceType,type:viewType,column:e,scaleObj:d,title:o,dateObj:r,startDateObj:n,endDateObj:u,$rowIndex:p},s=(g?i=S.callSlot(g,v):m?i=""+m(v):x&&(i=_xeUtils.default.toDateString(r.date,x)),{});return _&&(s=_xeUtils.default.isFunction(_)?_(v)||null:_),(0,_vue.h)("th",{key:t,class:["vxe-gantt-view--header-column",{"is--now":b&&y&&y===a}],colspan:l||null,title:g?null:o,style:s||void 0,onContextmenu(e){S.handleTaskHeaderContextmenuEvent(e,v)}},i)}))}))])])])}}});