vxe-gantt 3.1.3 → 3.1.5

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

@@ -200,7 +200,7 @@ export default defineVxeComponent({
                         },
                         getClass(rowClassName, rowParams)
                     ],
-                    style: rowStyle ? XEUtils.isFunction(rowStyle) ? rowStyle(rowParams) : rowStyle : undefined,
+                    style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(rowParams) || undefined : rowStyle) : undefined,
                     attrs: {
                         rowid
                     },

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

@@ -96,7 +96,7 @@ export default defineVxeComponent({
                                 let cellStys = {};
                                 if (headerCellStyle) {
                                     if (XEUtils.isFunction(headerCellStyle)) {
-                                        cellStys = headerCellStyle(ctParams);
+                                        cellStys = headerCellStyle(ctParams) || null;
                                     }
                                     else {
                                         cellStys = headerCellStyle;
@@ -111,7 +111,7 @@ export default defineVxeComponent({
                                         colspan: childCount || null,
                                         title: titleSlot ? null : label
                                     },
-                                    style: cellStys,
+                                    style: cellStys || undefined,
                                     on: {
                                         contextmenu(evnt) {
                                             $xeGantt.handleTaskHeaderContextmenuEvent(evnt, ctParams);

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

@@ -1,6 +1,6 @@
 import { defineVxeComponent } from '../../ui/src/comp';
 import { VxeUI } from '@vxe-ui/core';
-import { setScrollTop, setScrollLeft, removeClass, addClass } from '../../ui/src/dom';
+import { setScrollTop, setScrollLeft, removeClass, addClass, hasClass } from '../../ui/src/dom';
 import { getRefElem, getStandardGapTime } from './util';
 import XEUtils from 'xe-utils';
 import GanttViewHeaderComponent from './gantt-header';
@@ -120,12 +120,13 @@ function handleColumnHeader($xeGanttView) {
         };
         for (let i = 0; i < scaleDateList.length; i++) {
             const itemDate = scaleDateList[i];
-            const [yyyy, MM, dd, HH, mm, ss] = XEUtils.toDateString(itemDate, 'yyyy-M-d-H-m-s').split('-');
+            const [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 E = e + 1;
             const q = Math.ceil((itemDate.getMonth() + 1) / 3);
-            const W = XEUtils.getYearWeek(itemDate, weekScale ? weekScale.startDay : undefined);
-            const dateObj = { date: itemDate, yy: yyyy, M: MM, d: dd, H: HH, m: mm, s: ss, q, W, E, e };
+            const W = `${XEUtils.getYearWeek(itemDate, weekScale ? weekScale.startDay : undefined)}`;
+            const WW = XEUtils.padStart(W, 2, '0');
+            const dateObj = { date: itemDate, yy, yyyy, M, MM, d, dd, H, HH, m, mm, s, ss, q, W, WW, E, e };
             const colMaps = {
                 year: {
                     field: yyyy,
@@ -256,7 +257,7 @@ function createChartRender($xeGanttView, fullCols) {
                 const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                 return {
                     offsetLeftSize,
-                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                 };
             };
         }
@@ -279,7 +280,7 @@ function createChartRender($xeGanttView, fullCols) {
                 const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                 return {
                     offsetLeftSize,
-                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                 };
             };
         }
@@ -302,7 +303,7 @@ function createChartRender($xeGanttView, fullCols) {
                 const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                 return {
                     offsetLeftSize,
-                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                 };
             };
         }
@@ -325,7 +326,7 @@ function createChartRender($xeGanttView, fullCols) {
                 const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                 return {
                     offsetLeftSize,
-                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                 };
             };
         }
@@ -349,7 +350,7 @@ function createChartRender($xeGanttView, fullCols) {
                 const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                 return {
                     offsetLeftSize,
-                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                 };
             };
         }
@@ -372,7 +373,7 @@ function createChartRender($xeGanttView, fullCols) {
                 const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                 return {
                     offsetLeftSize,
-                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                 };
             };
         }
@@ -395,7 +396,7 @@ function createChartRender($xeGanttView, fullCols) {
                 const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                 return {
                     offsetLeftSize,
-                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                    offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                 };
             };
         }
@@ -578,7 +579,7 @@ function updateChart($xeGanttView) {
     if (chartWrapper) {
         XEUtils.arrayEach(chartWrapper.children, (rowEl) => {
             const barEl = rowEl.children[0];
-            if (!barEl) {
+            if (!barEl || hasClass(barEl, 'is--drag')) {
                 return;
             }
             const rowid = rowEl.getAttribute('rowid');
@@ -1114,17 +1115,20 @@ export default defineVxeComponent({
             const $xeGantt = $xeGanttView.$xeGantt;
             const reactData = $xeGanttView.reactData;
             const { minViewDate, maxViewDate } = reactData;
+            const taskViewOpts = $xeGantt.computeTaskViewOpts;
             const minScale = $xeGantt.computeMinScale;
+            const { gridding } = taskViewOpts;
             const dateList = [];
             if (!minViewDate || !maxViewDate) {
                 return dateList;
             }
-            const startTime = minViewDate.getTime();
-            const endTime = maxViewDate.getTime();
+            const leftSize = -XEUtils.toNumber(gridding ? gridding.leftSpacing || 0 : 0);
+            const rightSize = XEUtils.toNumber(gridding ? gridding.rightSpacing || 0 : 0);
             switch (minScale.type) {
                 case 'year': {
-                    let currDate = XEUtils.getWhatYear(minViewDate, 0, 'first');
-                    while (currDate <= maxViewDate) {
+                    let currDate = XEUtils.getWhatYear(minViewDate, leftSize, 'first');
+                    const endDate = XEUtils.getWhatYear(maxViewDate, rightSize, 'first');
+                    while (currDate <= endDate) {
                         const itemDate = currDate;
                         dateList.push(itemDate);
                         currDate = XEUtils.getWhatYear(currDate, 1);
@@ -1132,8 +1136,9 @@ export default defineVxeComponent({
                     break;
                 }
                 case 'quarter': {
-                    let currDate = XEUtils.getWhatQuarter(minViewDate, 0, 'first');
-                    while (currDate <= maxViewDate) {
+                    let currDate = XEUtils.getWhatQuarter(minViewDate, leftSize, 'first');
+                    const endDate = XEUtils.getWhatQuarter(maxViewDate, rightSize, 'first');
+                    while (currDate <= endDate) {
                         const itemDate = currDate;
                         dateList.push(itemDate);
                         currDate = XEUtils.getWhatQuarter(currDate, 1);
@@ -1141,8 +1146,9 @@ export default defineVxeComponent({
                     break;
                 }
                 case 'month': {
-                    let currDate = XEUtils.getWhatMonth(minViewDate, 0, 'first');
-                    while (currDate <= maxViewDate) {
+                    let currDate = XEUtils.getWhatMonth(minViewDate, leftSize, 'first');
+                    const endDate = XEUtils.getWhatMonth(maxViewDate, rightSize, 'first');
+                    while (currDate <= endDate) {
                         const itemDate = currDate;
                         dateList.push(itemDate);
                         currDate = XEUtils.getWhatMonth(currDate, 1);
@@ -1150,8 +1156,9 @@ export default defineVxeComponent({
                     break;
                 }
                 case 'week': {
-                    let currDate = XEUtils.getWhatWeek(minViewDate, 0, minScale.startDay, minScale.startDay);
-                    while (currDate <= maxViewDate) {
+                    let currDate = XEUtils.getWhatWeek(minViewDate, leftSize, minScale.startDay, minScale.startDay);
+                    const endDate = XEUtils.getWhatWeek(maxViewDate, rightSize, minScale.startDay, minScale.startDay);
+                    while (currDate <= endDate) {
                         const itemDate = currDate;
                         dateList.push(itemDate);
                         currDate = XEUtils.getWhatWeek(currDate, 1);
@@ -1159,12 +1166,22 @@ export default defineVxeComponent({
                     break;
                 }
                 case 'day':
-                case 'date':
+                case 'date': {
+                    let currDate = XEUtils.getWhatDay(minViewDate, leftSize, 'first');
+                    const endDate = XEUtils.getWhatDay(maxViewDate, rightSize, 'first');
+                    while (currDate <= endDate) {
+                        const itemDate = currDate;
+                        dateList.push(itemDate);
+                        currDate = XEUtils.getWhatDay(currDate, 1);
+                    }
+                    break;
+                }
                 case 'hour':
                 case 'minute':
                 case 'second': {
                     const gapTime = getStandardGapTime(minScale.type);
-                    let currTime = startTime;
+                    let currTime = minViewDate.getTime() + (leftSize * gapTime);
+                    const endTime = maxViewDate.getTime() + (rightSize * gapTime);
                     while (currTime <= endTime) {
                         const itemDate = new Date(currTime);
                         dateList.push(itemDate);

package/es/gantt/src/gantt.js

@@ -61,7 +61,8 @@ function createInternalData() {
     return {
         uFoot: false,
         resizeTableWidth: 0
-        // barTipTimeout: undefined
+        // barTipTimeout: null
+        // dragBarRow: null
     };
 }
 export default {

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI } from '@vxe-ui/core';
 import { errLog } from './src/log';
 const { setConfig, setIcon, checkVersion } = VxeUI;
-VxeUI.ganttVersion = "3.1.3";
+VxeUI.ganttVersion = "3.1.5";
 const ymdFormat = 'yyyy-MM-dd';
 const ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({
@@ -76,7 +76,11 @@ setConfig({
             }
         },
         taskViewConfig: {
-            showNowLine: true
+            showNowLine: true,
+            gridding: {
+            // leftSpacing: 0,
+            // rightSpacing: 0
+            }
         },
         taskSplitConfig: {
             enabled: true,

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

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

@@ -234,7 +234,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
             'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
           }, (0, _utils.getClass)(rowClassName, rowParams)],
-          style: rowStyle ? _xeUtils.default.isFunction(rowStyle) ? rowStyle(rowParams) : rowStyle : undefined,
+          style: rowStyle ? _xeUtils.default.isFunction(rowStyle) ? rowStyle(rowParams) || undefined : rowStyle : undefined,
           attrs: {
             rowid: rowid
           },

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,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)}});
+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=0<(w?p.resizeHeight:0),w=(0,_util.getCellRestHeight)(p,m,v,t.computeDefaultRowHeight),p=[],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:[]},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:h?Object.assign({},_xeUtils.default.isFunction(h)?h(C):h,{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,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,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||h||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(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},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-header.js

@@ -111,7 +111,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           var cellStys = {};
           if (headerCellStyle) {
             if (_xeUtils.default.isFunction(headerCellStyle)) {
-              cellStys = headerCellStyle(ctParams);
+              cellStys = headerCellStyle(ctParams) || null;
             } else {
               cellStys = headerCellStyle;
             }
@@ -125,7 +125,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
               colspan: childCount || null,
               title: titleSlot ? null : label
             },
-            style: cellStys,
+            style: cellStys || undefined,
             on: {
               contextmenu: function contextmenu(evnt) {
                 $xeGantt.handleTaskHeaderContextmenuEvent(evnt, ctParams);

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,r=t.headerGroups,n=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(n,"px")}})})),h("thead",{},r.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,x=t?t.title:null,v=i===r.length-1,m=v&&y?l[s]:null;return h("tr",{key:i},e.map(function(e,t){var a=e.field,r=e.childCount,n=e.dateObj,l="".concat(e.title),o=l="day"===u.type?getI18n("vxe.gantt.dayss.w".concat(n.e)):i||v&&"week"===u.type?getI18n("vxe.gantt.tSimpleFormat.".concat(s),n):getI18n("vxe.gantt.tFullFormat.".concat(s),n),c={source:sourceType,type:viewType,column:e,scaleObj:u,title:l,dateObj:n,$rowIndex:i},e=(x?o=w.callSlot(x,c,h):p?o="".concat(p(c)):d&&(o=_xeUtils.default.toDateString(n.date,d)),{});return f&&(e=_xeUtils.default.isFunction(f)?f(c):f),h("th",{key:t,class:["vxe-gantt-view--header-column",{"is--now":y&&m&&m===a}],attrs:{colspan:r||null,title:x?null:l},style:e,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 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)}});

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

@@ -142,28 +142,42 @@ function handleColumnHeader($xeGanttView) {
     };
     for (var i = 0; i < scaleDateList.length; i++) {
       var itemDate = scaleDateList[i];
-      var _XEUtils$toDateString3 = _xeUtils.default.toDateString(itemDate, 'yyyy-M-d-H-m-s').split('-'),
-        _XEUtils$toDateString4 = _slicedToArray(_XEUtils$toDateString3, 6),
-        yyyy = _XEUtils$toDateString4[0],
-        MM = _XEUtils$toDateString4[1],
-        dd = _XEUtils$toDateString4[2],
-        HH = _XEUtils$toDateString4[3],
-        mm = _XEUtils$toDateString4[4],
-        ss = _XEUtils$toDateString4[5];
+      var _XEUtils$toDateString3 = _xeUtils.default.toDateString(itemDate, '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],
+        M = _XEUtils$toDateString4[2],
+        MM = _XEUtils$toDateString4[3],
+        d = _XEUtils$toDateString4[4],
+        dd = _XEUtils$toDateString4[5],
+        H = _XEUtils$toDateString4[6],
+        HH = _XEUtils$toDateString4[7],
+        m = _XEUtils$toDateString4[8],
+        mm = _XEUtils$toDateString4[9],
+        s = _XEUtils$toDateString4[10],
+        ss = _XEUtils$toDateString4[11];
       var e = itemDate.getDay();
       var E = e + 1;
       var q = Math.ceil((itemDate.getMonth() + 1) / 3);
-      var W = _xeUtils.default.getYearWeek(itemDate, weekScale ? weekScale.startDay : undefined);
+      var W = "".concat(_xeUtils.default.getYearWeek(itemDate, weekScale ? weekScale.startDay : undefined));
+      var WW = _xeUtils.default.padStart(W, 2, '0');
       var dateObj = {
         date: itemDate,
-        yy: yyyy,
-        M: MM,
-        d: dd,
-        H: HH,
-        m: mm,
-        s: ss,
+        yy: yy,
+        yyyy: yyyy,
+        M: M,
+        MM: MM,
+        d: d,
+        dd: dd,
+        H: H,
+        HH: HH,
+        m: m,
+        mm: mm,
+        s: s,
+        ss: ss,
         q: q,
         W: W,
+        WW: WW,
         E: E,
         e: e
       };
@@ -299,7 +313,7 @@ function createChartRender($xeGanttView, fullCols) {
           var offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
           return {
             offsetLeftSize: offsetLeftSize,
-            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
           };
         };
       }
@@ -324,7 +338,7 @@ function createChartRender($xeGanttView, fullCols) {
           var offsetLeftSize = (_indexMaps[startStr] || 0) + subtract;
           return {
             offsetLeftSize: offsetLeftSize,
-            offsetWidthSize: (_indexMaps[endStr] || 0) - offsetLeftSize + addSize
+            offsetWidthSize: (_indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
           };
         };
       }
@@ -349,7 +363,7 @@ function createChartRender($xeGanttView, fullCols) {
           var offsetLeftSize = (_indexMaps2[startStr] || 0) + subtract;
           return {
             offsetLeftSize: offsetLeftSize,
-            offsetWidthSize: (_indexMaps2[endStr] || 0) - offsetLeftSize + addSize
+            offsetWidthSize: (_indexMaps2[endStr] || 0) - offsetLeftSize + addSize + 1
           };
         };
       }
@@ -380,7 +394,7 @@ function createChartRender($xeGanttView, fullCols) {
           var offsetLeftSize = (_indexMaps3[startStr] || 0) + subtract;
           return {
             offsetLeftSize: offsetLeftSize,
-            offsetWidthSize: (_indexMaps3[endStr] || 0) - offsetLeftSize + addSize
+            offsetWidthSize: (_indexMaps3[endStr] || 0) - offsetLeftSize + addSize + 1
           };
         };
       }
@@ -406,7 +420,7 @@ function createChartRender($xeGanttView, fullCols) {
           var offsetLeftSize = (_indexMaps4[startStr] || 0) + subtract;
           return {
             offsetLeftSize: offsetLeftSize,
-            offsetWidthSize: (_indexMaps4[endStr] || 0) - offsetLeftSize + addSize
+            offsetWidthSize: (_indexMaps4[endStr] || 0) - offsetLeftSize + addSize + 1
           };
         };
       }
@@ -431,7 +445,7 @@ function createChartRender($xeGanttView, fullCols) {
           var offsetLeftSize = (_indexMaps5[startStr] || 0) + subtract;
           return {
             offsetLeftSize: offsetLeftSize,
-            offsetWidthSize: (_indexMaps5[endStr] || 0) - offsetLeftSize + addSize
+            offsetWidthSize: (_indexMaps5[endStr] || 0) - offsetLeftSize + addSize + 1
           };
         };
       }
@@ -456,7 +470,7 @@ function createChartRender($xeGanttView, fullCols) {
           var offsetLeftSize = (_indexMaps6[startStr] || 0) + subtract;
           return {
             offsetLeftSize: offsetLeftSize,
-            offsetWidthSize: (_indexMaps6[endStr] || 0) - offsetLeftSize + addSize
+            offsetWidthSize: (_indexMaps6[endStr] || 0) - offsetLeftSize + addSize + 1
           };
         };
       }
@@ -655,7 +669,7 @@ function updateChart($xeGanttView) {
   if (chartWrapper) {
     _xeUtils.default.arrayEach(chartWrapper.children, function (rowEl) {
       var barEl = rowEl.children[0];
-      if (!barEl) {
+      if (!barEl || (0, _dom.hasClass)(barEl, 'is--drag')) {
         return;
       }
       var rowid = rowEl.getAttribute('rowid');
@@ -1212,18 +1226,21 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       var reactData = $xeGanttView.reactData;
       var minViewDate = reactData.minViewDate,
         maxViewDate = reactData.maxViewDate;
+      var taskViewOpts = $xeGantt.computeTaskViewOpts;
       var minScale = $xeGantt.computeMinScale;
+      var gridding = taskViewOpts.gridding;
       var dateList = [];
       if (!minViewDate || !maxViewDate) {
         return dateList;
       }
-      var startTime = minViewDate.getTime();
-      var endTime = maxViewDate.getTime();
+      var leftSize = -_xeUtils.default.toNumber(gridding ? gridding.leftSpacing || 0 : 0);
+      var rightSize = _xeUtils.default.toNumber(gridding ? gridding.rightSpacing || 0 : 0);
       switch (minScale.type) {
         case 'year':
           {
-            var currDate = _xeUtils.default.getWhatYear(minViewDate, 0, 'first');
-            while (currDate <= maxViewDate) {
+            var currDate = _xeUtils.default.getWhatYear(minViewDate, leftSize, 'first');
+            var endDate = _xeUtils.default.getWhatYear(maxViewDate, rightSize, 'first');
+            while (currDate <= endDate) {
               var itemDate = currDate;
               dateList.push(itemDate);
               currDate = _xeUtils.default.getWhatYear(currDate, 1);
@@ -1232,8 +1249,9 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           }
         case 'quarter':
           {
-            var _currDate = _xeUtils.default.getWhatQuarter(minViewDate, 0, 'first');
-            while (_currDate <= maxViewDate) {
+            var _currDate = _xeUtils.default.getWhatQuarter(minViewDate, leftSize, 'first');
+            var _endDate = _xeUtils.default.getWhatQuarter(maxViewDate, rightSize, 'first');
+            while (_currDate <= _endDate) {
               var _itemDate = _currDate;
               dateList.push(_itemDate);
               _currDate = _xeUtils.default.getWhatQuarter(_currDate, 1);
@@ -1242,8 +1260,9 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           }
         case 'month':
           {
-            var _currDate2 = _xeUtils.default.getWhatMonth(minViewDate, 0, 'first');
-            while (_currDate2 <= maxViewDate) {
+            var _currDate2 = _xeUtils.default.getWhatMonth(minViewDate, leftSize, 'first');
+            var _endDate2 = _xeUtils.default.getWhatMonth(maxViewDate, rightSize, 'first');
+            while (_currDate2 <= _endDate2) {
               var _itemDate2 = _currDate2;
               dateList.push(_itemDate2);
               _currDate2 = _xeUtils.default.getWhatMonth(_currDate2, 1);
@@ -1252,8 +1271,9 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           }
         case 'week':
           {
-            var _currDate3 = _xeUtils.default.getWhatWeek(minViewDate, 0, minScale.startDay, minScale.startDay);
-            while (_currDate3 <= maxViewDate) {
+            var _currDate3 = _xeUtils.default.getWhatWeek(minViewDate, leftSize, minScale.startDay, minScale.startDay);
+            var _endDate3 = _xeUtils.default.getWhatWeek(maxViewDate, rightSize, minScale.startDay, minScale.startDay);
+            while (_currDate3 <= _endDate3) {
               var _itemDate3 = _currDate3;
               dateList.push(_itemDate3);
               _currDate3 = _xeUtils.default.getWhatWeek(_currDate3, 1);
@@ -1262,15 +1282,26 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           }
         case 'day':
         case 'date':
+          {
+            var _currDate4 = _xeUtils.default.getWhatDay(minViewDate, leftSize, 'first');
+            var _endDate4 = _xeUtils.default.getWhatDay(maxViewDate, rightSize, 'first');
+            while (_currDate4 <= _endDate4) {
+              var _itemDate4 = _currDate4;
+              dateList.push(_itemDate4);
+              _currDate4 = _xeUtils.default.getWhatDay(_currDate4, 1);
+            }
+            break;
+          }
         case 'hour':
         case 'minute':
         case 'second':
           {
             var gapTime = (0, _util.getStandardGapTime)(minScale.type);
-            var currTime = startTime;
+            var currTime = minViewDate.getTime() + leftSize * gapTime;
+            var endTime = maxViewDate.getTime() + rightSize * gapTime;
             while (currTime <= endTime) {
-              var _itemDate4 = new Date(currTime);
-              dateList.push(_itemDate4);
+              var _itemDate5 = new Date(currTime);
+              dateList.push(_itemDate5);
               currTime += gapTime;
             }
             break;