vxe-gantt 4.1.3 → 4.1.5

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

@@ -185,7 +185,7 @@ export default defineVxeComponent({
                             'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
                         },
                         getClass(rowClassName, rowParams)
-                    ], rowid, style: rowStyle ? XEUtils.isFunction(rowStyle) ? rowStyle(rowParams) : rowStyle : undefined }, trOns), tableColumn.map((column, $columnIndex) => renderColumn($xeTable, row, rowid, rowIndex, $rowIndex, _rowIndex, column, $columnIndex))));
+                    ], rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(rowParams) || undefined : rowStyle) : undefined }, trOns), tableColumn.map((column, $columnIndex) => renderColumn($xeTable, row, rowid, rowIndex, $rowIndex, _rowIndex, column, $columnIndex))));
                 let isExpandTree = false;
                 let rowChildren = [];
                 if (treeConfig && !scrollYLoad && !transform) {

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

@@ -12,6 +12,7 @@ export default defineVxeComponent({
     setup() {
         const $xeGantt = inject('$xeGantt', {});
         const $xeGanttView = inject('$xeGanttView', {});
+        const { internalData: ganttInternalData } = $xeGantt;
         const { reactData, internalData } = $xeGanttView;
         const { computeProgressField, computeTitleField, computeTaskBarOpts, computeScaleUnit } = $xeGantt.getComputeMaps();
         const refElem = ref();
@@ -84,13 +85,19 @@ export default defineVxeComponent({
             };
             if (showTooltip) {
                 ons.onMouseover = (evnt) => {
+                    const { dragBarRow } = ganttInternalData;
                     const ttParams = Object.assign({ $event: evnt }, ctParams);
-                    $xeGantt.triggerTaskBarTooltipEvent(evnt, ttParams);
+                    if (!dragBarRow) {
+                        $xeGantt.triggerTaskBarTooltipEvent(evnt, ttParams);
+                    }
                     $xeGantt.dispatchEvent('task-bar-mouseenter', ttParams, evnt);
                 };
                 ons.onMouseleave = (evnt) => {
+                    const { dragBarRow } = ganttInternalData;
                     const ttParams = Object.assign({ $event: evnt }, ctParams);
-                    $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, ttParams);
+                    if (!dragBarRow) {
+                        $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, ttParams);
+                    }
                     $xeGantt.dispatchEvent('task-bar-mouseleave', ttParams, evnt);
                 };
             }

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

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

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

@@ -42,7 +42,8 @@ export default defineVxeComponent({
     setup(props, context) {
         const xID = XEUtils.uniqueId();
         const $xeGantt = inject('$xeGantt', {});
-        const { computeTaskOpts, computeStartField, computeEndField, computeScrollbarOpts, computeScrollbarXToTop, computeScrollbarYToLeft, computeScaleUnit, computeWeekScale, computeMinScale } = $xeGantt.getComputeMaps();
+        const { internalData: ganttInternalData } = $xeGantt;
+        const { computeTaskOpts, computeTaskViewOpts, computeStartField, computeEndField, computeScrollbarOpts, computeScrollbarXToTop, computeScrollbarYToLeft, computeScaleUnit, computeWeekScale, computeMinScale } = $xeGantt.getComputeMaps();
         const refElem = ref();
         const refScrollXVirtualElem = ref();
         const refScrollYVirtualElem = ref();
@@ -93,17 +94,20 @@ export default defineVxeComponent({
         };
         const computeScaleDateList = computed(() => {
             const { minViewDate, maxViewDate } = reactData;
+            const taskViewOpts = computeTaskViewOpts.value;
             const minScale = computeMinScale.value;
+            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);
@@ -111,8 +115,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);
@@ -120,8 +125,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);
@@ -129,8 +135,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);
@@ -138,12 +145,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);
@@ -246,12 +263,13 @@ export default defineVxeComponent({
                 };
                 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,
@@ -380,7 +398,7 @@ export default defineVxeComponent({
                         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                         return {
                             offsetLeftSize,
-                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                         };
                     };
                 }
@@ -403,7 +421,7 @@ export default defineVxeComponent({
                         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                         return {
                             offsetLeftSize,
-                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                         };
                     };
                 }
@@ -426,7 +444,7 @@ export default defineVxeComponent({
                         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                         return {
                             offsetLeftSize,
-                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                         };
                     };
                 }
@@ -449,7 +467,7 @@ export default defineVxeComponent({
                         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                         return {
                             offsetLeftSize,
-                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                         };
                     };
                 }
@@ -473,7 +491,7 @@ export default defineVxeComponent({
                         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                         return {
                             offsetLeftSize,
-                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                         };
                     };
                 }
@@ -496,7 +514,7 @@ export default defineVxeComponent({
                         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                         return {
                             offsetLeftSize,
-                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                         };
                     };
                 }
@@ -519,7 +537,7 @@ export default defineVxeComponent({
                         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
                         return {
                             offsetLeftSize,
-                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                            offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
                         };
                     };
                 }
@@ -687,16 +705,21 @@ export default defineVxeComponent({
             }
         };
         const updateChart = () => {
+            const { dragBarRow } = ganttInternalData;
             const { viewCellWidth } = reactData;
             const { elemStore, chartMaps } = internalData;
+            const $xeTable = internalData.xeTable;
             const chartWrapper = getRefElem(elemStore['main-chart-wrapper']);
-            if (chartWrapper) {
+            if (chartWrapper && $xeTable) {
                 XEUtils.arrayEach(chartWrapper.children, (rowEl) => {
                     const barEl = rowEl.children[0];
                     if (!barEl) {
                         return;
                     }
                     const rowid = rowEl.getAttribute('rowid');
+                    if (dragBarRow && $xeTable.getRowid(dragBarRow) === rowid) {
+                        return;
+                    }
                     const rowRest = rowid ? chartMaps[rowid] : null;
                     barEl.style.left = `${rowRest ? viewCellWidth * rowRest.oLeftSize : 0}px`;
                     barEl.style.width = `${rowRest ? viewCellWidth * rowRest.oWidthSize : 0}px`;

package/es/gantt/src/gantt.js

@@ -19,7 +19,8 @@ function createInternalData() {
     return {
         uFoot: false,
         resizeTableWidth: 0
-        // barTipTimeout: undefined
+        // barTipTimeout: null
+        // dragBarRow: null
     };
 }
 const viewTypeLevelMaps = {

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

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

@@ -257,7 +257,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
           }, (0, _utils.getClass)(rowClassName, rowParams)],
           rowid,
-          style: rowStyle ? _xeUtils.default.isFunction(rowStyle) ? rowStyle(rowParams) : rowStyle : undefined
+          style: rowStyle ? _xeUtils.default.isFunction(rowStyle) ? rowStyle(rowParams) || undefined : rowStyle : undefined
         }, trOns), tableColumn.map((column, $columnIndex) => renderColumn($xeTable, row, rowid, rowIndex, $rowIndex, _rowIndex, column, $columnIndex))));
         let isExpandTree = false;
         let rowChildren = [];

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

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

@@ -21,6 +21,9 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
   setup() {
     const $xeGantt = (0, _vue.inject)('$xeGantt', {});
     const $xeGanttView = (0, _vue.inject)('$xeGanttView', {});
+    const {
+      internalData: ganttInternalData
+    } = $xeGantt;
     const {
       reactData,
       internalData
@@ -131,17 +134,27 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       };
       if (showTooltip) {
         ons.onMouseover = evnt => {
+          const {
+            dragBarRow
+          } = ganttInternalData;
           const ttParams = Object.assign({
             $event: evnt
           }, ctParams);
-          $xeGantt.triggerTaskBarTooltipEvent(evnt, ttParams);
+          if (!dragBarRow) {
+            $xeGantt.triggerTaskBarTooltipEvent(evnt, ttParams);
+          }
           $xeGantt.dispatchEvent('task-bar-mouseenter', ttParams, evnt);
         };
         ons.onMouseleave = evnt => {
+          const {
+            dragBarRow
+          } = ganttInternalData;
           const ttParams = Object.assign({
             $event: evnt
           }, ctParams);
-          $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, ttParams);
+          if (!dragBarRow) {
+            $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, ttParams);
+          }
           $xeGantt.dispatchEvent('task-bar-mouseleave', ttParams, evnt);
         };
       }

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_core=require("@vxe-ui/core"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderEmptyElement=_core.VxeUI.renderEmptyElement,sourceType="gantt",viewType="chart";var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewChart",setup(){let C=(0,_vue.inject)("$xeGantt",{}),a=(0,_vue.inject)("$xeGanttView",{}),{reactData:r,internalData:t}=a,{computeProgressField:D,computeTitleField:M,computeTaskBarOpts:B,computeScaleUnit:q}=C.getComputeMaps(),l=(0,_vue.ref)(),w=(e,t,a,r,l,n)=>{var o=e.props.treeConfig,u=e.reactData.resizeHeightFlag,i=e.internalData.fullAllDataRowIdData,{computeCellOpts:e,computeRowOpts:s,computeDefaultRowHeight:c}=e.getComputeMaps(),e=e.value,s=s.value,c=c.value,v=C.context.slots,v=v.taskBar||v["task-bar"],d=M.value,p=D.value,g=B.value,h=q.value;let m={$gantt:C,row:t,scaleType:h};var{showProgress:g,showContent:w,contentMethod:x,barStyle:_,drag:f,showTooltip:T}=g,E=_xeUtils.default.isFunction(_),_=(_?E?_(m):_:{})||{},k=_.round,i=i[a]||{},u=0<(u?i.resizeHeight:0),i=(0,_util.getCellRestHeight)(i,e,s,c);let b=(0,_utils.getStringValue)(_xeUtils.default.get(t,d));e={},s={width:`${(g?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(t,p)))):0)||0}%`};E&&({bgColor:c,completedBgColor:d}=_,c&&(e.backgroundColor=c),d)&&(s.backgroundColor=d),x&&(b=(0,_utils.getStringValue)(x({row:t,title:b,scaleType:h})));let y={$gantt:C,source:sourceType,type:viewType,scaleType:h,row:t,$rowIndex:l,rowIndex:r,_rowIndex:n};p={onClick(e){C.handleTaskBarClickEvent(e,m)},onDblclick(e){C.handleTaskBarDblclickEvent(e,m)},onMousedown(e){C.handleTaskBarMousedownEvent&&C.handleTaskBarMousedownEvent(e,m)}};return T&&(p.onMouseover=e=>{var t=Object.assign({$event:e},y);C.triggerTaskBarTooltipEvent(e,t),C.dispatchEvent("task-bar-mouseenter",t,e)},p.onMouseleave=e=>{var t=Object.assign({$event:e},y);C.handleTaskBarTooltipLeaveEvent(e,t),C.dispatchEvent("task-bar-mouseleave",t,e)}),(0,_vue.h)("div",{key:o?a:l,rowid:a,class:["vxe-gantt-view--chart-row",{"is--round":k,"is--drag":f,"col--rs-height":u}],style:{height:i+"px"},onContextmenu(e){C.handleTaskBarContextmenuEvent(e,y)}},[(0,_vue.h)("div",Object.assign({class:v?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar",style:e,rowid:a},p),v?C.callSlot(v,m):[g?(0,_vue.h)("div",{class:"vxe-gantt-view--chart-progress",style:s}):renderEmptyElement(C),w?(0,_vue.h)("div",{class:"vxe-gantt-view--chart-content"},b):renderEmptyElement(C)])])},x=(i,e)=>{let s=i.props.treeConfig,c=i.reactData.treeExpandedFlag,{fullAllDataRowIdData:v,treeExpandedMaps:d}=i.internalData;var t=i.getComputeMaps().computeTreeOpts,t=t.value;let p=t.transform,g=t.children||t.childrenField,h=r.scrollYLoad,m=[];return e.forEach((e,t)=>{var a=i?i.getRowid(e):"",r=v[a]||{};let l=t,n=-1,o=(r&&(l=r.index,n=r._index),m.push(w(i,e,a,l,t,n)),!1),u=[];!s||h||p||(u=e[g],o=!!c&&u&&0<u.length&&!!d[a]),o&&m.push(...x(i,u))}),m};return(0,_vue.onMounted)(()=>{var e=t.elemStore;e["main-chart-wrapper"]=l}),(0,_vue.onUnmounted)(()=>{var e=t.elemStore;e["main-chart-wrapper"]=null}),()=>{var e=a.internalData.xeTable,t=r.tableData;return(0,_vue.h)("div",{ref:l,class:"vxe-gantt-view--chart-wrapper"},e?x(e,t):[])}}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_core=require("@vxe-ui/core"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderEmptyElement=_core.VxeUI.renderEmptyElement,sourceType="gantt",viewType="chart";var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGanttViewChart",setup(){let C=(0,_vue.inject)("$xeGantt",{}),a=(0,_vue.inject)("$xeGanttView",{}),D=C.internalData,{reactData:r,internalData:t}=a,{computeProgressField:M,computeTitleField:B,computeTaskBarOpts:R,computeScaleUnit:q}=C.getComputeMaps(),l=(0,_vue.ref)(),w=(e,t,a,r,l,n)=>{var o=e.props.treeConfig,u=e.reactData.resizeHeightFlag,i=e.internalData.fullAllDataRowIdData,{computeCellOpts:e,computeRowOpts:s,computeDefaultRowHeight:c}=e.getComputeMaps(),e=e.value,s=s.value,c=c.value,v=C.context.slots,v=v.taskBar||v["task-bar"],d=B.value,p=M.value,g=R.value,h=q.value;let m={$gantt:C,row:t,scaleType:h};var{showProgress:g,showContent:w,contentMethod:x,barStyle:_,drag:f,showTooltip:T}=g,E=_xeUtils.default.isFunction(_),_=(_?E?_(m):_:{})||{},k=_.round,i=i[a]||{},u=0<(u?i.resizeHeight:0),i=(0,_util.getCellRestHeight)(i,e,s,c);let b=(0,_utils.getStringValue)(_xeUtils.default.get(t,d));e={},s={width:`${(g?Math.min(100,Math.max(0,_xeUtils.default.toNumber(_xeUtils.default.get(t,p)))):0)||0}%`};E&&({bgColor:c,completedBgColor:d}=_,c&&(e.backgroundColor=c),d)&&(s.backgroundColor=d),x&&(b=(0,_utils.getStringValue)(x({row:t,title:b,scaleType:h})));let y={$gantt:C,source:sourceType,type:viewType,scaleType:h,row:t,$rowIndex:l,rowIndex:r,_rowIndex:n};p={onClick(e){C.handleTaskBarClickEvent(e,m)},onDblclick(e){C.handleTaskBarDblclickEvent(e,m)},onMousedown(e){C.handleTaskBarMousedownEvent&&C.handleTaskBarMousedownEvent(e,m)}};return T&&(p.onMouseover=e=>{var t=D.dragBarRow,a=Object.assign({$event:e},y);t||C.triggerTaskBarTooltipEvent(e,a),C.dispatchEvent("task-bar-mouseenter",a,e)},p.onMouseleave=e=>{var t=D.dragBarRow,a=Object.assign({$event:e},y);t||C.handleTaskBarTooltipLeaveEvent(e,a),C.dispatchEvent("task-bar-mouseleave",a,e)}),(0,_vue.h)("div",{key:o?a:l,rowid:a,class:["vxe-gantt-view--chart-row",{"is--round":k,"is--drag":f,"col--rs-height":u}],style:{height:i+"px"},onContextmenu(e){C.handleTaskBarContextmenuEvent(e,y)}},[(0,_vue.h)("div",Object.assign({class:v?"vxe-gantt-view--chart-custom-bar":"vxe-gantt-view--chart-bar",style:e,rowid:a},p),v?C.callSlot(v,m):[g?(0,_vue.h)("div",{class:"vxe-gantt-view--chart-progress",style:s}):renderEmptyElement(C),w?(0,_vue.h)("div",{class:"vxe-gantt-view--chart-content"},b):renderEmptyElement(C)])])},x=(i,e)=>{let s=i.props.treeConfig,c=i.reactData.treeExpandedFlag,{fullAllDataRowIdData:v,treeExpandedMaps:d}=i.internalData;var t=i.getComputeMaps().computeTreeOpts,t=t.value;let p=t.transform,g=t.children||t.childrenField,h=r.scrollYLoad,m=[];return e.forEach((e,t)=>{var a=i?i.getRowid(e):"",r=v[a]||{};let l=t,n=-1,o=(r&&(l=r.index,n=r._index),m.push(w(i,e,a,l,t,n)),!1),u=[];!s||h||p||(u=e[g],o=!!c&&u&&0<u.length&&!!d[a]),o&&m.push(...x(i,u))}),m};return(0,_vue.onMounted)(()=>{var e=t.elemStore;e["main-chart-wrapper"]=l}),(0,_vue.onUnmounted)(()=>{var e=t.elemStore;e["main-chart-wrapper"]=null}),()=>{var e=a.internalData.xeTable,t=r.tableData;return(0,_vue.h)("div",{ref:l,class:"vxe-gantt-view--chart-wrapper"},e?x(e,t):[])}}});

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

@@ -119,7 +119,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           let cellStys = {};
           if (headerCellStyle) {
             if (_xeUtils.default.isFunction(headerCellStyle)) {
-              cellStys = headerCellStyle(ctParams);
+              cellStys = headerCellStyle(ctParams) || null;
             } else {
               cellStys = headerCellStyle;
             }
@@ -131,7 +131,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             }],
             colspan: childCount || null,
             title: titleSlot ? null : label,
-            style: cellStys,
+            style: cellStys || undefined,
             onContextmenu(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 _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):_),(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,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 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)}))}))])])])}}});