vxe-gantt 3.1.13 → 3.1.15

package/lib/ui/index.js

@@ -13,7 +13,7 @@ exports.default = void 0;
 var _core = require("@vxe-ui/core");
 var setConfig = _core.VxeUI.setConfig,
   setIcon = _core.VxeUI.setIcon;
-_core.VxeUI.ganttVersion = "3.1.13";
+_core.VxeUI.ganttVersion = "3.1.15";
 var ymdFormat = 'yyyy-MM-dd';
 var ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({

package/lib/ui/index.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.default=void 0;var _core=require("@vxe-ui/core"),setConfig=_core.VxeUI.setConfig,setIcon=_core.VxeUI.setIcon,ymdFormat=(_core.VxeUI.ganttVersion="3.1.13","yyyy-MM-dd"),ymdhmsFormat="yyyy-MM-dd HH:mm:ss",iconPrefix=(setConfig({gantt:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}},taskBarTooltipConfig:{enterable:!0},taskLinkConfig:{enabled:!0,showArrow:!0},taskViewScaleConfig:{year:{valueFormat:ymdFormat},quarter:{valueFormat:ymdFormat},month:{valueFormat:ymdFormat},week:{startDay:1,valueFormat:ymdFormat},day:{valueFormat:ymdFormat},date:{valueFormat:ymdFormat},hour:{valueFormat:ymdhmsFormat},minute:{valueFormat:ymdhmsFormat},second:{valueFormat:ymdhmsFormat}},taskViewConfig:{showNowLine:!0,gridding:{leftSpacing:1,rightSpacing:1}},taskSplitConfig:{enabled:!0,resize:!0,showCollapseTableButton:!0,showCollapseTaskButton:!0}}}),"vxe-icon-"),_default=(setIcon({GANTT_VIEW_LEFT_OPEN:iconPrefix+"arrow-left",GANTT_VIEW_LEFT_CLOSE:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_OPEN:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_CLOSE:iconPrefix+"arrow-left",GANTT_VIEW_TASK_MILESTONE:iconPrefix+"square-fill rotate45"}),exports.default=_core.VxeUI);
+Object.defineProperty(exports,"__esModule",{value:!0}),Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.default=void 0;var _core=require("@vxe-ui/core"),setConfig=_core.VxeUI.setConfig,setIcon=_core.VxeUI.setIcon,ymdFormat=(_core.VxeUI.ganttVersion="3.1.15","yyyy-MM-dd"),ymdhmsFormat="yyyy-MM-dd HH:mm:ss",iconPrefix=(setConfig({gantt:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}},taskBarTooltipConfig:{enterable:!0},taskLinkConfig:{enabled:!0,showArrow:!0},taskViewScaleConfig:{year:{valueFormat:ymdFormat},quarter:{valueFormat:ymdFormat},month:{valueFormat:ymdFormat},week:{startDay:1,valueFormat:ymdFormat},day:{valueFormat:ymdFormat},date:{valueFormat:ymdFormat},hour:{valueFormat:ymdhmsFormat},minute:{valueFormat:ymdhmsFormat},second:{valueFormat:ymdhmsFormat}},taskViewConfig:{showNowLine:!0,gridding:{leftSpacing:1,rightSpacing:1}},taskSplitConfig:{enabled:!0,resize:!0,showCollapseTableButton:!0,showCollapseTaskButton:!0}}}),"vxe-icon-"),_default=(setIcon({GANTT_VIEW_LEFT_OPEN:iconPrefix+"arrow-left",GANTT_VIEW_LEFT_CLOSE:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_OPEN:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_CLOSE:iconPrefix+"arrow-left",GANTT_VIEW_TASK_MILESTONE:iconPrefix+"square-fill rotate45"}),exports.default=_core.VxeUI);

package/lib/ui/src/log.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.warnLog = exports.errLog = void 0;
 var _core = require("@vxe-ui/core");
 var log = _core.VxeUI.log;
-var version = "gantt v".concat("3.1.13");
+var version = "gantt v".concat("3.1.15");
 var warnLog = exports.warnLog = log.create('warn', version);
 var errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core"),log=_core.VxeUI.log,version="gantt v".concat("3.1.13"),warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core"),log=_core.VxeUI.log,version="gantt v".concat("3.1.15"),warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-gantt",
-  "version": "3.1.13",
+  "version": "3.1.15",
   "description": "A vue based gantt component",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/gantt/src/gantt-body.ts

@@ -111,7 +111,7 @@ export default defineVxeComponent({
         _rowIndex
       }
       return h('td', {
-        key: $columnIndex,
+        key: cellClassName || cellStyle ? field : $columnIndex,
         class: [
           'vxe-gantt-view--body-column',
           {

package/packages/gantt/src/gantt-view.ts

@@ -534,6 +534,7 @@ function handleUpdateData ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewP
   if ($xeTable) {
     const startField = $xeGantt.computeStartField
     const endField = $xeGantt.computeEndField
+    const typeField = $xeGantt.computeTypeField
     const tableReactData = $xeTable as unknown as TableReactData
     const { isRowGroupStatus } = tableReactData
     const tableInternalData = $xeTable as unknown as TableInternalData
@@ -544,8 +545,16 @@ function handleUpdateData ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewP
     const childrenField = treeOpts.children || treeOpts.childrenField
 
     const handleMinMaxData = (row: any) => {
-      const startValue = XEUtils.get(row, startField)
-      const endValue = XEUtils.get(row, endField)
+      let startValue = XEUtils.get(row, startField)
+      let endValue = XEUtils.get(row, endField)
+      const typeValue = XEUtils.get(row, typeField)
+      const isMilestone = hasMilestoneTask(typeValue)
+      if (!startValue) {
+        startValue = endValue
+      }
+      if (isMilestone || !endValue) {
+        endValue = startValue
+      }
       if (startValue) {
         const startDate = parseStringDate($xeGanttView, startValue)
         if (!minDate || minDate.getTime() > startDate.getTime()) {

package/packages/gantt/src/gantt.ts

@@ -1935,8 +1935,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
     triggerTaskBarTooltipEvent (evnt: MouseEvent, params: VxeGanttDefines.TaskBarMouseoverParams) {
       const $xeGantt = this
       const reactData = $xeGantt.reactData
+      const internalData = $xeGantt.internalData
 
       const { barTipStore } = reactData
+      const { dragBarRow } = internalData
+      if (dragBarRow) {
+        return
+      }
       const taskBarTooltipOpts = $xeGantt.computeTaskBarTooltipOpts
       const titleField = $xeGantt.computeTitleField
       const { contentMethod } = taskBarTooltipOpts

package/packages/gantt/src/util.ts

@@ -36,12 +36,11 @@ export function getTaskLinkKey (from: string | number, to: string | number) {
   return `${from}_${to}`
 }
 
-export function hasMilestoneTask (type: string) {
-  return type === 'milestone'
+const taskTypeMaps: Record<string, boolean> = {
+  milestone: true
 }
-
-const taskTypeMaps: Record<string, number> = {
-  milestone: 1
+export function hasMilestoneTask (type: string) {
+  return taskTypeMaps[type]
 }
 export function gettaskType (type: string) {
   return taskTypeMaps[type] ? type : 'default'