@worktile/gantt 12.1.3 → 12.2.0

package/fesm2015/worktile-gantt.js

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { InjectionToken, EventEmitter, Directive, Inject, Input, Output, ContentChild, HostBinding, Component, Pipe, ViewChild, Injectable, Optional, forwardRef, ChangeDetectionStrategy, ContentChildren, NgModule } from '@angular/core';
 import * as i2 from '@angular/common';
 import { CommonModule } from '@angular/common';
-import { take, skip, takeUntil, startWith, map, pairwise, auditTime, finalize } from 'rxjs/operators';
+import { take, skip, takeUntil, startWith, map, pairwise, auditTime, debounceTime, finalize } from 'rxjs/operators';
 import { BehaviorSubject, Subject, merge, fromEvent } from 'rxjs';
 import { fromUnixTime, getWeek, getDaysInMonth, differenceInCalendarDays, setDate, addSeconds, addMinutes, addHours, addDays, addWeeks, addMonths, addQuarters, addYears, startOfDay, startOfWeek, startOfMonth, startOfQuarter, startOfYear, endOfDay, endOfWeek, endOfMonth, endOfQuarter, endOfYear, getUnixTime, format, isWeekend, isToday, differenceInDays, differenceInCalendarQuarters, eachMonthOfInterval, eachYearOfInterval, eachWeekOfInterval, eachDayOfInterval, differenceInCalendarYears } from 'date-fns';
 export { addDays, addHours, addMinutes, addMonths, addQuarters, addSeconds, addWeeks, addYears, differenceInCalendarDays, differenceInCalendarQuarters, differenceInDays, eachDayOfInterval, eachMonthOfInterval, eachWeekOfInterval, endOfDay, endOfMonth, endOfQuarter, endOfWeek, endOfYear, format, fromUnixTime, getDaysInMonth, getUnixTime, getWeek, isToday, isWeekend, setDate, startOfDay, startOfMonth, startOfQuarter, startOfWeek, startOfYear } from 'date-fns';
@@ -11,6 +11,7 @@ import { coerceBooleanProperty, coerceCssPixelValue } from '@angular/cdk/coercio
 import * as i1 from '@angular/cdk/drag-drop';
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import html2canvas from 'html2canvas';
+import { __decorate, __param } from 'tslib';
 
 class GanttDatePoint {
     constructor(start, text, x, y, additions) {
@@ -204,6 +205,25 @@ var GanttViewType;
     GanttViewType["week"] = "week";
 })(GanttViewType || (GanttViewType = {}));
 
+var GanttLinkType;
+(function (GanttLinkType) {
+    GanttLinkType[GanttLinkType["fs"] = 1] = "fs";
+    GanttLinkType[GanttLinkType["ff"] = 2] = "ff";
+    GanttLinkType[GanttLinkType["ss"] = 3] = "ss";
+    GanttLinkType[GanttLinkType["sf"] = 4] = "sf";
+})(GanttLinkType || (GanttLinkType = {}));
+var GanttLinkLineType;
+(function (GanttLinkLineType) {
+    GanttLinkLineType["curve"] = "curve";
+    GanttLinkLineType["straight"] = "straight";
+})(GanttLinkLineType || (GanttLinkLineType = {}));
+var LinkColors;
+(function (LinkColors) {
+    LinkColors["default"] = "#cacaca";
+    LinkColors["blocked"] = "#FF7575";
+    LinkColors["active"] = "#348FE4";
+})(LinkColors || (LinkColors = {}));
+
 var GanttItemType;
 (function (GanttItemType) {
     GanttItemType["bar"] = "bar";
@@ -215,7 +235,17 @@ class GanttItemInternal {
         this.refs$ = new BehaviorSubject(null);
         this.origin = item;
         this.id = this.origin.id;
-        this.links = this.origin.links || [];
+        this.links = (this.origin.links || []).map((link) => {
+            if (typeof link === 'string') {
+                return {
+                    type: GanttLinkType.fs,
+                    link
+                };
+            }
+            else {
+                return link;
+            }
+        });
         this.color = this.origin.color;
         this.barStyle = this.origin.barStyle;
         this.linkable = this.origin.linkable === undefined ? true : this.origin.linkable;
@@ -273,8 +303,9 @@ class GanttItemInternal {
         this.expanded = expanded;
         this.origin.expanded = expanded;
     }
-    addLink(linkId) {
-        this.links = [...this.links, linkId];
+    addLink(link) {
+        console.log(link);
+        this.links = [...this.links, link];
         this.origin.links = this.links;
     }
 }
@@ -303,7 +334,12 @@ const defaultConfig = {
         quarter: 'QQQ',
         year: 'yyyy年',
         yearMonth: 'yyyy年MM月',
-        yearQuarter: 'yyyy年QQQ',
+        yearQuarter: 'yyyy年QQQ'
+    },
+    linkOptions: {
+        dependencyTypes: [GanttLinkType.fs],
+        showArrow: false,
+        lineType: GanttLinkLineType.curve
     }
 };
 const GANTT_GLOBAL_CONFIG = new InjectionToken('GANTT_GLOBAL_CONFIG');
@@ -777,6 +813,12 @@ class GanttUpper {
         this._multiple = false;
         this.ganttClass = true;
     }
+    set linkOptions(options) {
+        this._linkOptions = options;
+    }
+    get linkOptions() {
+        return Object.assign({}, defaultConfig.linkOptions, this.config.linkOptions, this._linkOptions);
+    }
     set selectable(value) {
         var _a;
         this._selectable = coerceBooleanProperty(value);
@@ -998,7 +1040,7 @@ class GanttUpper {
     }
 }
 GanttUpper.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0, type: GanttUpper, deps: [{ token: i0.ElementRef }, { token: i0.ChangeDetectorRef }, { token: i0.NgZone }, { token: GANTT_GLOBAL_CONFIG }], target: i0.ɵɵFactoryTarget.Directive });
-GanttUpper.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.1.2", type: GanttUpper, inputs: { originItems: ["items", "originItems"], originGroups: ["groups", "originGroups"], viewType: "viewType", start: "start", end: "end", showTodayLine: "showTodayLine", draggable: "draggable", styles: "styles", viewOptions: "viewOptions", disabledLoadOnScroll: "disabledLoadOnScroll", selectable: "selectable", multiple: "multiple" }, outputs: { loadOnScroll: "loadOnScroll", dragStarted: "dragStarted", dragMoved: "dragMoved", dragEnded: "dragEnded", barClick: "barClick" }, host: { properties: { "class.gantt": "this.ganttClass" } }, queries: [{ propertyName: "barTemplate", first: true, predicate: ["bar"], descendants: true, static: true }, { propertyName: "rangeTemplate", first: true, predicate: ["range"], descendants: true, static: true }, { propertyName: "itemTemplate", first: true, predicate: ["item"], descendants: true, static: true }, { propertyName: "groupTemplate", first: true, predicate: ["group"], descendants: true, static: true }, { propertyName: "groupHeaderTemplate", first: true, predicate: ["groupHeader"], descendants: true, static: true }], ngImport: i0 });
+GanttUpper.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.1.2", type: GanttUpper, inputs: { originItems: ["items", "originItems"], originGroups: ["groups", "originGroups"], viewType: "viewType", start: "start", end: "end", showTodayLine: "showTodayLine", draggable: "draggable", styles: "styles", viewOptions: "viewOptions", linkOptions: "linkOptions", disabledLoadOnScroll: "disabledLoadOnScroll", selectable: "selectable", multiple: "multiple" }, outputs: { loadOnScroll: "loadOnScroll", dragStarted: "dragStarted", dragMoved: "dragMoved", dragEnded: "dragEnded", barClick: "barClick" }, host: { properties: { "class.gantt": "this.ganttClass" } }, queries: [{ propertyName: "barTemplate", first: true, predicate: ["bar"], descendants: true, static: true }, { propertyName: "rangeTemplate", first: true, predicate: ["range"], descendants: true, static: true }, { propertyName: "itemTemplate", first: true, predicate: ["item"], descendants: true, static: true }, { propertyName: "groupTemplate", first: true, predicate: ["group"], descendants: true, static: true }, { propertyName: "groupHeaderTemplate", first: true, predicate: ["groupHeader"], descendants: true, static: true }], ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0, type: GanttUpper, decorators: [{
             type: Directive
         }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i0.ChangeDetectorRef }, { type: i0.NgZone }, { type: undefined, decorators: [{
@@ -1024,6 +1066,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.2", ngImpor
                 type: Input
             }], viewOptions: [{
                 type: Input
+            }], linkOptions: [{
+                type: Input
             }], disabledLoadOnScroll: [{
                 type: Input
             }], selectable: [{
@@ -1532,63 +1576,77 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.2", ngImpor
             type: Injectable
         }], ctorParameters: function () { return []; } });
 
+function getDependencyType(path, dependencyTypes) {
+    if (dependencyTypes.includes(GanttLinkType.ss) && path.from.pos === InBarPosition.start && path.to.pos === InBarPosition.start) {
+        return GanttLinkType.ss;
+    }
+    if (dependencyTypes.includes(GanttLinkType.ff) && path.from.pos === InBarPosition.finish && path.to.pos === InBarPosition.finish) {
+        return GanttLinkType.ff;
+    }
+    if (dependencyTypes.includes(GanttLinkType.sf) && path.from.pos === InBarPosition.start && path.to.pos === InBarPosition.finish) {
+        return GanttLinkType.sf;
+    }
+    return GanttLinkType.fs;
+}
+var InBarPosition;
+(function (InBarPosition) {
+    InBarPosition["start"] = "start";
+    InBarPosition["finish"] = "finish";
+})(InBarPosition || (InBarPosition = {}));
 class GanttDragContainer {
-    constructor() {
+    constructor(ganttUpper) {
+        this.ganttUpper = ganttUpper;
         this.dragStarted = new EventEmitter();
         this.dragMoved = new EventEmitter();
         this.dragEnded = new EventEmitter();
         this.linkDragStarted = new EventEmitter();
         this.linkDragEntered = new EventEmitter();
         this.linkDragEnded = new EventEmitter();
+        this.linkDragPath = { from: null, to: null };
     }
-    emitLinkDragStarted(from, item) {
-        this.linkDraggingId = item.id;
-        this.linkDragFrom = from;
-        this.linkDragSource = this.linkDragFrom === 'source' ? item : null;
-        this.linkDragTarget = this.linkDragFrom === 'target' ? item : null;
+    emitLinkDragStarted(from) {
+        this.linkDraggingId = from.item.id;
+        this.linkDragPath.from = from;
         this.linkDragStarted.emit({
-            source: this.linkDragSource && this.linkDragSource.origin,
-            target: this.linkDragTarget && this.linkDragTarget.origin
+            source: from.item.origin,
+            target: null
         });
     }
-    emitLinkDragEntered(item) {
-        if (this.linkDragFrom === 'source') {
-            this.linkDragTarget = item;
-        }
-        else {
-            this.linkDragSource = item;
-        }
+    emitLinkDragEntered(to) {
+        this.linkDragPath.to = to;
         this.linkDragEntered.emit({
-            source: this.linkDragSource.origin,
-            target: this.linkDragTarget.origin
+            source: this.linkDragPath.from.item.origin,
+            target: to.item.origin
         });
     }
     emitLinkDragLeaved() {
-        if (this.linkDragFrom === 'source') {
-            this.linkDragTarget = null;
-        }
-        else {
-            this.linkDragSource = null;
-        }
+        this.linkDragPath.to = null;
     }
-    emitLinkDragEnded() {
+    emitLinkDragEnded(to) {
+        var _a;
+        this.linkDragPath.to = to;
+        const dependencyType = getDependencyType(this.linkDragPath, (_a = this.ganttUpper.linkOptions) === null || _a === void 0 ? void 0 : _a.dependencyTypes);
+        this.linkDragPath.from.item.addLink({
+            link: this.linkDragPath.to.item.id,
+            type: dependencyType
+        });
+        this.linkDragEnded.emit({
+            source: this.linkDragPath.from.item.origin,
+            target: this.linkDragPath.to.item.origin,
+            type: dependencyType
+        });
         this.linkDraggingId = null;
-        if (this.linkDragSource && this.linkDragTarget) {
-            this.linkDragSource.addLink(this.linkDragTarget.id);
-            this.linkDragEnded.emit({
-                source: this.linkDragSource.origin,
-                target: this.linkDragTarget.origin
-            });
-        }
-        this.linkDragSource = null;
-        this.linkDragTarget = null;
+        this.linkDragPath = { from: null, to: null };
     }
 }
-GanttDragContainer.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0, type: GanttDragContainer, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+GanttDragContainer.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0, type: GanttDragContainer, deps: [{ token: GANTT_UPPER_TOKEN }], target: i0.ɵɵFactoryTarget.Injectable });
 GanttDragContainer.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0, type: GanttDragContainer });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0, type: GanttDragContainer, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return []; } });
+        }], ctorParameters: function () { return [{ type: GanttUpper, decorators: [{
+                    type: Inject,
+                    args: [GANTT_UPPER_TOKEN]
+                }] }]; } });
 
 class GanttPrintService {
     constructor() { }
@@ -1884,12 +1942,186 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.2", ngImpor
                 args: ['mainTemplate', { static: true }]
             }] } });
 
-var LinkColors;
-(function (LinkColors) {
-    LinkColors["default"] = "#cacaca";
-    LinkColors["blocked"] = "#FF7575";
-    LinkColors["active"] = "#348FE4";
-})(LinkColors || (LinkColors = {}));
+class GanttLinkLine {
+    constructor() { }
+    generatePath(source, target, type) {
+        if (source.before && source.after && target.before && target.after) {
+            let path = '';
+            switch (type) {
+                case GanttLinkType.ss:
+                    path = this.generateSSPath(source, target);
+                    break;
+                case GanttLinkType.ff:
+                    path = this.generateFFPath(source, target);
+                    break;
+                case GanttLinkType.sf:
+                    path = this.generateFSAndSFPath(source, target, type);
+                    break;
+                default:
+                    path = this.generateFSAndSFPath(source, target);
+            }
+            return path;
+        }
+    }
+}
+
+let GanttLinkLineCurve = class GanttLinkLineCurve extends GanttLinkLine {
+    constructor(ganttUpper) {
+        super();
+        this.ganttUpper = ganttUpper;
+    }
+    generateSSPath(source, target) {
+        const x1 = source.before.x;
+        const y1 = source.before.y;
+        const x4 = target.before.x;
+        const y4 = target.before.y;
+        const isMirror = y4 > y1 ? 0 : 1;
+        const radius = Math.abs(y4 - y1) / 2;
+        if (x4 > x1) {
+            return `M ${x1} ${y1}
+                    A ${radius} ${radius} 0 1 ${isMirror} ${x1} ${y4}
+                    L ${x4} ${y4}`;
+        }
+        else {
+            return `M ${x1} ${y1}
+                    L ${x4} ${y1}
+                    A ${radius} ${radius} 0 1 ${isMirror} ${x4} ${y4}`;
+        }
+    }
+    generateFFPath(source, target) {
+        const x1 = source.after.x;
+        const y1 = source.after.y;
+        const x4 = target.after.x;
+        const y4 = target.after.y;
+        const isMirror = y4 > y1 ? 1 : 0;
+        const radius = Math.abs(y4 - y1) / 2;
+        if (x4 > x1) {
+            return `M ${x1} ${y1}
+                    L ${x4} ${y1}
+                    A ${radius} ${radius} 0 1 ${isMirror} ${x4} ${y4}`;
+        }
+        else {
+            return `M ${x1} ${y1}
+                    A ${radius} ${radius} 0 1 ${isMirror} ${x1} ${y4}
+                    L ${x4} ${y4}`;
+        }
+    }
+    generateFSAndSFPath(source, target, type) {
+        var _a;
+        let x1 = source.after.x;
+        let y1 = source.after.y;
+        let x4 = target.before.x;
+        let y4 = target.before.y;
+        const bezierWeight = 0.5;
+        if (type === GanttLinkType.sf) {
+            x1 = target.after.x;
+            y1 = target.after.y;
+            x4 = source.before.x;
+            y4 = source.before.y;
+        }
+        let dx = Math.abs(x4 - x1) * bezierWeight;
+        let x2 = x1 + dx;
+        let x3 = x4 - dx;
+        const centerX = (x1 + x4) / 2;
+        const centerY = (y1 + y4) / 2;
+        let controlX = this.ganttUpper.styles.lineHeight / 2;
+        const controlY = this.ganttUpper.styles.lineHeight / 2;
+        if (x1 >= x4) {
+            if (Math.abs(y4 - y1) <= this.ganttUpper.styles.lineHeight) {
+                return `M ${x1} ${y1}
+                    C ${x1 + controlX} ${y1} ${x1 + controlX} ${y4 > y1 ? y1 + controlX : y1 - controlX} ${x1} ${y4 > y1 ? y1 + controlY : y1 - controlY}
+                    L ${x4} ${y4 > y1 ? y4 - controlY : y4 + controlY}
+                    C ${x4 - controlY} ${y4 > y1 ? y4 - controlY : y4 + controlY}  ${x4 - controlX} ${y4} ${x4} ${y4}
+                    `;
+            }
+            else {
+                controlX = this.ganttUpper.styles.lineHeight;
+                return `M ${x1} ${y1}
+                    C ${x1 + controlX} ${y1} ${x1 + controlX} ${y4 > y1 ? y1 + controlX : y1 - controlX} ${centerX} ${centerY}
+                    C ${x4 - controlX} ${y4 > y1 ? y4 - controlX : y4 + controlX} ${x4 - controlX} ${y4} ${x4} ${y4}
+                    `;
+            }
+        }
+        else if (((_a = this.ganttUpper.linkOptions) === null || _a === void 0 ? void 0 : _a.showArrow) && x4 - x1 < 200) {
+            dx = Math.max(Math.abs(y4 - y1) * bezierWeight, 60);
+            x2 = x1 + dx;
+            x3 = x4 - dx;
+            return `M ${x1} ${y1} C ${x2} ${y1} ${x3} ${y4} ${x4} ${y4}`;
+        }
+        return `M ${x1} ${y1} C ${x2} ${y1} ${x3} ${y4} ${x4} ${y4}`;
+    }
+};
+GanttLinkLineCurve = __decorate([
+    __param(0, Inject(GANTT_UPPER_TOKEN))
+], GanttLinkLineCurve);
+
+class GanttLinkLineStraight extends GanttLinkLine {
+    constructor() {
+        super();
+        this.pathControl = 20;
+    }
+    generateSSPath(source, target) {
+        const x1 = source.before.x;
+        const y1 = source.before.y;
+        const x4 = target.before.x;
+        const y4 = target.before.y;
+        const control = this.pathControl;
+        return `M ${x1} ${y1}
+                        L ${x4 > x1 ? x1 - control : x4 - control} ${y1}
+                        L ${x4 > x1 ? x1 - control : x4 - control} ${y4}
+                        L ${x4} ${y4}`;
+    }
+    generateFFPath(source, target) {
+        const x1 = source.after.x;
+        const y1 = source.after.y;
+        const x4 = target.after.x;
+        const y4 = target.after.y;
+        const control = this.pathControl;
+        return `M ${x1} ${y1}
+                        L ${x4 > x1 ? x4 + control : x1 + control} ${y1}
+                        L ${x4 > x1 ? x4 + control : x1 + control} ${y4}
+                        L ${x4} ${y4}`;
+    }
+    generateFSAndSFPath(source, target, type) {
+        let x1 = source.after.x;
+        let y1 = source.after.y;
+        let x4 = target.before.x;
+        let y4 = target.before.y;
+        const control = this.pathControl;
+        if (type === GanttLinkType.sf) {
+            x1 = target.after.x;
+            y1 = target.after.y;
+            x4 = source.before.x;
+            y4 = source.before.y;
+        }
+        if (x4 - x1 >= 40) {
+            return `M ${x1} ${y1}
+                        L ${x1 + control} ${y1}
+                        L ${x1 + control} ${y4}
+                        L ${x4} ${y4}`;
+        }
+        else {
+            return `M ${x1} ${y1}
+                        L ${x1 + control} ${y1}
+                        L ${x1 + control} ${y4 > y1 ? y1 + control : y1 - control}
+                        L ${x4 - control} ${y4 > y1 ? y1 + control : y1 - control}
+                        L ${x4 - control} ${y4}
+                        L ${x4} ${y4}`;
+        }
+    }
+}
+
+function createLineGenerator(type, ganttUpper) {
+    switch (type) {
+        case GanttLinkLineType.curve:
+            return new GanttLinkLineCurve(ganttUpper);
+        case GanttLinkLineType.straight:
+            return new GanttLinkLineStraight();
+        default:
+            throw new Error('gantt link path type invalid');
+    }
+}
+
 class GanttLinksComponent {
     constructor(ganttUpper, cdr, elementRef, ganttDragContainer) {
         this.ganttUpper = ganttUpper;
@@ -1900,20 +2132,23 @@ class GanttLinksComponent {
         this.items = [];
         this.lineClick = new EventEmitter();
         this.links = [];
+        this.ganttLinkTypes = GanttLinkType;
+        this.showArrow = false;
         this.linkItems = [];
-        this.bezierWeight = -0.5;
         this.firstChange = true;
         this.unsubscribe$ = new Subject();
         this.ganttLinksOverlay = true;
     }
     ngOnInit() {
+        this.linkLine = createLineGenerator(this.ganttUpper.linkOptions.lineType, this.ganttUpper);
+        this.showArrow = this.ganttUpper.linkOptions.showArrow;
         this.buildLinks();
         this.firstChange = false;
         this.ganttDragContainer.dragStarted.pipe(takeUntil(this.unsubscribe$)).subscribe(() => {
             this.elementRef.nativeElement.style.visibility = 'hidden';
         });
         merge(this.ganttUpper.viewChange, this.ganttUpper.expandChange, this.ganttUpper.view.start$, this.ganttUpper.dragEnded, this.ganttUpper.linkDragEnded)
-            .pipe(takeUntil(this.unsubscribe$), skip(1))
+            .pipe(takeUntil(this.unsubscribe$), skip(1), debounceTime(0))
             .subscribe(() => {
             this.elementRef.nativeElement.style.visibility = 'visible';
             this.buildLinks();
@@ -1964,77 +2199,24 @@ class GanttLinksComponent {
             });
         }
     }
-    generatePath(source, target) {
-        if (source.before && source.after && target.before && target.after) {
-            const x1 = source.after.x;
-            const y1 = source.after.y;
-            const x4 = target.before.x;
-            const y4 = target.before.y;
-            const dx = Math.abs(x4 - x1) * this.bezierWeight;
-            const x2 = x1 - dx;
-            const x3 = x4 + dx;
-            const centerX = (x1 + x4) / 2;
-            const centerY = (y1 + y4) / 2;
-            let controlX = this.ganttUpper.styles.lineHeight / 2;
-            const controlY = this.ganttUpper.styles.lineHeight / 2;
-            if (x1 >= x4) {
-                if (y4 > y1) {
-                    if (Math.abs(y4 - y1) <= this.ganttUpper.styles.lineHeight) {
-                        return `M ${x1} ${y1}
-                        C ${x1 + controlX} ${y1} ${x1 + controlX} ${y1 + controlX} ${x1} ${y1 + controlY}
-                        L ${x1} ${y1 + controlY} ${centerX} ${centerY}
-
-                        M ${x4} ${y4}
-                        C ${x4 - controlX} ${y4} ${x4 - controlX} ${y4 - controlX} ${x4} ${y4 - controlY}
-                        L ${x4} ${y4 - controlY} ${centerX} ${centerY}`;
-                    }
-                    else {
-                        controlX = this.ganttUpper.styles.lineHeight;
-                        return `M ${x1} ${y1}
-                        C ${x1 + controlX} ${y1} ${x1 + controlX} ${y1 + controlX} ${centerX} ${centerY}
-
-
-                        M ${x4} ${y4}
-                        C ${x4 - controlX} ${y4} ${x4 - controlX} ${y4 - controlX} ${centerX} ${centerY}`;
-                    }
-                }
-                else {
-                    if (Math.abs(y4 - y1) <= this.ganttUpper.styles.lineHeight) {
-                        return `M ${x1} ${y1}
-                        C ${x1 + controlX} ${y1} ${x1 + controlX} ${y1 - controlX} ${x1} ${y1 - controlY}
-                        L ${x1} ${y1 - controlY} ${centerX} ${centerY}
-
-                        M ${x4} ${y4}
-                        C ${x4 - controlX} ${y4} ${x4 - controlX} ${y4 + controlX} ${x4} ${y4 + controlY}
-                        L ${x4} ${y4 + controlY} ${centerX} ${centerY}
-                        `;
-                    }
-                    else {
-                        controlX = this.ganttUpper.styles.lineHeight;
-                        return `M ${x1} ${y1}
-                        C ${x1 + controlX} ${y1} ${x1 + controlX} ${y1 - controlX} ${centerX} ${centerY}
-
-                        M ${x4} ${y4}
-                        C ${x4 - controlX} ${y4} ${x4 - controlX} ${y4 + controlX} ${centerX} ${centerY}`;
-                    }
-                }
-            }
-            return `M ${x1} ${y1} C ${x2} ${y1} ${x3} ${y4} ${x4} ${y4}`;
-        }
-    }
     buildLinks() {
         this.computeItemPosition();
         this.links = [];
         this.linkItems.forEach((source) => {
             if (source.origin.start || source.origin.end) {
-                source.links.forEach((linkId) => {
-                    const target = this.linkItems.find((item) => item.id === linkId);
+                source.links.forEach((link) => {
+                    const target = this.linkItems.find((item) => item.id === link.link);
                     if (target && (target.origin.start || target.origin.end)) {
+                        let color = LinkColors.default;
+                        if (link.type === GanttLinkType.fs && source.end.getTime() > target.start.getTime()) {
+                            color = LinkColors.blocked;
+                        }
                         this.links.push({
-                            path: this.generatePath(source, target),
+                            path: this.linkLine.generatePath(source, target, link.type),
                             source: source.origin,
                             target: target.origin,
-                            color: source.end.getTime() > target.start.getTime() ? LinkColors.blocked : LinkColors.default
+                            type: link.type,
+                            color: link.color || color
                         });
                     }
                 });
@@ -2067,7 +2249,7 @@ class GanttLinksComponent {
     }
 }
 GanttLinksComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0, type: GanttLinksComponent, deps: [{ token: GANTT_UPPER_TOKEN }, { token: i0.ChangeDetectorRef }, { token: i0.ElementRef }, { token: GanttDragContainer }], target: i0.ɵɵFactoryTarget.Component });
-GanttLinksComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.1.2", type: GanttLinksComponent, selector: "gantt-links-overlay", inputs: { groups: "groups", items: "items" }, outputs: { lineClick: "lineClick" }, host: { properties: { "class.gantt-links-overlay": "this.ganttLinksOverlay" } }, usesOnChanges: true, ngImport: i0, template: "<svg [attr.width]=\"ganttUpper.view.width\" class=\"gantt-links-overlay-main\">\n  <ng-container *ngFor=\"let link of links; let i = index; trackBy: trackBy\">\n    <path [attr.d]=\"link.path\" fill=\"transparent\" stroke-width=\"2\" [attr.stroke]=\"link.color\" pointer-events=\"none\"></path>\n    <g>\n      <path\n        class=\"link-line\"\n        (click)=\"onLineClick($event, link)\"\n        (mouseenter)=\"mouseEnterPath(link)\"\n        (mouseleave)=\"mouseLeavePath(link)\"\n        [attr.d]=\"link.path\"\n        stroke=\"transparent\"\n        stroke-width=\"9\"\n        fill=\"none\"\n        cursor=\"pointer\"\n      ></path>\n    </g>\n  </ng-container>\n  <line class=\"link-dragging-line\"></line>\n</svg>\n", directives: [{ type: i2.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }] });
+GanttLinksComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.1.2", type: GanttLinksComponent, selector: "gantt-links-overlay", inputs: { groups: "groups", items: "items" }, outputs: { lineClick: "lineClick" }, host: { properties: { "class.gantt-links-overlay": "this.ganttLinksOverlay" } }, usesOnChanges: true, ngImport: i0, template: "<svg [attr.width]=\"ganttUpper.view.width\" class=\"gantt-links-overlay-main\">\n  <ng-container *ngFor=\"let link of links; let i = index; trackBy: trackBy\">\n    <path\n      [attr.d]=\"link.path\"\n      fill=\"transparent\"\n      stroke-width=\"2\"\n      [attr.stroke]=\"link.color\"\n      pointer-events=\"none\"\n      [attr.style]=\"link.type === ganttLinkTypes.sf ? 'marker-start: url(#triangle' + i + ')' : 'marker-end: url(#triangle' + i + ')'\"\n    ></path>\n    <g>\n      <path\n        class=\"link-line\"\n        (click)=\"onLineClick($event, link)\"\n        (mouseenter)=\"mouseEnterPath(link)\"\n        (mouseleave)=\"mouseLeavePath(link)\"\n        [attr.d]=\"link.path\"\n        stroke=\"transparent\"\n        stroke-width=\"9\"\n        fill=\"none\"\n        cursor=\"pointer\"\n      ></path>\n    </g>\n    <defs *ngIf=\"showArrow\">\n      <marker\n        *ngIf=\"link.type === ganttLinkTypes.sf; else markerEnd\"\n        [id]=\"'triangle' + i\"\n        markerUnits=\"strokeWidth\"\n        markerWidth=\"5\"\n        markerHeight=\"4\"\n        refX=\"5\"\n        refY=\"2\"\n        orient=\"180\"\n      >\n        <path [attr.fill]=\"link.color\" [attr.stroke]=\"link.color\" d=\"M 0 0 L 5 2 L 0 4 z\" />\n      </marker>\n\n      <ng-template #markerEnd>\n        <marker [id]=\"'triangle' + i\" markerUnits=\"strokeWidth\" markerWidth=\"5\" markerHeight=\"4\" refX=\"5\" refY=\"2\" orient=\"auto\">\n          <path [attr.fill]=\"link.color\" [attr.stroke]=\"link.color\" d=\"M 0 0 L 5 2 L 0 4 z\" />\n        </marker>\n      </ng-template>\n    </defs>\n  </ng-container>\n  <line class=\"link-dragging-line\"></line>\n</svg>\n", directives: [{ type: i2.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0, type: GanttLinksComponent, decorators: [{
             type: Component,
             args: [{
@@ -2171,7 +2353,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.2", ngImpor
 
 const dragMinWidth = 10;
 const activeClass = 'gantt-bar-active';
-const linkDropClass = 'gantt-bar-link-drop';
+const dropActiveClass = 'gantt-bar-drop-active';
+const singleDropActiveClass = 'gantt-bar-single-drop-active';
 function createSvgElement(qualifiedName, className) {
     const element = document.createElementNS('http://www.w3.org/2000/svg', qualifiedName);
     element.classList.add(className);
@@ -2192,13 +2375,21 @@ class GanttBarDrag {
         return !this.item.linkable || !this.ganttUpper.linkable;
     }
     createMouseEvents() {
+        var _a, _b, _c;
+        const dropClass = ((_b = (_a = this.ganttUpper.config.linkOptions) === null || _a === void 0 ? void 0 : _a.dependencyTypes) === null || _b === void 0 ? void 0 : _b.length) === 1 &&
+            ((_c = this.ganttUpper.config.linkOptions) === null || _c === void 0 ? void 0 : _c.dependencyTypes[0]) === GanttLinkType.fs
+            ? singleDropActiveClass
+            : dropActiveClass;
         fromEvent(this.barElement, 'mouseenter')
             .pipe(takeUntil(this.destroy$))
-            .subscribe(() => {
+            .subscribe((event) => {
             if (this.dragContainer.linkDraggingId && this.dragContainer.linkDraggingId !== this.item.id) {
                 if (this.item.linkable) {
-                    this.barElement.classList.add(linkDropClass);
-                    this.dragContainer.emitLinkDragEntered(this.item);
+                    this.barElement.classList.add(dropClass);
+                    this.dragContainer.emitLinkDragEntered({
+                        item: this.item,
+                        element: this.barElement
+                    });
                 }
             }
             else {
@@ -2207,14 +2398,14 @@ class GanttBarDrag {
         });
         fromEvent(this.barElement, 'mouseleave')
             .pipe(takeUntil(this.destroy$))
-            .subscribe(() => {
+            .subscribe((event) => {
             if (!this.dragContainer.linkDraggingId) {
                 this.barElement.classList.remove(activeClass);
             }
             else {
                 this.dragContainer.emitLinkDragLeaved();
             }
-            this.barElement.classList.remove(linkDropClass);
+            this.barElement.classList.remove(dropClass);
         });
     }
     createBarDrag() {
@@ -2225,19 +2416,22 @@ class GanttBarDrag {
             this.dragContainer.dragStarted.emit({ item: this.item.origin });
         });
         dragRef.moved.subscribe((event) => {
-            const x = this.item.refs.x + event.distance.x;
-            const days = differenceInCalendarDays(this.item.end.value, this.item.start.value);
-            const start = this.ganttUpper.view.getDateByXPoint(x);
-            const end = start.addDays(days);
-            this.openDragBackdrop(this.barElement, this.ganttUpper.view.getDateByXPoint(x), end);
+            const currentX = this.item.refs.x + event.distance.x;
+            const currentDate = this.ganttUpper.view.getDateByXPoint(currentX);
+            const currentStartX = this.ganttUpper.view.getXPointByDate(currentDate);
+            const dayWidth = this.ganttUpper.view.getDayOccupancyWidth(currentDate);
+            const diffDays = differenceInCalendarDays(this.item.end.value, this.item.start.value);
+            let start = currentDate;
+            let end = currentDate.addDays(diffDays);
+            if (currentX > currentStartX + dayWidth / 2) {
+                start = start.addDays(1);
+                end = end.addDays(1);
+            }
+            this.openDragBackdrop(this.barElement, start, end);
             this.item.updateDate(start, end);
             this.dragContainer.dragMoved.emit({ item: this.item.origin });
         });
         dragRef.ended.subscribe((event) => {
-            const days = differenceInCalendarDays(this.item.end.value, this.item.start.value);
-            const start = this.ganttUpper.view.getDateByXPoint(this.item.refs.x + event.distance.x);
-            const end = start.addDays(days);
-            this.item.updateDate(start, end);
             this.clearDraggingStyles();
             this.closeDragBackdrop();
             event.source.reset();
@@ -2311,7 +2505,7 @@ class GanttBarDrag {
         const dragRefs = [];
         const handles = this.barElement.querySelectorAll('.link-handles .handle');
         handles.forEach((handle, index) => {
-            const isBefore = index === 0;
+            const isBegin = index === 0;
             const dragRef = this.dragDrop.createDrag(handle);
             dragRef.withBoundaryElement(this.dom.root);
             dragRef.beforeStarted.subscribe(() => {
@@ -2320,24 +2514,35 @@ class GanttBarDrag {
                     this.barDragRef.disabled = true;
                 }
                 this.createLinkDraggingLine();
-                this.dragContainer.emitLinkDragStarted(isBefore ? 'target' : 'source', this.item);
+                this.dragContainer.emitLinkDragStarted({
+                    element: this.barElement,
+                    item: this.item,
+                    pos: isBegin ? InBarPosition.start : InBarPosition.finish
+                });
             });
             dragRef.moved.subscribe(() => {
-                const positions = this.calcLinkLinePositions(handle, isBefore);
+                const positions = this.calcLinkLinePositions(handle, isBegin);
                 this.linkDraggingLine.setAttribute('x1', positions.x1.toString());
                 this.linkDraggingLine.setAttribute('y1', positions.y1.toString());
                 this.linkDraggingLine.setAttribute('x2', positions.x2.toString());
                 this.linkDraggingLine.setAttribute('y2', positions.y2.toString());
             });
             dragRef.ended.subscribe((event) => {
-                event.source.reset();
                 handle.style.pointerEvents = '';
                 if (this.barDragRef) {
                     this.barDragRef.disabled = false;
                 }
+                // 计算line拖动的落点位于目标Bar的值，如果值大于Bar宽度的一半，说明是拖动到Begin位置，否则则为拖动到End位置
+                if (this.dragContainer.linkDragPath.to) {
+                    const placePointX = event.source.getRootElement().getBoundingClientRect().x -
+                        this.dragContainer.linkDragPath.to.element.getBoundingClientRect().x;
+                    this.dragContainer.emitLinkDragEnded(Object.assign(Object.assign({}, this.dragContainer.linkDragPath.to), { pos: placePointX < this.dragContainer.linkDragPath.to.item.refs.width / 2
+                            ? InBarPosition.start
+                            : InBarPosition.finish }));
+                }
+                event.source.reset();
                 this.barElement.classList.remove(activeClass);
                 this.destroyLinkDraggingLine();
-                this.dragContainer.emitLinkDragEnded();
             });
             dragRefs.push(dragRef);
         });
@@ -2386,6 +2591,7 @@ class GanttBarDrag {
         if (!this.linkDraggingLine) {
             const svgElement = createSvgElement('svg', 'gantt-link-drag-container');
             const linElement = createSvgElement('line', 'link-dragging-line');
+            linElement.style.pointerEvents = 'none';
             svgElement.appendChild(linElement);
             this.dom.root.appendChild(svgElement);
             this.linkDraggingLine = linElement;
@@ -2630,12 +2836,12 @@ class NgxGanttComponent extends GanttUpper {
         this.selectionModel.toggle(selectedValue.id);
         const selectedIds = this.selectionModel.selected;
         if (this.multiple) {
-            const selectedValue = this.getGanttItems(selectedIds).map((item) => item.origin);
-            this.selectedChange.emit({ event, selectedValue });
+            const _selectedValue = this.getGanttItems(selectedIds).map((item) => item.origin);
+            this.selectedChange.emit({ event, selectedValue: _selectedValue });
         }
         else {
-            const selectedValue = (_a = this.getGanttItem(selectedIds[0])) === null || _a === void 0 ? void 0 : _a.origin;
-            this.selectedChange.emit({ event, selectedValue });
+            const _selectedValue = (_a = this.getGanttItem(selectedIds[0])) === null || _a === void 0 ? void 0 : _a.origin;
+            this.selectedChange.emit({ event, selectedValue: _selectedValue });
         }
     }
     ngOnDestroy() {
@@ -2775,5 +2981,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.2", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { GANTT_GLOBAL_CONFIG, GANTT_UPPER_TOKEN, GanttBarClickEvent, GanttDate, GanttDatePoint, GanttDragEvent, GanttGroupInternal, GanttItemInternal, GanttItemType, GanttItemUpper, GanttLineClickEvent, GanttLinkDragEvent, GanttLoadOnScrollEvent, GanttPrintService, GanttSelectedEvent, GanttTableEvent, GanttUpper, GanttView, GanttViewType, IsGanttBarItemPipe, IsGanttCustomItemPipe, IsGanttRangeItemPipe, NgxGanttBarComponent, NgxGanttComponent, NgxGanttModule, NgxGanttRangeComponent, NgxGanttRootComponent, NgxGanttTableColumnComponent, NgxGanttTableComponent, defaultConfig, primaryDatePointTop, secondaryDatePointTop };
+export { GANTT_GLOBAL_CONFIG, GANTT_UPPER_TOKEN, GanttBarClickEvent, GanttDate, GanttDatePoint, GanttDragEvent, GanttGroupInternal, GanttItemInternal, GanttItemType, GanttItemUpper, GanttLineClickEvent, GanttLinkDragEvent, GanttLinkLineType, GanttLinkType, GanttLoadOnScrollEvent, GanttPrintService, GanttSelectedEvent, GanttTableEvent, GanttUpper, GanttView, GanttViewType, IsGanttBarItemPipe, IsGanttCustomItemPipe, IsGanttRangeItemPipe, LinkColors, NgxGanttBarComponent, NgxGanttComponent, NgxGanttModule, NgxGanttRangeComponent, NgxGanttRootComponent, NgxGanttTableColumnComponent, NgxGanttTableComponent, defaultConfig, primaryDatePointTop, secondaryDatePointTop };
 //# sourceMappingURL=worktile-gantt.js.map