vxe-gantt 4.1.2 → 4.1.4

package/lib/index.umd.js

@@ -2780,7 +2780,7 @@ var core_ = __webpack_require__(4345);
 const {
   log
 } = core_.VxeUI;
-const version = `gantt v${"4.1.2"}`;
+const version = `gantt v${"4.1.4"}`;
 const warnLog = log.create('warn', version);
 const errLog = log.create('error', version);
 ;// ./packages/ui/index.ts
@@ -2791,7 +2791,9 @@ const {
   setIcon,
   checkVersion
 } = core_.VxeUI;
-core_.VxeUI.ganttVersion = "4.1.2";
+core_.VxeUI.ganttVersion = "4.1.4";
+const ymdFormat = 'yyyy-MM-dd';
+const ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({
   gantt: {
     // size: null,
@@ -2834,12 +2836,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,
@@ -3511,6 +3542,9 @@ const gantt_chart_viewType = 'chart';
   setup() {
     const $xeGantt = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeGantt', {});
     const $xeGanttView = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeGanttView', {});
+    const {
+      internalData: ganttInternalData
+    } = $xeGantt;
     const {
       reactData,
       internalData
@@ -3621,17 +3655,27 @@ const gantt_chart_viewType = 'chart';
       };
       if (showTooltip) {
         ons.onMouseover = evnt => {
+          const {
+            dragBarRow
+          } = ganttInternalData;
           const ttParams = Object.assign({
             $event: evnt
           }, ctParams);
-          $xeGantt.triggerTaskBarTooltipEvent(evnt, ttParams);
+          if (!dragBarRow) {
+            $xeGantt.triggerTaskBarTooltipEvent(evnt, ttParams);
+          }
           $xeGantt.dispatchEvent('task-bar-mouseenter', ttParams, evnt);
         };
         ons.onMouseleave = evnt => {
+          const {
+            dragBarRow
+          } = ganttInternalData;
           const ttParams = Object.assign({
             $event: evnt
           }, ctParams);
-          $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, ttParams);
+          if (!dragBarRow) {
+            $xeGantt.handleTaskBarTooltipLeaveEvent(evnt, ttParams);
+          }
           $xeGantt.dispatchEvent('task-bar-mouseleave', ttParams, evnt);
         };
       }
@@ -4177,8 +4221,12 @@ const maxYHeight = 5e6;
   setup(props, context) {
     const xID = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId();
     const $xeGantt = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeGantt', {});
+    const {
+      internalData: ganttInternalData
+    } = $xeGantt;
     const {
       computeTaskOpts,
+      computeTaskViewOpts,
       computeStartField,
       computeEndField,
       computeScrollbarOpts,
@@ -4241,18 +4289,23 @@ const maxYHeight = 5e6;
         minViewDate,
         maxViewDate
       } = reactData;
+      const taskViewOpts = computeTaskViewOpts.value;
       const minScale = computeMinScale.value;
+      const {
+        gridding
+      } = taskViewOpts;
       const dateList = [];
       if (!minViewDate || !maxViewDate) {
         return dateList;
       }
-      const startTime = minViewDate.getTime();
-      const endTime = maxViewDate.getTime();
+      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) {
         case 'year':
           {
-            let currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatYear(minViewDate, 0, 'first');
-            while (currDate <= maxViewDate) {
+            let currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatYear(minViewDate, leftSize, 'first');
+            const endDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatYear(maxViewDate, rightSize, 'first');
+            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);
@@ -4261,8 +4314,9 @@ const maxYHeight = 5e6;
           }
         case 'quarter':
           {
-            let currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatQuarter(minViewDate, 0, 'first');
-            while (currDate <= maxViewDate) {
+            let currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatQuarter(minViewDate, leftSize, 'first');
+            const endDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatQuarter(maxViewDate, rightSize, 'first');
+            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);
@@ -4271,8 +4325,9 @@ const maxYHeight = 5e6;
           }
         case 'month':
           {
-            let currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(minViewDate, 0, 'first');
-            while (currDate <= maxViewDate) {
+            let currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(minViewDate, leftSize, 'first');
+            const endDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatMonth(maxViewDate, rightSize, 'first');
+            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);
@@ -4281,8 +4336,9 @@ const maxYHeight = 5e6;
           }
         case 'week':
           {
-            let currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatWeek(minViewDate, 0, minScale.startDay, minScale.startDay);
-            while (currDate <= maxViewDate) {
+            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);
+            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);
@@ -4291,12 +4347,23 @@ const maxYHeight = 5e6;
           }
         case 'day':
         case 'date':
+          {
+            let currDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(minViewDate, leftSize, 'first');
+            const endDate = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getWhatDay(maxViewDate, rightSize, 'first');
+            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);
+            }
+            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);
@@ -4405,21 +4472,29 @@ const maxYHeight = 5e6;
         };
         for (let i = 0; i < scaleDateList.length; i++) {
           const itemDate = scaleDateList[i];
-          const [yyyy, MM, dd, HH, mm, ss] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(itemDate, 'yyyy-M-d-H-m-s').split('-');
+          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('-');
           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 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');
           const dateObj = {
             date: itemDate,
-            yy: yyyy,
-            M: MM,
-            d: dd,
-            H: HH,
-            m: mm,
-            s: ss,
+            yy,
+            yyyy,
+            M,
+            MM,
+            d,
+            dd,
+            H,
+            HH,
+            m,
+            mm,
+            s,
+            ss,
             q,
             W,
+            WW,
             E,
             e
           };
@@ -4556,7 +4631,7 @@ const maxYHeight = 5e6;
               const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
               return {
                 offsetLeftSize,
-                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
               };
             };
           }
@@ -4582,7 +4657,7 @@ const maxYHeight = 5e6;
               const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
               return {
                 offsetLeftSize,
-                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
               };
             };
           }
@@ -4608,7 +4683,7 @@ const maxYHeight = 5e6;
               const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
               return {
                 offsetLeftSize,
-                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
               };
             };
           }
@@ -4640,7 +4715,7 @@ const maxYHeight = 5e6;
               const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
               return {
                 offsetLeftSize,
-                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
               };
             };
           }
@@ -4667,7 +4742,7 @@ const maxYHeight = 5e6;
               const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
               return {
                 offsetLeftSize,
-                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
               };
             };
           }
@@ -4693,7 +4768,7 @@ const maxYHeight = 5e6;
               const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
               return {
                 offsetLeftSize,
-                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
               };
             };
           }
@@ -4719,7 +4794,7 @@ const maxYHeight = 5e6;
               const offsetLeftSize = (indexMaps[startStr] || 0) + subtract;
               return {
                 offsetLeftSize,
-                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize
+                offsetWidthSize: (indexMaps[endStr] || 0) - offsetLeftSize + addSize + 1
               };
             };
           }
@@ -4934,6 +5009,9 @@ const maxYHeight = 5e6;
       }
     };
     const updateChart = () => {
+      const {
+        dragBarRow
+      } = ganttInternalData;
       const {
         viewCellWidth
       } = reactData;
@@ -4941,14 +5019,18 @@ const maxYHeight = 5e6;
         elemStore,
         chartMaps
       } = internalData;
+      const $xeTable = internalData.xeTable;
       const chartWrapper = getRefElem(elemStore['main-chart-wrapper']);
-      if (chartWrapper) {
+      if (chartWrapper && $xeTable) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(chartWrapper.children, rowEl => {
           const barEl = rowEl.children[0];
           if (!barEl) {
             return;
           }
           const rowid = rowEl.getAttribute('rowid');
+          if (dragBarRow && $xeTable.getRowid(dragBarRow) === rowid) {
+            return;
+          }
           const rowRest = rowid ? chartMaps[rowid] : null;
           barEl.style.left = `${rowRest ? viewCellWidth * rowRest.oLeftSize : 0}px`;
           barEl.style.width = `${rowRest ? viewCellWidth * rowRest.oWidthSize : 0}px`;
@@ -5828,7 +5910,8 @@ function gantt_createInternalData() {
   return {
     uFoot: false,
     resizeTableWidth: 0
-    // barTipTimeout: undefined
+    // barTipTimeout: null
+    // dragBarRow: null
   };
 }
 const viewTypeLevelMaps = {
@@ -6257,6 +6340,7 @@ function getViewTypeLevel(type) {
       refForm,
       refToolbar,
       refPager,
+      refGanttView,
       refGanttContainerElem,
       refClassifyWrapperElem,
       refPopupContainerElem
@@ -6301,38 +6385,28 @@ function getViewTypeLevel(type) {
       const taskScaleConfs = computeTaskViewScales.value;
       const taskViewScaleOpts = computeTaskViewScaleOpts.value;
       const scaleConfs = [];
-      if (taskScaleConfs) {
-        const keyMaps = {};
-        taskScaleConfs.forEach(conf => {
-          const sConf = !conf || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(conf) ? {
-            type: conf
-          } : conf;
-          const {
-            type
-          } = sConf;
-          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;
-          }
-          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 = {};
+      const scaleList = taskScaleConfs && taskScaleConfs.length ? taskScaleConfs : ['month', 'date'];
+      scaleList.forEach(conf => {
+        const sConf = !conf || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(conf) ? {
+          type: conf
+        } : conf;
+        const {
+          type
+        } = sConf;
+        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;
+        }
+        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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(scaleConfs, {
         field: 'level',
         order: 'desc'