vxe-gantt 3.1.16 → 3.1.18

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.16";
+_core.VxeUI.ganttVersion = "3.1.18";
 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.16","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.18","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.16");
+var version = "gantt v".concat("3.1.18");
 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.16"),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.18"),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.16",
+  "version": "3.1.18",
   "description": "A vue based gantt component",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -60,8 +60,8 @@
     "vue": "~2.6.14",
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
-    "vxe-pc-ui": "^3.11.17",
-    "vxe-table": "^3.19.33"
+    "vxe-pc-ui": "^3.11.20",
+    "vxe-table": "^3.19.35"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

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

@@ -102,7 +102,6 @@ function handleColumnHeader ($xeGanttView: VxeGanttViewConstructor & VxeGanttVie
       minute: [],
       second: []
     }
-
     const tempTypeMaps: Record<VxeGanttDefines.ColumnScaleType, Record<string, VxeGanttDefines.ViewColumn>> = {
       year: {},
       quarter: {},
@@ -114,6 +113,7 @@ function handleColumnHeader ($xeGanttView: VxeGanttViewConstructor & VxeGanttVie
       minute: {},
       second: {}
     }
+    const isMinWeek = minScale.type === 'week'
 
     const handleData = (type: VxeGanttDefines.ColumnScaleType, colMaps: Record<VxeGanttDefines.ColumnScaleType, VxeGanttDefines.ViewColumn>, minCol: VxeGanttDefines.ViewColumn) => {
       if (minScale.type === type) {
@@ -137,12 +137,15 @@ function handleColumnHeader ($xeGanttView: VxeGanttViewConstructor & VxeGanttVie
 
     for (let i = 0; i < scaleDateList.length; i++) {
       const itemDate = scaleDateList[i]
-      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('-')
+      let [yy, yyyy, M, MM, d, dd, H, HH, m, mm, s, ss] = XEUtils.toDateString(itemDate, 'yy-yyyy-M-MM-d-dd-H-HH-m-mm-s-ss').split('-')
       const e = itemDate.getDay()
       const E = e + 1
       const q = Math.ceil((itemDate.getMonth() + 1) / 3)
       const W = `${XEUtils.getYearWeek(itemDate, weekScale ? weekScale.startDay : undefined)}`
       const WW = XEUtils.padStart(W, 2, '0')
+      if (isMinWeek && checkWeekOfsetYear(W, M)) {
+        yyyy = `${Number(yyyy) + 1}`
+      }
       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: {
@@ -251,6 +254,32 @@ function handleColumnHeader ($xeGanttView: VxeGanttViewConstructor & VxeGanttVie
   }
 }
 
+/**
+ * 判断周的年份是否跨年
+ */
+function checkWeekOfsetYear (W: number | string, M: number | string) {
+  return `${W}` === '1' && `${M}` === '12'
+}
+
+/**
+ * 周维度，由于年份和第几周是冲突的行为，所以需要特殊处理，判断是否跨年，例如
+ * '2024-12-31' 'yyyy-MM-dd W' >> '2024-12-31 1'
+ * '2025-01-01' 'yyyy-MM-dd W' >> '2025-01-01 1'
+ */
+function parseWeekObj (date: any, firstDay?: 0 | 5 | 1 | 2 | 3 | 4 | 6) {
+  const currDate = XEUtils.toStringDate(date)
+  let yyyy = currDate.getFullYear()
+  const month = currDate.getMonth()
+  const weekNum = XEUtils.getYearWeek(currDate, firstDay)
+  if (checkWeekOfsetYear(weekNum, month + 1)) {
+    yyyy++
+  }
+  return {
+    yyyy,
+    W: weekNum
+  }
+}
+
 function createChartRender ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivateMethods, fullCols: VxeGanttDefines.ViewColumn[]) {
   const $xeGantt = $xeGanttView.$xeGantt
   const reactData = $xeGanttView.reactData
@@ -332,15 +361,17 @@ function createChartRender ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
     case 'week': {
       const indexMaps: Record<string, number> = {}
       fullCols.forEach(({ dateObj }, i) => {
-        const yyyyW = XEUtils.toDateString(dateObj.date, 'yyyy-W', { firstDay: weekScale ? weekScale.startDay : undefined })
+        const yyyyW = `${dateObj.yyyy}-${dateObj.W}`
         indexMaps[yyyyW] = i
       })
       return (startValue: any, endValue: any) => {
         const startDate = parseStringDate($xeGanttView, startValue)
         const endDate = parseStringDate($xeGanttView, endValue)
-        const startStr = XEUtils.toDateString(startDate, 'yyyy-W', { firstDay: weekScale ? weekScale.startDay : undefined })
+        const startWeekObj = parseWeekObj(startDate, weekScale ? weekScale.startDay : undefined)
+        const startStr = `${startWeekObj.yyyy}-${startWeekObj.W}`
         const startFirstDate = XEUtils.getWhatWeek(startDate, 0, weekScale ? weekScale.startDay : undefined, weekScale ? weekScale.startDay : undefined)
-        const endStr = XEUtils.toDateString(endDate, 'yyyy-W', { firstDay: weekScale ? weekScale.startDay : undefined })
+        const endWeekObj = parseWeekObj(endDate, weekScale ? weekScale.startDay : undefined)
+        const endStr = `${endWeekObj.yyyy}-${endWeekObj.W}`
         const endFirstDate = XEUtils.getWhatWeek(endDate, 0, weekScale ? weekScale.startDay : undefined, weekScale ? weekScale.startDay : undefined)
         const dateSize = Math.floor((XEUtils.getWhatWeek(endDate, 1, weekScale ? weekScale.startDay : undefined, weekScale ? weekScale.startDay : undefined).getTime() - endFirstDate.getTime()) / dayMs)
         const subtract = (startDate.getTime() - startFirstDate.getTime()) / dayMs / dateSize
@@ -1269,6 +1300,7 @@ export default defineVxeComponent({
       const taskViewOpts = $xeGantt.computeTaskViewOpts
       const minScale = $xeGantt.computeMinScale
       const { gridding } = taskViewOpts
+      const { type, startDay } = minScale
       const dateList: Date[] = []
       if (!minViewDate || !maxViewDate) {
         return dateList
@@ -1276,14 +1308,15 @@ export default defineVxeComponent({
 
       const leftSize = -XEUtils.toNumber(gridding ? gridding.leftSpacing || 0 : 0)
       const rightSize = XEUtils.toNumber(gridding ? gridding.rightSpacing || 0 : 0)
-      switch (minScale.type) {
+      const currStep = 1// XEUtils.toNumber(step || 1) || 1
+      switch (type) {
         case 'year': {
           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)
+            currDate = XEUtils.getWhatYear(currDate, currStep)
           }
           break
         }
@@ -1293,7 +1326,7 @@ export default defineVxeComponent({
           while (currDate <= endDate) {
             const itemDate = currDate
             dateList.push(itemDate)
-            currDate = XEUtils.getWhatQuarter(currDate, 1)
+            currDate = XEUtils.getWhatQuarter(currDate, currStep)
           }
           break
         }
@@ -1303,17 +1336,17 @@ export default defineVxeComponent({
           while (currDate <= endDate) {
             const itemDate = currDate
             dateList.push(itemDate)
-            currDate = XEUtils.getWhatMonth(currDate, 1)
+            currDate = XEUtils.getWhatMonth(currDate, currStep)
           }
           break
         }
         case 'week': {
-          let currDate = XEUtils.getWhatWeek(minViewDate, leftSize, minScale.startDay, minScale.startDay)
-          const endDate = XEUtils.getWhatWeek(maxViewDate, rightSize, minScale.startDay, minScale.startDay)
+          let currDate = XEUtils.getWhatWeek(minViewDate, leftSize, startDay, startDay)
+          const endDate = XEUtils.getWhatWeek(maxViewDate, rightSize, startDay, startDay)
           while (currDate <= endDate) {
             const itemDate = currDate
             dateList.push(itemDate)
-            currDate = XEUtils.getWhatWeek(currDate, 1)
+            currDate = XEUtils.getWhatWeek(currDate, currStep)
           }
           break
         }
@@ -1324,14 +1357,14 @@ export default defineVxeComponent({
           while (currDate <= endDate) {
             const itemDate = currDate
             dateList.push(itemDate)
-            currDate = XEUtils.getWhatDay(currDate, 1)
+            currDate = XEUtils.getWhatDay(currDate, currStep)
           }
           break
         }
         case 'hour':
         case 'minute':
         case 'second': {
-          const gapTime = getStandardGapTime(minScale.type)
+          const gapTime = getStandardGapTime(minScale.type) * currStep
           let currTime = minViewDate.getTime() + (leftSize * gapTime)
           const endTime = maxViewDate.getTime() + (rightSize * gapTime)
           while (currTime <= endTime) {

package/packages/gantt/src/gantt.ts

@@ -646,7 +646,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
       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
+        const { type, step } = sConf
+        if (step) {
+          errLog('vxe.error.errProp', [`step=${step}`, 'step=1'])
+        }
         if (!type || !viewTypeLevelMaps[type]) {
           errLog('vxe.error.errProp', [`type=${type}`, XEUtils.keys(viewTypeLevelMaps).join(',')])
           return