43eb09b9-d492-4398-8b80-53702747ea3e

Committed 08 Mar 2024 09:45AM UTC coverage: 71.769% (+0.02%) from 71.745%

Build # 43eb09b9-d492-4398-8b80-53702747ea3e

Build Type

Pull #445

circleci

Committed by

walkerkay

Commit Message

chore: remove

Pull Request Pull Request #445: feat: add date options for supported date locale and weekStartsOn #436 #242

Run Details

345 of 599 branches covered (57.6%)

Branch coverage included in aggregate %.

4 of 4 new or added lines in 2 files covered. (100.0%)

7 existing lines in 2 files now uncovered.

1404 of 1838 relevant lines covered (76.39%)

933.61 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

80.72

/packages/gantt/src/views/view.ts

import { differenceInCalendarDays } from 'date-fns';
import { BehaviorSubject } from 'rxjs';
import { GanttViewType } from '../class';
import { GanttDatePoint } from '../class/date-point';
import { GanttDateFormat, defaultConfig } from '../gantt.config';
import { GanttDate, GanttDateUtil } from '../utils/date';

export const primaryDatePointTop = 18;

export const secondaryDatePointTop = 36;

export interface GanttViewDate {
    date: GanttDate;
    isCustom?: boolean;
}

export interface GanttViewOptions {
    start?: GanttDate;
    end?: GanttDate;
    min?: GanttDate;
    max?: GanttDate;
    cellWidth?: number;
    addAmount?: number;
    addUnit?: GanttDateUtil;
    dateFormat?: GanttDateFormat;
    // fill days when start or end is null
    fillDays?: number;
    // custom key and value
    [key: string]: any;
}

const viewOptions: GanttViewOptions = {
    min: new GanttDate().addYears(-1).startOfYear(),
    max: new GanttDate().addYears(1).endOfYear(),
    dateFormat: defaultConfig.dateFormat
};

export abstract class GanttView {
    viewType: GanttViewType;

    start$: BehaviorSubject<GanttDate>;

    end$: BehaviorSubject<GanttDate>;

    get start() {
        return this.start$.getValue();
    }

    get end() {
        return this.end$.getValue();
    }

    primaryDatePoints: GanttDatePoint[];

    secondaryDatePoints: GanttDatePoint[];

    width: number;

    cellWidth: number;

    primaryWidth: number;

    showTimeline = true;

    showWeekBackdrop: boolean;

    options: GanttViewOptions;

    constructor(start: GanttViewDate, end: GanttViewDate, options: GanttViewOptions) {
        this.options = Object.assign({}, viewOptions, options);
        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();
    }

    abstract startOf(date: GanttDate): GanttDate;

    abstract endOf(date: GanttDate): GanttDate;

    // 获取一级时间网格合并后的宽度
    abstract getPrimaryWidth(): number;

    // 获取当前视图下每一天占用的宽度
    abstract getDayOccupancyWidth(date: GanttDate): number;

    // 获取一级时间点（坐标，显示名称）
    abstract getPrimaryDatePoints(): GanttDatePoint[];

    // 获取二级时间点（坐标，显示名称）
    abstract getSecondaryDatePoints(): GanttDatePoint[];

    protected getDateIntervalWidth(start: GanttDate, end: GanttDate) {
        let result = 0;
        const days = differenceInCalendarDays(end.value, start.value);
        for (let i = 0; i < Math.abs(days); i++) {
            result += this.getDayOccupancyWidth(start.addDays(i));
        }
        result = days >= 0 ? result : -result;
        return Number(result.toFixed(3));
    }

    protected initialize() {
        this.primaryDatePoints = this.getPrimaryDatePoints();
        this.secondaryDatePoints = this.getSecondaryDatePoints();
        this.width = this.getWidth();
        this.cellWidth = this.getCellWidth();
        this.primaryWidth = this.getPrimaryWidth();
    }

    addStartDate() {
        const start = this.startOf(this.start.add(this.options.addAmount * -1, this.options.addUnit));
        if (start.value >= this.options.min.value) {
            const origin = this.start;
            this.start$.next(start);
            this.initialize();
            return { start: this.start, end: origin };
        }
        return null;
    }

    addEndDate() {
        const end = this.endOf(this.end.add(this.options.addAmount, this.options.addUnit));
        if (end.value <= this.options.max.value) {
            const origin = this.end;
            this.end$.next(end);
            this.initialize();
            return { start: origin, end: this.end };
        }
        return null;
    }

    updateDate(start: GanttDate, end: GanttDate) {
        start = this.startOf(start);
        end = this.endOf(end);
        if (start.value < this.start.value) {
            this.start$.next(start);
        }
        if (end.value > this.end.value) {
            this.end$.next(end);
        }
        this.initialize();
    }

    // 获取View的宽度
    getWidth() {
        return this.getCellWidth() * this.secondaryDatePoints.length;
    }

    // 获取单个网格的宽度
    getCellWidth() {
        return this.options.cellWidth;
    }

    // 获取当前时间的X坐标
    getTodayXPoint(): number {
        const toady = new GanttDate().startOfDay();
        if (toady.value > this.start.value && toady.value < this.end.value) {
            const x = this.getXPointByDate(toady) + this.getDayOccupancyWidth(toady) / 2;
            return x;
        } else {
            return null;
        }
    }

    // 获取指定时间的X坐标
    getXPointByDate(date: GanttDate) {
        return this.getDateIntervalWidth(this.start, date);
    }

    // 根据X坐标获取对应时间
    getDateByXPoint(x: number) {
        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;
        } else {
            const day = Math.floor((x % this.getCellWidth()) / dayWidth) + 1;
            if (this.getCellWidth() / dayWidth === 7) {
                return matchDate?.start.addDays(day);
            }
            return matchDate?.start.setDate(day);
        }
    }

    // 获取指定时间范围的宽度
    getDateRangeWidth(start: GanttDate, end: GanttDate) {
        // addSeconds(1) 是因为计算相差天会以一个整天来计算 end时间一般是59分59秒不是一个整天，所以需要加1
        return this.getDateIntervalWidth(start, end.addSeconds(1));
    }
}

1	import { differenceInCalendarDays } from 'date-fns';
2	import { BehaviorSubject } from 'rxjs';
3	import { GanttViewType } from '../class';
4	import { GanttDatePoint } from '../class/date-point';
5	import { GanttDateFormat, defaultConfig } from '../gantt.config';
6	import { GanttDate, GanttDateUtil } from '../utils/date';
7
8	export const primaryDatePointTop = 18;	1✔
9
10	export const secondaryDatePointTop = 36;	1✔
11
12	export interface GanttViewDate {
13	date: GanttDate;
14	isCustom?: boolean;
15	}
16
17	export interface GanttViewOptions {
18	start?: GanttDate;
19	end?: GanttDate;
20	min?: GanttDate;
21	max?: GanttDate;
22	cellWidth?: number;
23	addAmount?: number;
24	addUnit?: GanttDateUtil;
25	dateFormat?: GanttDateFormat;
26	// fill days when start or end is null
27	fillDays?: number;
28	// custom key and value
29	[key: string]: any;
30	}
31
32	const viewOptions: GanttViewOptions = {	1✔
33	min: new GanttDate().addYears(-1).startOfYear(),
34	max: new GanttDate().addYears(1).endOfYear(),
35	dateFormat: defaultConfig.dateFormat
36	};
37
38	export abstract class GanttView {
39	viewType: GanttViewType;
40
41	start$: BehaviorSubject<GanttDate>;
42
43	end$: BehaviorSubject<GanttDate>;
44
45	get start() {
46	return this.start$.getValue();	2,083✔
47	}
48
49	get end() {
50	return this.end$.getValue();	325✔
51	}
52
53	primaryDatePoints: GanttDatePoint[];
54
55	secondaryDatePoints: GanttDatePoint[];
56
57	width: number;
58
59	cellWidth: number;
60
61	primaryWidth: number;
62
63	showTimeline = true;	105✔
64
65	showWeekBackdrop: boolean;
66
67	options: GanttViewOptions;
68
69	constructor(start: GanttViewDate, end: GanttViewDate, options: GanttViewOptions) {
70	this.options = Object.assign({}, viewOptions, options);	105✔
71	const startDate = start.isCustom	105✔
72	? this.startOf(start.date)
73	: this.startOf(start.date.value < this.options.start.value ? start.date : this.options.start);	38!
74	const endDate = end.isCustom	105✔
75	? this.endOf(end.date)
76	: this.endOf(end.date.value > this.options.end.value ? end.date : this.options.end);	38!
77	this.start$ = new BehaviorSubject<GanttDate>(startDate);	105✔
78	this.end$ = new BehaviorSubject<GanttDate>(endDate);	105✔
79	this.initialize();	105✔
80	}
81
82	abstract startOf(date: GanttDate): GanttDate;
83
84	abstract endOf(date: GanttDate): GanttDate;
85
86	// 获取一级时间网格合并后的宽度
87	abstract getPrimaryWidth(): number;
88
89	// 获取当前视图下每一天占用的宽度
90	abstract getDayOccupancyWidth(date: GanttDate): number;
91
92	// 获取一级时间点（坐标，显示名称）
93	abstract getPrimaryDatePoints(): GanttDatePoint[];
94
95	// 获取二级时间点（坐标，显示名称）
96	abstract getSecondaryDatePoints(): GanttDatePoint[];
97
98	protected getDateIntervalWidth(start: GanttDate, end: GanttDate) {
99	let result = 0;	1,679✔
100	const days = differenceInCalendarDays(end.value, start.value);	1,679✔
101	for (let i = 0; i < Math.abs(days); i++) {	1,679✔
102	result += this.getDayOccupancyWidth(start.addDays(i));	182,974✔
103	}
104	result = days >= 0 ? result : -result;	1,679✔
105	return Number(result.toFixed(3));	1,679✔
106	}
107
108	protected initialize() {
109	this.primaryDatePoints = this.getPrimaryDatePoints();	107✔
110	this.secondaryDatePoints = this.getSecondaryDatePoints();	107✔
111	this.width = this.getWidth();	107✔
112	this.cellWidth = this.getCellWidth();	107✔
113	this.primaryWidth = this.getPrimaryWidth();	107✔
114	}
115
116	addStartDate() {
117	const start = this.startOf(this.start.add(this.options.addAmount * -1, this.options.addUnit));	1✔
118	if (start.value >= this.options.min.value) {	1!
119	const origin = this.start;	×
120	this.start$.next(start);	×
121	this.initialize();	×
UNCOV 122	return { start: this.start, end: origin };	×
123	}
124	return null;	1✔
125	}
126
127	addEndDate() {
128	const end = this.endOf(this.end.add(this.options.addAmount, this.options.addUnit));	1✔
129	if (end.value <= this.options.max.value) {	1✔
130	const origin = this.end;	1✔
131	this.end$.next(end);	1✔
132	this.initialize();	1✔
133	return { start: origin, end: this.end };	1✔
134	}
UNCOV 135	return null;	×
136	}
137
138	updateDate(start: GanttDate, end: GanttDate) {
139	start = this.startOf(start);	1✔
140	end = this.endOf(end);	1✔
141	if (start.value < this.start.value) {	1!
UNCOV 142	this.start$.next(start);	×
143	}
144	if (end.value > this.end.value) {	1!
UNCOV 145	this.end$.next(end);	×
146	}
147	this.initialize();	1✔
148	}
149
150	// 获取View的宽度
151	getWidth() {
152	return this.getCellWidth() * this.secondaryDatePoints.length;	108✔
153	}
154
155	// 获取单个网格的宽度
156	getCellWidth() {
157	return this.options.cellWidth;	19,237✔
158	}
159
160	// 获取当前时间的X坐标
161	getTodayXPoint(): number {
162	const toady = new GanttDate().startOfDay();	118✔
163	if (toady.value > this.start.value && toady.value < this.end.value) {	118✔
164	const x = this.getXPointByDate(toady) + this.getDayOccupancyWidth(toady) / 2;	76✔
165	return x;	76✔
166	} else {
167	return null;	42✔
168	}
169	}
170
171	// 获取指定时间的X坐标
172	getXPointByDate(date: GanttDate) {
173	return this.getDateIntervalWidth(this.start, date);	888✔
174	}
175
176	// 根据X坐标获取对应时间
177	getDateByXPoint(x: number) {
178	const indexOfSecondaryDate = Math.max(Math.floor(x / this.getCellWidth()), 0);	6✔
179	const matchDate = this.secondaryDatePoints[Math.min(this.secondaryDatePoints.length - 1, indexOfSecondaryDate)];	6✔
180	const dayWidth = this.getDayOccupancyWidth(matchDate?.start);	6✔
181	if (dayWidth === this.getCellWidth()) {	6!
UNCOV 182	return matchDate?.start;	×
183	} else {
184	const day = Math.floor((x % this.getCellWidth()) / dayWidth) + 1;	6✔
185	if (this.getCellWidth() / dayWidth === 7) {	6!
UNCOV 186	return matchDate?.start.addDays(day);	×
187	}
188	return matchDate?.start.setDate(day);	6✔
189	}
190	}
191
192	// 获取指定时间范围的宽度
193	getDateRangeWidth(start: GanttDate, end: GanttDate) {
194	// addSeconds(1) 是因为计算相差天会以一个整天来计算 end时间一般是59分59秒不是一个整天，所以需要加1
195	return this.getDateIntervalWidth(start, end.addSeconds(1));	791✔
196	}
197	}

worktile / ngx-gantt / 43eb09b9-d492-4398-8b80-53702747ea3e

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous