@worktile/gantt 19.0.8-next.3 → 19.0.8-next.5

package/fesm2022/worktile-gantt.mjs

@@ -1005,6 +1005,18 @@ class GanttView {
                 return this.getDayOccupancyWidth(date);
         }
     }
+    /**
+     * 根据起始日期和宽度计算结束日期
+     * @param start 起始日期
+     * @param width 视觉宽度
+     * @returns 结束日期
+     */
+    getEndDateByWidth(start, width) {
+        const startX = this.getXPointByDate(start);
+        // 减去偏移量避免因为 getDateRangeWidth 加了 1 秒而多算一天
+        const endX = startX + width - 0.1;
+        return this.getDateByXPoint(endX);
+    }
 }
 
 const viewOptions$5 = {
@@ -1065,6 +1077,30 @@ class GanttViewDay extends GanttView {
         }
         return points;
     }
+    getEndDateByWidth(start, width) {
+        if (!this.options.hoilday?.hideHoliday) {
+            return super.getEndDateByWidth(start, width);
+        }
+        // 通过宽度计算包含多少个工作日（每个工作日的宽度是 cellWidth）
+        const workingDaysCount = Math.round(width / this.getCellWidth());
+        let end = start;
+        let addedWorkingDays = 0;
+        let attempts = 0;
+        const maxAttempts = 365;
+        while (addedWorkingDays < workingDaysCount && attempts < maxAttempts) {
+            if (this.getDayOccupancyWidth(end) > 0) {
+                addedWorkingDays++;
+                if (addedWorkingDays < workingDaysCount) {
+                    end = end.addDays(1);
+                }
+            }
+            else {
+                end = end.addDays(1);
+            }
+            attempts++;
+        }
+        return end;
+    }
 }
 
 const viewOptions$4 = {
@@ -2398,25 +2434,13 @@ class GanttBarDrag {
     }
     barDragMove() {
         const currentX = this.item().refs.x + this.barDragMoveDistance + this.dragScrollDistance;
-        const currentDate = this.ganttUpper.view.getDateByXPoint(currentX);
-        const currentStartX = this.ganttUpper.view.getXPointByDate(currentDate);
-        const currentEndDate = this.ganttUpper.view.getDateByXPoint(currentX + this.item().refs.width);
-        const diffs = this.ganttUpper.view.differenceByPrecisionUnit(currentEndDate, currentDate);
-        let start = currentDate;
-        let end = currentDate.add(diffs, this.ganttUpper.view?.options?.datePrecisionUnit);
-        // 日视图特殊逻辑处理
-        if (this.ganttUpper.view.viewType === GanttViewType.day) {
-            const dayWidth = this.ganttUpper.view.getDayOccupancyWidth(currentDate);
-            if (currentX > currentStartX + dayWidth / 2) {
-                start = start.addDays(1);
-                end = end.addDays(1);
-            }
-        }
+        const start = this.ganttUpper.view.getDateByXPoint(currentX);
+        const end = this.ganttUpper.view.getEndDateByWidth(start, this.item().refs.width);
         if (this.dragScrolling) {
             const left = currentX - this.barDragMoveDistance;
             this.barElement.style.left = left + 'px';
         }
-        this.openDragBackdrop(this.barElement, this.ganttUpper.view.getDateByXPoint(currentX), this.ganttUpper.view.getDateByXPoint(currentX + this.item().refs.width));
+        this.openDragBackdrop(this.barElement, start, end);
         if (!this.isStartOrEndInsideView(start, end)) {
             return;
         }
@@ -3147,7 +3171,7 @@ class GanttPrintService {
         this.root = root.nativeElement;
         this.mainContainer = this.root.getElementsByClassName('gantt-main-container')[0];
     }
-    async print(name = 'download', ignoreElementClass) {
+    async html2canvas(ignoreElementClass) {
         const root = this.root;
         const mainContainer = this.mainContainer;
         // set print width
@@ -3155,7 +3179,7 @@ class GanttPrintService {
         // set print height
         const printHeight = root.offsetHeight - mainContainer.offsetHeight + mainContainer.scrollHeight;
         const html2canvas = (await import(/* webpackChunkName: 'html2canvas' */ 'html2canvas')).default;
-        html2canvas(root, {
+        return html2canvas(root, {
             logging: false,
             allowTaint: true,
             useCORS: true,
@@ -3189,7 +3213,10 @@ class GanttPrintService {
                 // setInlineStyles for svg
                 this.setInlineStyles(cloneGanttDom);
             }
-        }).then((canvas) => {
+        });
+    }
+    async print(name = 'download', ignoreElementClass) {
+        this.html2canvas(ignoreElementClass).then((canvas) => {
             const link = document.createElement('a');
             const dataUrl = canvas.toDataURL('image/png');
             link.download = `${name}.png`;