@worktile/gantt 14.0.3 → 14.0.4

package/fesm2020/worktile-gantt.mjs

@@ -474,8 +474,8 @@ class GanttView {
     }
     // 根据X坐标获取对应时间
     getDateByXPoint(x) {
-        const indexOfSecondaryDate = Math.floor(x / this.getCellWidth());
-        const matchDate = this.secondaryDatePoints[indexOfSecondaryDate];
+        const indexOfSecondaryDate = Math.max(Math.floor(x / this.getCellWidth()), 0);
+        const matchDate = this.secondaryDatePoints[Math.min(this.secondaryDatePoints.length - 1, indexOfSecondaryDate)];
         const dayWidth = this.getDayOccupancyWidth(matchDate?.start);
         if (dayWidth === this.getCellWidth()) {
             return matchDate?.start;
@@ -2093,6 +2093,7 @@ class GanttDomService {
         this.container = this.root.getElementsByClassName('gantt-container')[0];
         this.sideContainer = this.root.getElementsByClassName('gantt-side-container')[0];
         this.mainContainer = this.root.getElementsByClassName('gantt-main-container')[0];
+        this.mainItems = this.root.getElementsByClassName('gantt-main-items')[0];
         this.calendarOverlay = this.root.getElementsByClassName('gantt-calendar-overlay')[0];
         this.monitorScrollChange();
         this.disableBrowserWheelEvent();
@@ -2536,6 +2537,7 @@ class GanttBarDrag {
     createBarDrag() {
         const dragRef = this.dragDrop.createDrag(this.barElement);
         dragRef.lockAxis = 'x';
+        dragRef.withBoundaryElement(this.dom.mainItems);
         dragRef.started.subscribe(() => {
             this.setDraggingStyles();
             this.dragContainer.dragStarted.emit({ item: this.item.origin });
@@ -2552,7 +2554,6 @@ class GanttBarDrag {
                 start = start.addDays(1);
                 end = end.addDays(1);
             }
-            // this.openDragBackdrop(this.barElement, start, end);
             this.openDragBackdrop(this.barElement, this.ganttUpper.view.getDateByXPoint(currentX), this.ganttUpper.view.getDateByXPoint(currentX + this.item.refs.width));
             this.item.updateDate(start, end);
             this.dragContainer.dragMoved.emit({ item: this.item.origin });
@@ -2573,7 +2574,7 @@ class GanttBarDrag {
             const isBefore = index === 0;
             const dragRef = this.dragDrop.createDrag(handle);
             dragRef.lockAxis = 'x';
-            dragRef.withBoundaryElement(this.dom.root);
+            dragRef.withBoundaryElement(this.dom.mainItems);
             dragRef.started.subscribe(() => {
                 this.setDraggingStyles();
                 this.dragContainer.dragStarted.emit({ item: this.item.origin });
@@ -2582,20 +2583,22 @@ class GanttBarDrag {
                 if (isBefore) {
                     const x = this.item.refs.x + event.distance.x;
                     const width = this.item.refs.width + event.distance.x * -1;
+                    const start = this.ganttUpper.view.getDateByXPoint(x);
                     if (width > dragMinWidth) {
                         this.barElement.style.width = width + 'px';
                         this.barElement.style.left = x + 'px';
-                        this.openDragBackdrop(this.barElement, this.ganttUpper.view.getDateByXPoint(x), this.item.end);
-                        this.item.updateDate(this.ganttUpper.view.getDateByXPoint(x), this.item.end);
+                        this.openDragBackdrop(this.barElement, start, this.item.end);
+                        this.item.updateDate(start, this.item.end);
                     }
                 }
                 else {
                     const width = this.item.refs.width + event.distance.x;
+                    const end = this.ganttUpper.view.getDateByXPoint(this.item.refs.x + width);
                     if (width > dragMinWidth) {
                         this.barElement.style.width = width + 'px';
-                        this.openDragBackdrop(this.barElement, this.item.start, this.ganttUpper.view.getDateByXPoint(this.item.refs.x + width));
+                        this.openDragBackdrop(this.barElement, this.item.start, end);
+                        this.item.updateDate(this.item.start, end);
                     }
-                    this.item.updateDate(this.item.start, this.ganttUpper.view.getDateByXPoint(this.item.refs.x + width));
                 }
                 this.dragContainer.dragMoved.emit({ item: this.item.origin });
                 event.source.reset();
@@ -2603,19 +2606,13 @@ class GanttBarDrag {
             dragRef.ended.subscribe((event) => {
                 if (isBefore) {
                     const width = this.item.refs.width + event.distance.x * -1;
-                    if (width > dragMinWidth) {
-                        this.item.updateDate(this.ganttUpper.view.getDateByXPoint(this.item.refs.x + event.distance.x), this.item.end);
-                    }
-                    else {
+                    if (width <= dragMinWidth) {
                         this.item.updateDate(this.item.end.startOfDay(), this.item.end);
                     }
                 }
                 else {
                     const width = this.item.refs.width + event.distance.x;
-                    if (width > dragMinWidth) {
-                        this.item.updateDate(this.item.start, this.ganttUpper.view.getDateByXPoint(this.item.refs.x + this.item.refs.width + event.distance.x));
-                    }
-                    else {
+                    if (width <= dragMinWidth) {
                         this.item.updateDate(this.item.start, this.item.start.endOfDay());
                     }
                 }
@@ -2841,7 +2838,16 @@ class NgxGanttBarComponent extends GanttItemUpper {
         });
     }
     ngAfterViewInit() {
-        this.drag.createDrags(this.elementRef, this.item, this.ganttUpper);
+        // Note: the zone may be nooped through `BootstrapOptions` when bootstrapping the root module. This means
+        // the `onStable` will never emit any value.
+        const onStable$ = this.ngZone.isStable ? from(Promise.resolve()) : this.ngZone.onStable.pipe(take(1));
+        // Normally this isn't in the zone, but it can cause performance regressions for apps
+        // using `zone-patch-rxjs` because it'll trigger a change detection when it unsubscribes.
+        this.ngZone.runOutsideAngular(() => {
+            onStable$.pipe(takeUntil(this.unsubscribe$)).subscribe(() => {
+                this.drag.createDrags(this.elementRef, this.item, this.ganttUpper);
+            });
+        });
         this.setContentBackground();
         this.handles.changes
             .pipe(startWith(this.handles), switchMap(() =>