vxe-gantt 3.1.2 → 3.1.4

package/lib/ui/index.js

@@ -15,7 +15,9 @@ var _log = require("./src/log");
 var setConfig = _core.VxeUI.setConfig,
   setIcon = _core.VxeUI.setIcon,
   checkVersion = _core.VxeUI.checkVersion;
-_core.VxeUI.ganttVersion = "3.1.2";
+_core.VxeUI.ganttVersion = "3.1.4";
+var ymdFormat = 'yyyy-MM-dd';
+var ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({
   gantt: {
     // size: null,
@@ -58,12 +60,41 @@ setConfig({
       enterable: true
     },
     taskViewScaleConfig: {
+      year: {
+        valueFormat: ymdFormat
+      },
+      quarter: {
+        valueFormat: ymdFormat
+      },
+      month: {
+        valueFormat: ymdFormat
+      },
       week: {
-        startDay: 1
+        startDay: 1,
+        valueFormat: ymdFormat
+      },
+      day: {
+        valueFormat: ymdFormat
+      },
+      date: {
+        valueFormat: ymdFormat
+      },
+      hour: {
+        valueFormat: ymdhmsFormat
+      },
+      minute: {
+        valueFormat: ymdhmsFormat
+      },
+      second: {
+        valueFormat: ymdhmsFormat
       }
     },
     taskViewConfig: {
-      showNowLine: true
+      showNowLine: true,
+      gridding: {
+        // leftSpacing: 0,
+        // rightSpacing: 0
+      }
     },
     taskSplitConfig: {
       enabled: true,

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"),_log=require("./src/log"),setConfig=_core.VxeUI.setConfig,setIcon=_core.VxeUI.setIcon,checkVersion=_core.VxeUI.checkVersion,iconPrefix=(_core.VxeUI.ganttVersion="3.1.2",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},taskViewScaleConfig:{week:{startDay:1}},taskViewConfig:{showNowLine:!0},taskSplitConfig:{enabled:!0,resize:!0,showCollapseTableButton:!0,showCollapseTaskButton:!0}}}),"vxe-icon-"),pVersion=(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"}),3),sVersion=18,_default=(checkVersion?checkVersion(_core.VxeUI.tableVersion,pVersion,sVersion)||(0,_log.errLog)("vxe.error.errorVersion",["vxe-table@".concat(_core.VxeUI.tableVersion||"?"),"vxe-table v".concat(pVersion,".").concat(sVersion,"+")]):(0,_log.errLog)("Requires vxe-table v".concat(pVersion,".").concat(sVersion,"+")),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"),_log=require("./src/log"),setConfig=_core.VxeUI.setConfig,setIcon=_core.VxeUI.setIcon,checkVersion=_core.VxeUI.checkVersion,ymdFormat=(_core.VxeUI.ganttVersion="3.1.4","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},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:{}},taskSplitConfig:{enabled:!0,resize:!0,showCollapseTableButton:!0,showCollapseTaskButton:!0}}}),"vxe-icon-"),pVersion=(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"}),3),sVersion=18,_default=(checkVersion?checkVersion(_core.VxeUI.tableVersion,pVersion,sVersion)||(0,_log.errLog)("vxe.error.errorVersion",["vxe-table@".concat(_core.VxeUI.tableVersion||"?"),"vxe-table v".concat(pVersion,".").concat(sVersion,"+")]):(0,_log.errLog)("Requires vxe-table v".concat(pVersion,".").concat(sVersion,"+")),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.2");
+var version = "gantt v".concat("3.1.4");
 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.2"),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.4"),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.2",
+  "version": "3.1.4",
   "description": "A vue based gantt component",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -64,8 +64,8 @@
     "vue": "~2.6.14",
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
-    "vxe-pc-ui": "^3.10.45",
-    "vxe-table": "^3.19.26"
+    "vxe-pc-ui": "^3.10.46",
+    "vxe-table": "^3.19.27"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

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

@@ -1,7 +1,7 @@
 import { VNode, CreateElement } from 'vue'
 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'
@@ -137,12 +137,13 @@ function handleColumnHeader ($xeGanttView: VxeGanttViewConstructor & VxeGanttVie
 
     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: VxeGanttDefines.ScaleDateObj = { 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: VxeGanttDefines.ScaleDateObj = { date: itemDate, yy, yyyy, M, MM, d, dd, H, HH, m, mm, s, ss, q, W, WW, E, e }
       const colMaps: Record<VxeGanttDefines.ColumnScaleType, VxeGanttDefines.ViewColumn> = {
         year: {
           field: yyyy,
@@ -278,7 +279,7 @@ function createChartRender ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract
         return {
           offsetLeftSize,
-          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
         }
       }
     }
@@ -301,7 +302,7 @@ function createChartRender ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract
         return {
           offsetLeftSize,
-          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
         }
       }
     }
@@ -324,7 +325,7 @@ function createChartRender ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract
         return {
           offsetLeftSize,
-          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
         }
       }
     }
@@ -347,7 +348,7 @@ function createChartRender ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract
         return {
           offsetLeftSize,
-          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
         }
       }
     }
@@ -371,7 +372,7 @@ function createChartRender ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract
         return {
           offsetLeftSize,
-          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
         }
       }
     }
@@ -394,7 +395,7 @@ function createChartRender ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract
         return {
           offsetLeftSize,
-          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
         }
       }
     }
@@ -417,7 +418,7 @@ function createChartRender ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
         const offsetLeftSize = (indexMaps[startStr] || 0) + subtract
         return {
           offsetLeftSize,
-          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+          offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
         }
       }
     }
@@ -610,7 +611,7 @@ function updateChart ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivat
   if (chartWrapper) {
     XEUtils.arrayEach(chartWrapper.children, (rowEl) => {
       const barEl = rowEl.children[0] as HTMLDivElement
-      if (!barEl) {
+      if (!barEl || hasClass(barEl, 'is--drag')) {
         return
       }
       const rowid = rowEl.getAttribute('rowid')
@@ -1212,18 +1213,21 @@ export default defineVxeComponent({
       const reactData = $xeGanttView.reactData
 
       const { minViewDate, maxViewDate } = reactData
+      const taskViewOpts = $xeGantt.computeTaskViewOpts
       const minScale = $xeGantt.computeMinScale
+      const { gridding } = taskViewOpts
       const dateList: Date[] = []
       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)
@@ -1231,8 +1235,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)
@@ -1240,8 +1245,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)
@@ -1249,8 +1255,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)
@@ -1258,12 +1265,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/packages/gantt/src/gantt.ts

@@ -78,7 +78,8 @@ function createInternalData (): GanttInternalData {
   return {
     uFoot: false,
     resizeTableWidth: 0
-    // barTipTimeout: undefined
+    // barTipTimeout: null
+    // dragBarRow: null
   }
 }
 
@@ -593,31 +594,24 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const taskScaleConfs = $xeGantt.computeTaskViewScales
       const taskViewScaleOpts = $xeGantt.computeTaskViewScaleOpts
       const scaleConfs: VxeGanttDefines.ColumnScaleObj[] = []
-      if (taskScaleConfs) {
-        const keyMaps: Record<string, boolean> = {}
-        taskScaleConfs.forEach(conf => {
-          const sConf = !conf || XEUtils.isString(conf) ? { type: conf } : conf
-          const { type } = sConf
-          if (!type || !viewTypeLevelMaps[type]) {
-            errLog('vxe.error.errProp', [`type=${type}`, XEUtils.keys(viewTypeLevelMaps).join(',')])
-            return
-          }
-          if (keyMaps[type]) {
-            errLog('vxe.error.repeatProp', ['type', type])
-            return
-          }
-          keyMaps[type] = true
-          scaleConfs.push(Object.assign({}, type ? taskViewScaleOpts[type] || {} : {}, sConf, {
-            level: getViewTypeLevel(type)
-          }))
-        })
-      }
-      if (!scaleConfs.length) {
-        scaleConfs.push(
-          { type: 'month', level: viewTypeLevelMaps.month },
-          { type: 'date', level: viewTypeLevelMaps.date }
-        )
-      }
+      const keyMaps: Record<string, boolean> = {}
+      const scaleList = (taskScaleConfs && taskScaleConfs.length ? taskScaleConfs : ['month', 'date'] as VxeGanttDefines.ColumnScaleType[])
+      scaleList.forEach(conf => {
+        const sConf = !conf || XEUtils.isString(conf) ? { type: conf } : conf
+        const { type } = sConf
+        if (!type || !viewTypeLevelMaps[type]) {
+          errLog('vxe.error.errProp', [`type=${type}`, XEUtils.keys(viewTypeLevelMaps).join(',')])
+          return
+        }
+        if (keyMaps[type]) {
+          errLog('vxe.error.repeatProp', ['type', type])
+          return
+        }
+        keyMaps[type] = true
+        scaleConfs.push(Object.assign({}, type ? taskViewScaleOpts[type] || {} : {}, sConf, {
+          level: getViewTypeLevel(type)
+        }))
+      })
       reactData.taskScaleList = XEUtils.orderBy(scaleConfs, { field: 'level', order: 'desc' })
     },
     initToolbar () {

package/packages/ui/index.ts

@@ -5,6 +5,9 @@ const { setConfig, setIcon, checkVersion } = VxeUI
 
 VxeUI.ganttVersion = process.env.VUE_APP_VXE_VERSION as string
 
+const ymdFormat = 'yyyy-MM-dd'
+const ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss'
+
 setConfig({
   gantt: {
     // size: null,
@@ -47,12 +50,41 @@ setConfig({
       enterable: true
     },
     taskViewScaleConfig: {
+      year: {
+        valueFormat: ymdFormat
+      },
+      quarter: {
+        valueFormat: ymdFormat
+      },
+      month: {
+        valueFormat: ymdFormat
+      },
       week: {
-        startDay: 1
+        startDay: 1,
+        valueFormat: ymdFormat
+      },
+      day: {
+        valueFormat: ymdFormat
+      },
+      date: {
+        valueFormat: ymdFormat
+      },
+      hour: {
+        valueFormat: ymdhmsFormat
+      },
+      minute: {
+        valueFormat: ymdhmsFormat
+      },
+      second: {
+        valueFormat: ymdhmsFormat
       }
     },
     taskViewConfig: {
-      showNowLine: true
+      showNowLine: true,
+      gridding: {
+        // leftSpacing: 0,
+        // rightSpacing: 0
+      }
     },
     taskSplitConfig: {
       enabled: true,