fix: use custom start and end #INFR-909

worktile · Aug 22, 2020 · 162262c · 162262c
1 parent 6e95832
commit 162262c
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 23 deletions.
diff --git a/packages/gantt/src/gantt-upper.ts b/packages/gantt/src/gantt-upper.ts
@@ -160,17 +160,25 @@ export abstract class GanttUpper {
     private getViewDate() {
         let start = this.start;
         let end = this.end;
-        this.originItems.forEach((item) => {
-            if (item.start) {
-                start = start ? Math.min(start, item.start) : item.start;
-            }
-            if (item.end) {
-                end = end ? Math.max(end, item.end) : item.end;
-            }
-        });
+        if (!this.start || !this.end) {
+            this.originItems.forEach((item) => {
+                if (item.start && !this.start) {
+                    start = start ? Math.min(start, item.start) : item.start;
+                }
+                if (item.end && !this.end) {
+                    end = end ? Math.max(end, item.end) : item.end;
+                }
+            });
+        }
         return {
-            start: new GanttDate(start),
-            end: new GanttDate(end)
+            start: {
+                date: new GanttDate(start),
+                isCustom: this.start ? true : false
+            },
+            end: {
+                date: new GanttDate(end),
+                isCustom: this.end ? true : false
+            }
         };
     }
 

diff --git a/packages/gantt/src/views/day.ts b/packages/gantt/src/views/day.ts
@@ -1,4 +1,4 @@
-import { GanttView, GanttViewOptions, primaryDatePointTop, secondaryDatePointTop } from './view';
+import { GanttView, GanttViewOptions, primaryDatePointTop, secondaryDatePointTop, GanttViewDate } from './view';
 import { GanttDate, eachWeekOfInterval, eachDayOfInterval } from '../utils/date';
 import { GanttDatePoint } from '../class/date-point';
 
@@ -15,7 +15,7 @@ export class GanttViewDay extends GanttView {
 
     showTimeline = false;
 
-    constructor(start: GanttDate, end: GanttDate, options?: GanttViewOptions) {
+    constructor(start: GanttViewDate, end: GanttViewDate, options?: GanttViewOptions) {
         super(start, end, Object.assign({}, viewOptions, options));
     }
 

diff --git a/packages/gantt/src/views/factory.ts b/packages/gantt/src/views/factory.ts
@@ -1,12 +1,12 @@
-import { GanttViewOptions } from './view';
+import { GanttViewOptions, GanttViewDate } from './view';
 import { GanttViewMonth } from './month';
 import { GanttDate } from '../utils/date';
 import { GanttViewType } from '../class/view-type';
 import { GanttViewQuarter } from './quarter';
 import { GanttViewDay } from './day';
 
 
-export function createViewFactory(type: GanttViewType, start: GanttDate, end: GanttDate, options?: GanttViewOptions) {
+export function createViewFactory(type: GanttViewType, start: GanttViewDate, end: GanttViewDate, options?: GanttViewOptions) {
     switch (type) {
         case GanttViewType.month:
             return new GanttViewMonth(start, end, options);

diff --git a/packages/gantt/src/views/month.ts b/packages/gantt/src/views/month.ts
@@ -1,4 +1,4 @@
-import { GanttView, GanttViewOptions, primaryDatePointTop, secondaryDatePointTop } from './view';
+import { GanttView, GanttViewOptions, primaryDatePointTop, secondaryDatePointTop, GanttViewDate } from './view';
 import { GanttDate, differenceInCalendarQuarters, eachMonthOfInterval } from '../utils/date';
 import { GanttDatePoint } from '../class/date-point';
 
@@ -11,7 +11,7 @@ const viewOptions: GanttViewOptions = {
 };
 
 export class GanttViewMonth extends GanttView {
-    constructor(start: GanttDate, end: GanttDate, options?: GanttViewOptions) {
+    constructor(start: GanttViewDate, end: GanttViewDate, options?: GanttViewOptions) {
         super(start, end, Object.assign({}, viewOptions, options));
     }
 

diff --git a/packages/gantt/src/views/quarter.ts b/packages/gantt/src/views/quarter.ts
@@ -1,4 +1,4 @@
-import { GanttView, GanttViewOptions, primaryDatePointTop, secondaryDatePointTop } from './view';
+import { GanttView, GanttViewOptions, primaryDatePointTop, secondaryDatePointTop, GanttViewDate } from './view';
 import { GanttDate } from '../utils/date';
 import { GanttDatePoint } from '../class/date-point';
 import { eachYearOfInterval, differenceInCalendarQuarters } from 'date-fns';
@@ -14,7 +14,7 @@ const viewOptions: GanttViewOptions = {
 };
 
 export class GanttViewQuarter extends GanttView {
-    constructor(start: GanttDate, end: GanttDate, options?: GanttViewOptions) {
+    constructor(start: GanttViewDate, end: GanttViewDate, options?: GanttViewOptions) {
         super(start, end, Object.assign({}, viewOptions, options));
     }
 

diff --git a/packages/gantt/src/views/view.ts b/packages/gantt/src/views/view.ts
@@ -6,6 +6,11 @@ export const primaryDatePointTop = 18;
 
 export const secondaryDatePointTop = 36;
 
+export interface GanttViewDate {
+    date: GanttDate;
+    isCustom?: boolean;
+}
+
 export interface GanttViewOptions {
     start?: GanttDate;
     end?: GanttDate;
@@ -50,12 +55,16 @@ export abstract class GanttView {
 
     options: GanttViewOptions;
 
-    constructor(start: GanttDate, end: GanttDate, options: GanttViewOptions) {
+    constructor(start: GanttViewDate, end: GanttViewDate, options: GanttViewOptions) {
         this.options = Object.assign({}, viewOptions, options);
-        start = this.startOf(start.value < this.options.start.value ? start : this.options.start);
-        end = this.endOf(end.value > this.options.end.value ? end : this.options.end);
-        this.start$ = new BehaviorSubject<GanttDate>(start);
-        this.end$ = new BehaviorSubject<GanttDate>(end);
+        const startDate = start.isCustom
+            ? this.startOf(start.date)
+            : this.startOf(start.date.value < this.options.start.value ? start.date : this.options.start);
+        const endDate = end.isCustom
+            ? this.endOf(end.date)
+            : this.endOf(end.date.value > this.options.end.value ? end.date : this.options.end);
+        this.start$ = new BehaviorSubject<GanttDate>(startDate);
+        this.end$ = new BehaviorSubject<GanttDate>(endDate);
         this.initialize();
     }