@worktile/gantt 12.1.3 → 12.2.0

package/bundles/worktile-gantt.umd.js

@@ -564,6 +564,25 @@
         GanttViewType["week"] = "week";
     })(exports.GanttViewType || (exports.GanttViewType = {}));
 
+    exports.GanttLinkType = void 0;
+    (function (GanttLinkType) {
+        GanttLinkType[GanttLinkType["fs"] = 1] = "fs";
+        GanttLinkType[GanttLinkType["ff"] = 2] = "ff";
+        GanttLinkType[GanttLinkType["ss"] = 3] = "ss";
+        GanttLinkType[GanttLinkType["sf"] = 4] = "sf";
+    })(exports.GanttLinkType || (exports.GanttLinkType = {}));
+    exports.GanttLinkLineType = void 0;
+    (function (GanttLinkLineType) {
+        GanttLinkLineType["curve"] = "curve";
+        GanttLinkLineType["straight"] = "straight";
+    })(exports.GanttLinkLineType || (exports.GanttLinkLineType = {}));
+    exports.LinkColors = void 0;
+    (function (LinkColors) {
+        LinkColors["default"] = "#cacaca";
+        LinkColors["blocked"] = "#FF7575";
+        LinkColors["active"] = "#348FE4";
+    })(exports.LinkColors || (exports.LinkColors = {}));
+
     exports.GanttItemType = void 0;
     (function (GanttItemType) {
         GanttItemType["bar"] = "bar";
@@ -576,7 +595,17 @@
             this.refs$ = new rxjs.BehaviorSubject(null);
             this.origin = item;
             this.id = this.origin.id;
-            this.links = this.origin.links || [];
+            this.links = (this.origin.links || []).map(function (link) {
+                if (typeof link === 'string') {
+                    return {
+                        type: exports.GanttLinkType.fs,
+                        link: link
+                    };
+                }
+                else {
+                    return link;
+                }
+            });
             this.color = this.origin.color;
             this.barStyle = this.origin.barStyle;
             this.linkable = this.origin.linkable === undefined ? true : this.origin.linkable;
@@ -639,8 +668,9 @@
             this.expanded = expanded;
             this.origin.expanded = expanded;
         };
-        GanttItemInternal.prototype.addLink = function (linkId) {
-            this.links = __spreadArray(__spreadArray([], __read(this.links)), [linkId]);
+        GanttItemInternal.prototype.addLink = function (link) {
+            console.log(link);
+            this.links = __spreadArray(__spreadArray([], __read(this.links)), [link]);
             this.origin.links = this.links;
         };
         return GanttItemInternal;
@@ -671,7 +701,12 @@
             quarter: 'QQQ',
             year: 'yyyy年',
             yearMonth: 'yyyy年MM月',
-            yearQuarter: 'yyyy年QQQ',
+            yearQuarter: 'yyyy年QQQ'
+        },
+        linkOptions: {
+            dependencyTypes: [exports.GanttLinkType.fs],
+            showArrow: false,
+            lineType: exports.GanttLinkLineType.curve
         }
     };
     var GANTT_GLOBAL_CONFIG = new i0.InjectionToken('GANTT_GLOBAL_CONFIG');
@@ -1166,6 +1201,16 @@
             this._multiple = false;
             this.ganttClass = true;
         }
+        Object.defineProperty(GanttUpper.prototype, "linkOptions", {
+            get: function () {
+                return Object.assign({}, defaultConfig.linkOptions, this.config.linkOptions, this._linkOptions);
+            },
+            set: function (options) {
+                this._linkOptions = options;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(GanttUpper.prototype, "selectable", {
             get: function () {
                 return this._selectable;
@@ -1410,7 +1455,7 @@
         return GanttUpper;
     }());
     GanttUpper.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0__namespace, type: GanttUpper, deps: [{ token: i0__namespace.ElementRef }, { token: i0__namespace.ChangeDetectorRef }, { token: i0__namespace.NgZone }, { token: GANTT_GLOBAL_CONFIG }], target: i0__namespace.ɵɵFactoryTarget.Directive });
-    GanttUpper.ɵdir = i0__namespace.ɵɵ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__namespace });
+    GanttUpper.ɵdir = i0__namespace.ɵɵ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__namespace });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0__namespace, type: GanttUpper, decorators: [{
                 type: i0.Directive
             }], ctorParameters: function () {
@@ -1438,6 +1483,8 @@
                     type: i0.Input
                 }], viewOptions: [{
                     type: i0.Input
+                }], linkOptions: [{
+                    type: i0.Input
                 }], disabledLoadOnScroll: [{
                     type: i0.Input
                 }], selectable: [{
@@ -1907,64 +1954,80 @@
                 type: i0.Injectable
             }], ctorParameters: function () { return []; } });
 
+    function getDependencyType(path, dependencyTypes) {
+        if (dependencyTypes.includes(exports.GanttLinkType.ss) && path.from.pos === InBarPosition.start && path.to.pos === InBarPosition.start) {
+            return exports.GanttLinkType.ss;
+        }
+        if (dependencyTypes.includes(exports.GanttLinkType.ff) && path.from.pos === InBarPosition.finish && path.to.pos === InBarPosition.finish) {
+            return exports.GanttLinkType.ff;
+        }
+        if (dependencyTypes.includes(exports.GanttLinkType.sf) && path.from.pos === InBarPosition.start && path.to.pos === InBarPosition.finish) {
+            return exports.GanttLinkType.sf;
+        }
+        return exports.GanttLinkType.fs;
+    }
+    var InBarPosition;
+    (function (InBarPosition) {
+        InBarPosition["start"] = "start";
+        InBarPosition["finish"] = "finish";
+    })(InBarPosition || (InBarPosition = {}));
     var GanttDragContainer = /** @class */ (function () {
-        function GanttDragContainer() {
+        function GanttDragContainer(ganttUpper) {
+            this.ganttUpper = ganttUpper;
             this.dragStarted = new i0.EventEmitter();
             this.dragMoved = new i0.EventEmitter();
             this.dragEnded = new i0.EventEmitter();
             this.linkDragStarted = new i0.EventEmitter();
             this.linkDragEntered = new i0.EventEmitter();
             this.linkDragEnded = new i0.EventEmitter();
+            this.linkDragPath = { from: null, to: null };
         }
-        GanttDragContainer.prototype.emitLinkDragStarted = function (from, item) {
-            this.linkDraggingId = item.id;
-            this.linkDragFrom = from;
-            this.linkDragSource = this.linkDragFrom === 'source' ? item : null;
-            this.linkDragTarget = this.linkDragFrom === 'target' ? item : null;
+        GanttDragContainer.prototype.emitLinkDragStarted = function (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
             });
         };
-        GanttDragContainer.prototype.emitLinkDragEntered = function (item) {
-            if (this.linkDragFrom === 'source') {
-                this.linkDragTarget = item;
-            }
-            else {
-                this.linkDragSource = item;
-            }
+        GanttDragContainer.prototype.emitLinkDragEntered = function (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
             });
         };
         GanttDragContainer.prototype.emitLinkDragLeaved = function () {
-            if (this.linkDragFrom === 'source') {
-                this.linkDragTarget = null;
-            }
-            else {
-                this.linkDragSource = null;
-            }
+            this.linkDragPath.to = null;
         };
-        GanttDragContainer.prototype.emitLinkDragEnded = function () {
+        GanttDragContainer.prototype.emitLinkDragEnded = function (to) {
+            var _a;
+            this.linkDragPath.to = to;
+            var 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 };
         };
         return GanttDragContainer;
     }());
-    GanttDragContainer.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0__namespace, type: GanttDragContainer, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    GanttDragContainer.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0__namespace, type: GanttDragContainer, deps: [{ token: GANTT_UPPER_TOKEN }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     GanttDragContainer.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0__namespace, type: GanttDragContainer });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0__namespace, type: GanttDragContainer, decorators: [{
                 type: i0.Injectable
-            }], ctorParameters: function () { return []; } });
+            }], ctorParameters: function () {
+            return [{ type: GanttUpper, decorators: [{
+                            type: i0.Inject,
+                            args: [GANTT_UPPER_TOKEN]
+                        }] }];
+        } });
 
     var GanttPrintService = /** @class */ (function () {
         function GanttPrintService() {
@@ -2315,12 +2378,165 @@
                     args: ['mainTemplate', { static: true }]
                 }] } });
 
-    var LinkColors;
-    (function (LinkColors) {
-        LinkColors["default"] = "#cacaca";
-        LinkColors["blocked"] = "#FF7575";
-        LinkColors["active"] = "#348FE4";
-    })(LinkColors || (LinkColors = {}));
+    var GanttLinkLine = /** @class */ (function () {
+        function GanttLinkLine() {
+        }
+        GanttLinkLine.prototype.generatePath = function (source, target, type) {
+            if (source.before && source.after && target.before && target.after) {
+                var path = '';
+                switch (type) {
+                    case exports.GanttLinkType.ss:
+                        path = this.generateSSPath(source, target);
+                        break;
+                    case exports.GanttLinkType.ff:
+                        path = this.generateFFPath(source, target);
+                        break;
+                    case exports.GanttLinkType.sf:
+                        path = this.generateFSAndSFPath(source, target, type);
+                        break;
+                    default:
+                        path = this.generateFSAndSFPath(source, target);
+                }
+                return path;
+            }
+        };
+        return GanttLinkLine;
+    }());
+
+    var GanttLinkLineCurve = /** @class */ (function (_super) {
+        __extends(GanttLinkLineCurve, _super);
+        function GanttLinkLineCurve(ganttUpper) {
+            var _this = _super.call(this) || this;
+            _this.ganttUpper = ganttUpper;
+            return _this;
+        }
+        GanttLinkLineCurve.prototype.generateSSPath = function (source, target) {
+            var x1 = source.before.x;
+            var y1 = source.before.y;
+            var x4 = target.before.x;
+            var y4 = target.before.y;
+            var isMirror = y4 > y1 ? 0 : 1;
+            var radius = Math.abs(y4 - y1) / 2;
+            if (x4 > x1) {
+                return "M " + x1 + " " + y1 + "\n                    A " + radius + " " + radius + " 0 1 " + isMirror + " " + x1 + " " + y4 + "\n                    L " + x4 + " " + y4;
+            }
+            else {
+                return "M " + x1 + " " + y1 + "\n                    L " + x4 + " " + y1 + "\n                    A " + radius + " " + radius + " 0 1 " + isMirror + " " + x4 + " " + y4;
+            }
+        };
+        GanttLinkLineCurve.prototype.generateFFPath = function (source, target) {
+            var x1 = source.after.x;
+            var y1 = source.after.y;
+            var x4 = target.after.x;
+            var y4 = target.after.y;
+            var isMirror = y4 > y1 ? 1 : 0;
+            var radius = Math.abs(y4 - y1) / 2;
+            if (x4 > x1) {
+                return "M " + x1 + " " + y1 + "\n                    L " + x4 + " " + y1 + "\n                    A " + radius + " " + radius + " 0 1 " + isMirror + " " + x4 + " " + y4;
+            }
+            else {
+                return "M " + x1 + " " + y1 + "\n                    A " + radius + " " + radius + " 0 1 " + isMirror + " " + x1 + " " + y4 + "\n                    L " + x4 + " " + y4;
+            }
+        };
+        GanttLinkLineCurve.prototype.generateFSAndSFPath = function (source, target, type) {
+            var _a;
+            var x1 = source.after.x;
+            var y1 = source.after.y;
+            var x4 = target.before.x;
+            var y4 = target.before.y;
+            var bezierWeight = 0.5;
+            if (type === exports.GanttLinkType.sf) {
+                x1 = target.after.x;
+                y1 = target.after.y;
+                x4 = source.before.x;
+                y4 = source.before.y;
+            }
+            var dx = Math.abs(x4 - x1) * bezierWeight;
+            var x2 = x1 + dx;
+            var x3 = x4 - dx;
+            var centerX = (x1 + x4) / 2;
+            var centerY = (y1 + y4) / 2;
+            var controlX = this.ganttUpper.styles.lineHeight / 2;
+            var controlY = this.ganttUpper.styles.lineHeight / 2;
+            if (x1 >= x4) {
+                if (Math.abs(y4 - y1) <= this.ganttUpper.styles.lineHeight) {
+                    return "M " + x1 + " " + y1 + "\n                    C " + (x1 + controlX) + " " + y1 + " " + (x1 + controlX) + " " + (y4 > y1 ? y1 + controlX : y1 - controlX) + " " + x1 + " " + (y4 > y1 ? y1 + controlY : y1 - controlY) + "\n                    L " + x4 + " " + (y4 > y1 ? y4 - controlY : y4 + controlY) + "\n                    C " + (x4 - controlY) + " " + (y4 > y1 ? y4 - controlY : y4 + controlY) + "  " + (x4 - controlX) + " " + y4 + " " + x4 + " " + y4 + "\n                    ";
+                }
+                else {
+                    controlX = this.ganttUpper.styles.lineHeight;
+                    return "M " + x1 + " " + y1 + "\n                    C " + (x1 + controlX) + " " + y1 + " " + (x1 + controlX) + " " + (y4 > y1 ? y1 + controlX : y1 - controlX) + " " + centerX + " " + centerY + "\n                    C " + (x4 - controlX) + " " + (y4 > y1 ? y4 - controlX : y4 + controlX) + " " + (x4 - controlX) + " " + y4 + " " + x4 + " " + y4 + "\n                    ";
+                }
+            }
+            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;
+        };
+        return GanttLinkLineCurve;
+    }(GanttLinkLine));
+    GanttLinkLineCurve = __decorate([
+        __param(0, i0.Inject(GANTT_UPPER_TOKEN))
+    ], GanttLinkLineCurve);
+
+    var GanttLinkLineStraight = /** @class */ (function (_super) {
+        __extends(GanttLinkLineStraight, _super);
+        function GanttLinkLineStraight() {
+            var _this = _super.call(this) || this;
+            _this.pathControl = 20;
+            return _this;
+        }
+        GanttLinkLineStraight.prototype.generateSSPath = function (source, target) {
+            var x1 = source.before.x;
+            var y1 = source.before.y;
+            var x4 = target.before.x;
+            var y4 = target.before.y;
+            var control = this.pathControl;
+            return "M " + x1 + " " + y1 + "\n                        L " + (x4 > x1 ? x1 - control : x4 - control) + " " + y1 + "\n                        L " + (x4 > x1 ? x1 - control : x4 - control) + " " + y4 + "\n                        L " + x4 + " " + y4;
+        };
+        GanttLinkLineStraight.prototype.generateFFPath = function (source, target) {
+            var x1 = source.after.x;
+            var y1 = source.after.y;
+            var x4 = target.after.x;
+            var y4 = target.after.y;
+            var control = this.pathControl;
+            return "M " + x1 + " " + y1 + "\n                        L " + (x4 > x1 ? x4 + control : x1 + control) + " " + y1 + "\n                        L " + (x4 > x1 ? x4 + control : x1 + control) + " " + y4 + "\n                        L " + x4 + " " + y4;
+        };
+        GanttLinkLineStraight.prototype.generateFSAndSFPath = function (source, target, type) {
+            var x1 = source.after.x;
+            var y1 = source.after.y;
+            var x4 = target.before.x;
+            var y4 = target.before.y;
+            var control = this.pathControl;
+            if (type === exports.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 + "\n                        L " + (x1 + control) + " " + y1 + "\n                        L " + (x1 + control) + " " + y4 + "\n                        L " + x4 + " " + y4;
+            }
+            else {
+                return "M " + x1 + " " + y1 + "\n                        L " + (x1 + control) + " " + y1 + "\n                        L " + (x1 + control) + " " + (y4 > y1 ? y1 + control : y1 - control) + "\n                        L " + (x4 - control) + " " + (y4 > y1 ? y1 + control : y1 - control) + "\n                        L " + (x4 - control) + " " + y4 + "\n                        L " + x4 + " " + y4;
+            }
+        };
+        return GanttLinkLineStraight;
+    }(GanttLinkLine));
+
+    function createLineGenerator(type, ganttUpper) {
+        switch (type) {
+            case exports.GanttLinkLineType.curve:
+                return new GanttLinkLineCurve(ganttUpper);
+            case exports.GanttLinkLineType.straight:
+                return new GanttLinkLineStraight();
+            default:
+                throw new Error('gantt link path type invalid');
+        }
+    }
+
     var GanttLinksComponent = /** @class */ (function () {
         function GanttLinksComponent(ganttUpper, cdr, elementRef, ganttDragContainer) {
             this.ganttUpper = ganttUpper;
@@ -2331,21 +2547,24 @@
             this.items = [];
             this.lineClick = new i0.EventEmitter();
             this.links = [];
+            this.ganttLinkTypes = exports.GanttLinkType;
+            this.showArrow = false;
             this.linkItems = [];
-            this.bezierWeight = -0.5;
             this.firstChange = true;
             this.unsubscribe$ = new rxjs.Subject();
             this.ganttLinksOverlay = true;
         }
         GanttLinksComponent.prototype.ngOnInit = function () {
             var _this = this;
+            this.linkLine = createLineGenerator(this.ganttUpper.linkOptions.lineType, this.ganttUpper);
+            this.showArrow = this.ganttUpper.linkOptions.showArrow;
             this.buildLinks();
             this.firstChange = false;
             this.ganttDragContainer.dragStarted.pipe(operators.takeUntil(this.unsubscribe$)).subscribe(function () {
                 _this.elementRef.nativeElement.style.visibility = 'hidden';
             });
             rxjs.merge(this.ganttUpper.viewChange, this.ganttUpper.expandChange, this.ganttUpper.view.start$, this.ganttUpper.dragEnded, this.ganttUpper.linkDragEnded)
-                .pipe(operators.takeUntil(this.unsubscribe$), operators.skip(1))
+                .pipe(operators.takeUntil(this.unsubscribe$), operators.skip(1), operators.debounceTime(0))
                 .subscribe(function () {
                 _this.elementRef.nativeElement.style.visibility = 'visible';
                 _this.buildLinks();
@@ -2397,56 +2616,25 @@
                 });
             }
         };
-        GanttLinksComponent.prototype.generatePath = function (source, target) {
-            if (source.before && source.after && target.before && target.after) {
-                var x1 = source.after.x;
-                var y1 = source.after.y;
-                var x4 = target.before.x;
-                var y4 = target.before.y;
-                var dx = Math.abs(x4 - x1) * this.bezierWeight;
-                var x2 = x1 - dx;
-                var x3 = x4 + dx;
-                var centerX = (x1 + x4) / 2;
-                var centerY = (y1 + y4) / 2;
-                var controlX = this.ganttUpper.styles.lineHeight / 2;
-                var 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 + "\n                        C " + (x1 + controlX) + " " + y1 + " " + (x1 + controlX) + " " + (y1 + controlX) + " " + x1 + " " + (y1 + controlY) + "\n                        L " + x1 + " " + (y1 + controlY) + " " + centerX + " " + centerY + "\n\n                        M " + x4 + " " + y4 + "\n                        C " + (x4 - controlX) + " " + y4 + " " + (x4 - controlX) + " " + (y4 - controlX) + " " + x4 + " " + (y4 - controlY) + "\n                        L " + x4 + " " + (y4 - controlY) + " " + centerX + " " + centerY;
-                        }
-                        else {
-                            controlX = this.ganttUpper.styles.lineHeight;
-                            return "M " + x1 + " " + y1 + "\n                        C " + (x1 + controlX) + " " + y1 + " " + (x1 + controlX) + " " + (y1 + controlX) + " " + centerX + " " + centerY + "\n\n\n                        M " + x4 + " " + y4 + "\n                        C " + (x4 - controlX) + " " + y4 + " " + (x4 - controlX) + " " + (y4 - controlX) + " " + centerX + " " + centerY;
-                        }
-                    }
-                    else {
-                        if (Math.abs(y4 - y1) <= this.ganttUpper.styles.lineHeight) {
-                            return "M " + x1 + " " + y1 + "\n                        C " + (x1 + controlX) + " " + y1 + " " + (x1 + controlX) + " " + (y1 - controlX) + " " + x1 + " " + (y1 - controlY) + "\n                        L " + x1 + " " + (y1 - controlY) + " " + centerX + " " + centerY + "\n\n                        M " + x4 + " " + y4 + "\n                        C " + (x4 - controlX) + " " + y4 + " " + (x4 - controlX) + " " + (y4 + controlX) + " " + x4 + " " + (y4 + controlY) + "\n                        L " + x4 + " " + (y4 + controlY) + " " + centerX + " " + centerY + "\n                        ";
-                        }
-                        else {
-                            controlX = this.ganttUpper.styles.lineHeight;
-                            return "M " + x1 + " " + y1 + "\n                        C " + (x1 + controlX) + " " + y1 + " " + (x1 + controlX) + " " + (y1 - controlX) + " " + centerX + " " + centerY + "\n\n                        M " + x4 + " " + y4 + "\n                        C " + (x4 - controlX) + " " + y4 + " " + (x4 - controlX) + " " + (y4 + controlX) + " " + centerX + " " + centerY;
-                        }
-                    }
-                }
-                return "M " + x1 + " " + y1 + " C " + x2 + " " + y1 + " " + x3 + " " + y4 + " " + x4 + " " + y4;
-            }
-        };
         GanttLinksComponent.prototype.buildLinks = function () {
             var _this = this;
             this.computeItemPosition();
             this.links = [];
             this.linkItems.forEach(function (source) {
                 if (source.origin.start || source.origin.end) {
-                    source.links.forEach(function (linkId) {
-                        var target = _this.linkItems.find(function (item) { return item.id === linkId; });
+                    source.links.forEach(function (link) {
+                        var target = _this.linkItems.find(function (item) { return item.id === link.link; });
                         if (target && (target.origin.start || target.origin.end)) {
+                            var color = exports.LinkColors.default;
+                            if (link.type === exports.GanttLinkType.fs && source.end.getTime() > target.start.getTime()) {
+                                color = exports.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
                             });
                         }
                     });
@@ -2464,13 +2652,13 @@
             });
         };
         GanttLinksComponent.prototype.mouseEnterPath = function (link) {
-            if (link.color === LinkColors.default) {
-                link.color = LinkColors.active;
+            if (link.color === exports.LinkColors.default) {
+                link.color = exports.LinkColors.active;
             }
         };
         GanttLinksComponent.prototype.mouseLeavePath = function (link) {
-            if (link.color === LinkColors.active) {
-                link.color = LinkColors.default;
+            if (link.color === exports.LinkColors.active) {
+                link.color = exports.LinkColors.default;
             }
         };
         GanttLinksComponent.prototype.ngOnDestroy = function () {
@@ -2480,7 +2668,7 @@
         return GanttLinksComponent;
     }());
     GanttLinksComponent.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0__namespace, type: GanttLinksComponent, deps: [{ token: GANTT_UPPER_TOKEN }, { token: i0__namespace.ChangeDetectorRef }, { token: i0__namespace.ElementRef }, { token: GanttDragContainer }], target: i0__namespace.ɵɵFactoryTarget.Component });
-    GanttLinksComponent.ɵcmp = i0__namespace.ɵɵ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__namespace, 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__namespace.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }] });
+    GanttLinksComponent.ɵcmp = i0__namespace.ɵɵ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__namespace, 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__namespace.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i2__namespace.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.1.2", ngImport: i0__namespace, type: GanttLinksComponent, decorators: [{
                 type: i0.Component,
                 args: [{
@@ -2595,7 +2783,8 @@
 
     var dragMinWidth = 10;
     var activeClass = 'gantt-bar-active';
-    var linkDropClass = 'gantt-bar-link-drop';
+    var dropActiveClass = 'gantt-bar-drop-active';
+    var singleDropActiveClass = 'gantt-bar-single-drop-active';
     function createSvgElement(qualifiedName, className) {
         var element = document.createElementNS('http://www.w3.org/2000/svg', qualifiedName);
         element.classList.add(className);
@@ -2625,13 +2814,21 @@
         });
         GanttBarDrag.prototype.createMouseEvents = function () {
             var _this = this;
+            var _a, _b, _c;
+            var 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]) === exports.GanttLinkType.fs
+                ? singleDropActiveClass
+                : dropActiveClass;
             rxjs.fromEvent(this.barElement, 'mouseenter')
                 .pipe(operators.takeUntil(this.destroy$))
-                .subscribe(function () {
+                .subscribe(function (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 {
@@ -2640,14 +2837,14 @@
             });
             rxjs.fromEvent(this.barElement, 'mouseleave')
                 .pipe(operators.takeUntil(this.destroy$))
-                .subscribe(function () {
+                .subscribe(function (event) {
                 if (!_this.dragContainer.linkDraggingId) {
                     _this.barElement.classList.remove(activeClass);
                 }
                 else {
                     _this.dragContainer.emitLinkDragLeaved();
                 }
-                _this.barElement.classList.remove(linkDropClass);
+                _this.barElement.classList.remove(dropClass);
             });
         };
         GanttBarDrag.prototype.createBarDrag = function () {
@@ -2659,19 +2856,22 @@
                 _this.dragContainer.dragStarted.emit({ item: _this.item.origin });
             });
             dragRef.moved.subscribe(function (event) {
-                var x = _this.item.refs.x + event.distance.x;
-                var days = dateFns.differenceInCalendarDays(_this.item.end.value, _this.item.start.value);
-                var start = _this.ganttUpper.view.getDateByXPoint(x);
-                var end = start.addDays(days);
-                _this.openDragBackdrop(_this.barElement, _this.ganttUpper.view.getDateByXPoint(x), end);
+                var currentX = _this.item.refs.x + event.distance.x;
+                var currentDate = _this.ganttUpper.view.getDateByXPoint(currentX);
+                var currentStartX = _this.ganttUpper.view.getXPointByDate(currentDate);
+                var dayWidth = _this.ganttUpper.view.getDayOccupancyWidth(currentDate);
+                var diffDays = dateFns.differenceInCalendarDays(_this.item.end.value, _this.item.start.value);
+                var start = currentDate;
+                var 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(function (event) {
-                var days = dateFns.differenceInCalendarDays(_this.item.end.value, _this.item.start.value);
-                var start = _this.ganttUpper.view.getDateByXPoint(_this.item.refs.x + event.distance.x);
-                var end = start.addDays(days);
-                _this.item.updateDate(start, end);
                 _this.clearDraggingStyles();
                 _this.closeDragBackdrop();
                 event.source.reset();
@@ -2747,7 +2947,7 @@
             var dragRefs = [];
             var handles = this.barElement.querySelectorAll('.link-handles .handle');
             handles.forEach(function (handle, index) {
-                var isBefore = index === 0;
+                var isBegin = index === 0;
                 var dragRef = _this.dragDrop.createDrag(handle);
                 dragRef.withBoundaryElement(_this.dom.root);
                 dragRef.beforeStarted.subscribe(function () {
@@ -2756,24 +2956,35 @@
                         _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(function () {
-                    var positions = _this.calcLinkLinePositions(handle, isBefore);
+                    var 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(function (event) {
-                    event.source.reset();
                     handle.style.pointerEvents = '';
                     if (_this.barDragRef) {
                         _this.barDragRef.disabled = false;
                     }
+                    // 计算line拖动的落点位于目标Bar的值，如果值大于Bar宽度的一半，说明是拖动到Begin位置，否则则为拖动到End位置
+                    if (_this.dragContainer.linkDragPath.to) {
+                        var 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);
             });
@@ -2822,6 +3033,7 @@
             if (!this.linkDraggingLine) {
                 var svgElement = createSvgElement('svg', 'gantt-link-drag-container');
                 var linElement = createSvgElement('line', 'link-dragging-line');
+                linElement.style.pointerEvents = 'none';
                 svgElement.appendChild(linElement);
                 this.dom.root.appendChild(svgElement);
                 this.linkDraggingLine = linElement;
@@ -2834,7 +3046,7 @@
             }
         };
         GanttBarDrag.prototype.createDrags = function (elementRef, item, ganttUpper) {
-            var _a, _b;
+            var _d, _e;
             this.item = item;
             this.barElement = elementRef.nativeElement;
             this.ganttUpper = ganttUpper;
@@ -2846,11 +3058,11 @@
                 if (!this.dragDisabled) {
                     var dragRef = this.createBarDrag();
                     var dragHandlesRefs = this.createBarHandleDrags();
-                    (_a = this.dragRefs).push.apply(_a, __spreadArray([dragRef], __read(dragHandlesRefs)));
+                    (_d = this.dragRefs).push.apply(_d, __spreadArray([dragRef], __read(dragHandlesRefs)));
                 }
                 if (!this.linkDragDisabled) {
                     var linkDragRefs = this.createLinkHandleDrags();
-                    (_b = this.dragRefs).push.apply(_b, __spreadArray([], __read(linkDragRefs)));
+                    (_e = this.dragRefs).push.apply(_e, __spreadArray([], __read(linkDragRefs)));
                 }
             }
         };
@@ -3082,12 +3294,12 @@
             this.selectionModel.toggle(selectedValue.id);
             var selectedIds = this.selectionModel.selected;
             if (this.multiple) {
-                var selectedValue_1 = this.getGanttItems(selectedIds).map(function (item) { return item.origin; });
-                this.selectedChange.emit({ event: event, selectedValue: selectedValue_1 });
+                var _selectedValue = this.getGanttItems(selectedIds).map(function (item) { return item.origin; });
+                this.selectedChange.emit({ event: event, selectedValue: _selectedValue });
             }
             else {
-                var selectedValue_2 = (_a = this.getGanttItem(selectedIds[0])) === null || _a === void 0 ? void 0 : _a.origin;
-                this.selectedChange.emit({ event: event, selectedValue: selectedValue_2 });
+                var _selectedValue = (_a = this.getGanttItem(selectedIds[0])) === null || _a === void 0 ? void 0 : _a.origin;
+                this.selectedChange.emit({ event: event, selectedValue: _selectedValue });
             }
         };
         NgxGanttComponent.prototype.ngOnDestroy = function () {