vxe-gantt 4.1.16 → 4.1.17

package/lib/index.umd.js

@@ -2785,7 +2785,7 @@ const {
   setConfig,
   setIcon
 } = core_.VxeUI;
-core_.VxeUI.ganttVersion = "4.1.16";
+core_.VxeUI.ganttVersion = "4.1.17";
 const ymdFormat = 'yyyy-MM-dd';
 const ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({
@@ -2894,7 +2894,7 @@ setIcon({
 const {
   log
 } = core_.VxeUI;
-const version = `gantt v${"4.1.16"}`;
+const version = `gantt v${"4.1.17"}`;
 const warnLog = log.create('warn', version);
 const errLog = log.create('error', version);
 ;// ./packages/ui/src/depend.ts
@@ -4390,13 +4390,18 @@ const maxYHeight = 5e6;
       const {
         gridding
       } = taskViewOpts;
+      const {
+        type,
+        startDay
+      } = minScale;
       const dateList = [];
       if (!minViewDate || !maxViewDate) {
         return dateList;
       }
       const leftSize = -external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gridding ? gridding.leftSpacing || 0 : 0);
       const rightSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gridding ? gridding.rightSpacing || 0 : 0);
-      switch (minScale.type) {
+      const currStep = 1; // XEUtils.toNumber(step || 1) || 1
+      switch (type) {
         case 'year':
           {
             let currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatYear(minViewDate, leftSize, 'first');
@@ -4404,7 +4409,7 @@ const maxYHeight = 5e6;
             while (currDate <= endDate) {
               const itemDate = currDate;
               dateList.push(itemDate);
-              currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatYear(currDate, 1);
+              currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatYear(currDate, currStep);
             }
             break;
           }
@@ -4415,7 +4420,7 @@ const maxYHeight = 5e6;
             while (currDate <= endDate) {
               const itemDate = currDate;
               dateList.push(itemDate);
-              currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatQuarter(currDate, 1);
+              currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatQuarter(currDate, currStep);
             }
             break;
           }
@@ -4426,18 +4431,18 @@ const maxYHeight = 5e6;
             while (currDate <= endDate) {
               const itemDate = currDate;
               dateList.push(itemDate);
-              currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(currDate, 1);
+              currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(currDate, currStep);
             }
             break;
           }
         case 'week':
           {
-            let currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(minViewDate, leftSize, minScale.startDay, minScale.startDay);
-            const endDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(maxViewDate, rightSize, minScale.startDay, minScale.startDay);
+            let currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(minViewDate, leftSize, startDay, startDay);
+            const endDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(maxViewDate, rightSize, startDay, startDay);
             while (currDate <= endDate) {
               const itemDate = currDate;
               dateList.push(itemDate);
-              currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(currDate, 1);
+              currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(currDate, currStep);
             }
             break;
           }
@@ -4449,7 +4454,7 @@ const maxYHeight = 5e6;
             while (currDate <= endDate) {
               const itemDate = currDate;
               dateList.push(itemDate);
-              currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(currDate, 1);
+              currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(currDate, currStep);
             }
             break;
           }
@@ -4457,7 +4462,7 @@ const maxYHeight = 5e6;
         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) {
@@ -4547,6 +4552,7 @@ const maxYHeight = 5e6;
           minute: {},
           second: {}
         };
+        const isMinWeek = minScale.type === 'week';
         const handleData = (type, colMaps, minCol) => {
           if (minScale.type === type) {
             return;
@@ -4568,12 +4574,22 @@ const maxYHeight = 5e6;
         };
         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] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 = `${external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getYearWeek(itemDate, weekScale ? weekScale.startDay : undefined)}`;
           const WW = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().padStart(W, 2, '0');
+          let wYear = yyyy;
+          // 周维度，由于年份和第几周是冲突的行为，所以需要特殊处理，判断是否跨年，例如
+          // '2024-12-31' 'yyyy-MM-dd W' >> '2024-12-31 1'
+          // '2025-01-01' 'yyyy-MM-dd W' >> '2025-01-01 1'
+          if (W === '1' && MM === '12') {
+            wYear = `${Number(yyyy) + 1}`;
+            if (isMinWeek) {
+              yyyy = wYear;
+            }
+          }
           const dateObj = {
             date: itemDate,
             yy,
@@ -4789,9 +4805,7 @@ const maxYHeight = 5e6;
             fullCols.forEach(({
               dateObj
             }, i) => {
-              const yyyyW = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(dateObj.date, 'yyyy-W', {
-                firstDay: weekScale ? weekScale.startDay : undefined
-              });
+              const yyyyW = `${dateObj.yyyy}-${dateObj.W}`;
               indexMaps[yyyyW] = i;
             });
             return (startValue, endValue) => {
@@ -6549,8 +6563,12 @@ function getViewTypeLevel(type) {
           type: conf
         } : conf;
         const {
-          type
+          type,
+          step
         } = sConf;
+        if (step) {
+          errLog('vxe.error.errProp', [`step=${step}`, 'step=1']);
+        }
         if (!type || !viewTypeLevelMaps[type]) {
           errLog('vxe.error.errProp', [`type=${type}`, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(viewTypeLevelMaps).join(',')]);
           return;