vxe-gantt 4.1.16 → 4.1.18

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

@@ -119,6 +119,7 @@ export default defineVxeComponent({
       const taskViewOpts = computeTaskViewOpts.value
       const minScale = computeMinScale.value
       const { gridding } = taskViewOpts
+      const { type, startDay } = minScale
       const dateList: Date[] = []
       if (!minViewDate || !maxViewDate) {
         return dateList
@@ -126,14 +127,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
         }
@@ -143,7 +145,7 @@ export default defineVxeComponent({
           while (currDate <= endDate) {
             const itemDate = currDate
             dateList.push(itemDate)
-            currDate = XEUtils.getWhatQuarter(currDate, 1)
+            currDate = XEUtils.getWhatQuarter(currDate, currStep)
           }
           break
         }
@@ -153,17 +155,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
         }
@@ -174,14 +176,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) {
@@ -261,7 +263,6 @@ export default defineVxeComponent({
           minute: [],
           second: []
         }
-
         const tempTypeMaps: Record<VxeGanttDefines.ColumnScaleType, Record<string, VxeGanttDefines.ViewColumn>> = {
           year: {},
           quarter: {},
@@ -273,6 +274,7 @@ export default defineVxeComponent({
           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) {
@@ -293,15 +295,17 @@ export default defineVxeComponent({
             currGpCol.children.push(minCol)
           }
         }
-
         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: {
@@ -410,6 +414,32 @@ export default defineVxeComponent({
       }
     }
 
+    /**
+     * 判断周的年份是否跨年
+     */
+    const 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'
+     */
+    const 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
+      }
+    }
+
     const createChartRender = (fullCols: VxeGanttDefines.ViewColumn[]) => {
       const { minViewDate } = reactData
       const minScale = computeMinScale.value
@@ -488,15 +518,17 @@ export default defineVxeComponent({
         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(startValue)
             const endDate = parseStringDate(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

package/packages/gantt/src/gantt.ts

@@ -560,7 +560,10 @@ export default 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