e62d3b10-1466-49c3-aabd-707148681fc8

Committed 14 Jun 2024 08:24AM UTC coverage: 90.422%. Remained the same

Build # e62d3b10-1466-49c3-aabd-707148681fc8

Build Type

push

circleci

Committed by

minlovehua

Commit Message

feat: use the ngx-tethys/util's coerceBooleanProperty instead of booleanAttribute #INFR-12648

Run Details

5467 of 6692 branches covered (81.69%)

Branch coverage included in aggregate %.

117 of 120 new or added lines in 66 files covered. (97.5%)

183 existing lines in 46 files now uncovered.

13216 of 13970 relevant lines covered (94.6%)

985.91 hits per line

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

93.01

/src/time-picker/time-picker-panel.component.ts

import {
    ChangeDetectionStrategy,
    ChangeDetectorRef,
    Component,
    ElementRef,
    EventEmitter,
    forwardRef,
    Input,
    NgZone,
    OnDestroy,
    OnInit,
    Output,
    ViewChild
} from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { isValid } from 'date-fns';
import { reqAnimFrame } from 'ngx-tethys/core';
import { coerceBooleanProperty, TinyDate } from 'ngx-tethys/util';
import { ThyButton } from 'ngx-tethys/button';
import { NgIf, NgFor, DecimalPipe } from '@angular/common';

/**
 * 时间选择面板组件
 * @name thy-time-picker-panel
 */
@Component({
    selector: 'thy-time-picker-panel',
    templateUrl: './time-picker-panel.component.html',
    changeDetection: ChangeDetectionStrategy.OnPush,
    providers: [
        {
            provide: NG_VALUE_ACCESSOR,
            multi: true,
            useExisting: forwardRef(() => ThyTimePanel)
        }
    ],
    host: {
        class: 'thy-time-picker-panel',
        '[class.thy-time-picker-panel-has-bottom-operation]': `thyShowOperations`,
        '[class.thy-time-picker-panel-columns-2]': `showColumnCount === 2`,
        '[class.thy-time-picker-panel-columns-3]': `showColumnCount === 3`
    },
    standalone: true,
    imports: [NgIf, NgFor, ThyButton, DecimalPipe]
})
export class ThyTimePanel implements OnInit, OnDestroy, ControlValueAccessor {
    @ViewChild('hourListElement', { static: false }) hourListRef: ElementRef<HTMLElement>;

    @ViewChild('minuteListElement', { static: false }) minuteListRef: ElementRef<HTMLElement>;

    @ViewChild('secondListElement', { static: false }) secondListRef: ElementRef<HTMLElement>;

    /**
     * 展示的日期格式，支持 'HH:mm:ss' | 'HH:mm' | 'mm:ss'
     * @type string
     * @default HH:mm:ss
     */
    @Input() set thyFormat(value: string) {
        if (value) {
            const formatSet = new Set(value);
            this.showHourColumn = formatSet.has('H') || formatSet.has('h');
            this.showMinuteColumn = formatSet.has('m');
            this.showSecondColumn = formatSet.has('s');
        } else {
            this.showHourColumn = true;
            this.showMinuteColumn = true;
            this.showSecondColumn = true;
        }
        this.showColumnCount = [this.showHourColumn, this.showMinuteColumn, this.showSecondColumn].filter(m => m).length;
        this.cdr.markForCheck();
    }

    /**
     * 小时间隔步长
     * @type number
     */
    @Input() thyHourStep: number = 1;

    /**
     * 分钟间隔步长
     * @type number
     */
    @Input() thyMinuteStep: number = 1;

    /**
     * 秒间隔步长
     * @type number
     */
    @Input() thySecondStep: number = 1;

    /**
     * 展示选择此刻
     * @type boolean
     */
    @Input({ transform: coerceBooleanProperty }) thyShowSelectNow = true;

    /**
     * 展示底部操作
     * @type boolean
     */
    @Input({ transform: coerceBooleanProperty }) thyShowOperations = true;

    /**
     * 选择时间触发的事件
     * @type EventEmitter<Date>
     */
    @Output() thyPickChange = new EventEmitter<Date>();

    /**
     * 关闭面板事件
     * @type EventEmitter<void>
     */
    @Output() thyClosePanel = new EventEmitter<void>();

    // margin-top + 1px border
    SCROLL_OFFSET_SPACING = 5;

    SCROLL_DEFAULT_DURATION = 120;

    prefixCls = 'thy-time-picker-panel';

    hourRange: ReadonlyArray<{ value: number; disabled: boolean }> = [];

    minuteRange: ReadonlyArray<{ value: number; disabled: boolean }> = [];

    secondRange: ReadonlyArray<{ value: number; disabled: boolean }> = [];

    showHourColumn = true;

    showMinuteColumn = true;

    showSecondColumn = true;

    showColumnCount: number = 3;

    value: Date;

    hour: number;

    minute: number;

    second: number;

    initialScrollPosition: boolean;

    onValueChangeFn: (val: Date) => void = () => void 0;

    onTouchedFn: () => void = () => void 0;

    constructor(private cdr: ChangeDetectorRef, private ngZone: NgZone) {}

    ngOnInit(): void {
        this.generateTimeRange();
        this.initialValue();
        setTimeout(() => {
            this.initialScrollPosition = true;
        });
    }

    generateTimeRange() {
        this.hourRange = this.buildTimeRange(24, this.thyHourStep);
        this.minuteRange = this.buildTimeRange(60, this.thyMinuteStep);
        this.secondRange = this.buildTimeRange(60, this.thySecondStep);
    }

    pickHours(hours: { value: number; disabled: boolean }, index: number) {
        this.value.setHours(hours.value);
        this.hour = hours.value;
        this.thyPickChange.emit(this.value);
        this.scrollTo(this.hourListRef.nativeElement, index);
    }

    pickMinutes(minutes: { value: number; disabled: boolean }, index: number) {
        this.value.setMinutes(minutes.value);
        this.minute = minutes.value;
        this.thyPickChange.emit(this.value);
        this.scrollTo(this.minuteListRef.nativeElement, index);
    }

    pickSeconds(seconds: { value: number; disabled: boolean }, index: number) {
        this.value.setSeconds(seconds.value);
        this.second = seconds.value;
        this.thyPickChange.emit(this.value);
        this.scrollTo(this.secondListRef.nativeElement, index);
    }

    selectNow() {
        this.value = new Date();
        this.setHMSProperty();
        this.thyPickChange.emit(this.value);
        this.thyClosePanel.emit();
    }

    confirmPickTime() {
        this.onValueChangeFn(this.value || new Date());
        this.thyClosePanel.emit();
    }

    scrollTo(container: HTMLElement, index: number = 0, duration: number = this.SCROLL_DEFAULT_DURATION) {
        const offsetTop = (container.children[index] as HTMLElement).offsetTop - this.SCROLL_OFFSET_SPACING;
        this.runScrollAnimationFrame(container, offsetTop, duration);
    }

    writeValue(value: Date | number): void {
        if (value && isValid(value)) {
            this.value = new Date(value);
            this.setHMSProperty();
        } else {
            this.initialValue();
        }
        this.autoScroll(this.initialScrollPosition ? this.SCROLL_DEFAULT_DURATION : 0);

        this.cdr.markForCheck();
    }

    registerOnChange(fn: (value: Date) => void): void {
        this.onValueChangeFn = fn;
    }

    registerOnTouched(fn: () => void): void {
        this.onTouchedFn = fn;
    }

    trackByFn(index: number): number {
        return index;
    }

    private initialValue() {
        this.hour = 0;
        this.minute = 0;
        this.second = 0;
        this.value = new TinyDate().setHms(0, 0, 0).nativeDate;
    }

    private buildTimeRange(length: number, step: number = 1, start: number = 0, disables: number[] = []) {
        return new Array(Math.ceil(length / step)).fill(0).map((_, i) => {
            const value = (i + start) * step;
            return {
                value: value,
                disabled: disables.indexOf(value) > -1
            };
        });
    }

    private setHMSProperty() {
        this.hour = this.value.getHours();
        this.minute = this.value.getMinutes();
        this.second = this.value.getSeconds();
    }

    private resetScrollPosition() {
        if (this.hourListRef) {
            this.hourListRef.nativeElement.scrollTop = 0;
        }
        if (this.minuteListRef) {
            this.minuteListRef.nativeElement.scrollTop = 0;
        }
        if (this.secondListRef) {
            this.secondListRef.nativeElement.scrollTop = 0;
        }
        this.initialScrollPosition = false;
    }

    private runScrollAnimationFrame(container: HTMLElement, to: number, duration: number = this.SCROLL_DEFAULT_DURATION) {
        if (duration <= 0) {
            container.scrollTop = to;
            return;
        }
        const offset = to - container.scrollTop;
        const frame = (offset / duration) * 10;
        this.ngZone.runOutsideAngular(() => {
            reqAnimFrame(() => {
                container.scrollTop += frame;
                if (container.scrollTop === to) {
                    return;
                }
                this.runScrollAnimationFrame(container, to, duration - 10);
            });
        });
    }

    private autoScroll(duration: number = this.SCROLL_DEFAULT_DURATION) {
        if (this.hourListRef) {
            this.scrollTo(
                this.hourListRef.nativeElement,
                this.hourRange.findIndex(m => m.value === this.hour),
                duration
            );
        }
        if (this.minuteListRef) {
            this.scrollTo(
                this.minuteListRef.nativeElement,
                this.minuteRange.findIndex(m => m.value === this.minute),
                duration
            );
        }
        if (this.secondListRef) {
            this.scrollTo(
                this.secondListRef.nativeElement,
                this.secondRange.findIndex(m => m.value === this.second),
                duration
            );
        }
    }

    ngOnDestroy(): void {
        // 关闭面板时有 0.2s 的动画，所以延迟 200ms 再重置滚动位置
        setTimeout(() => {
            this.resetScrollPosition();
        }, 200);
    }
}

1	import {
2	ChangeDetectionStrategy,
3	ChangeDetectorRef,
4	Component,
5	ElementRef,
6	EventEmitter,
7	forwardRef,
8	Input,
9	NgZone,
10	OnDestroy,
11	OnInit,
12	Output,
13	ViewChild
14	} from '@angular/core';	1✔
15	import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
16	import { isValid } from 'date-fns';	25✔
17	import { reqAnimFrame } from 'ngx-tethys/core';	24✔
18	import { coerceBooleanProperty, TinyDate } from 'ngx-tethys/util';	24!
19	import { ThyButton } from 'ngx-tethys/button';	24✔
20	import { NgIf, NgFor, DecimalPipe } from '@angular/common';	24✔
21
22	/**
23	* 时间选择面板组件	1✔
24	* @name thy-time-picker-panel	1✔
25	*/	1✔
26	@Component({
27	selector: 'thy-time-picker-panel',	75✔
28	templateUrl: './time-picker-panel.component.html',	25✔
29	changeDetection: ChangeDetectionStrategy.OnPush,
30	providers: [
31	{	23✔
32	provide: NG_VALUE_ACCESSOR,	23✔
33	multi: true,	23✔
34	useExisting: forwardRef(() => ThyTimePanel)	23✔
35	}	23✔
36	],	23✔
37	host: {	23✔
38	class: 'thy-time-picker-panel',	23✔
39	'[class.thy-time-picker-panel-has-bottom-operation]': `thyShowOperations`,	23✔
40	'[class.thy-time-picker-panel-columns-2]': `showColumnCount === 2`,
41	'[class.thy-time-picker-panel-columns-3]': `showColumnCount === 3`	23✔
42	},	23✔
43	standalone: true,	23✔
44	imports: [NgIf, NgFor, ThyButton, DecimalPipe]	23✔
45	})	23✔
46	export class ThyTimePanel implements OnInit, OnDestroy, ControlValueAccessor {	23✔
47	@ViewChild('hourListElement', { static: false }) hourListRef: ElementRef<HTMLElement>;	23✔
48		23✔
49	@ViewChild('minuteListElement', { static: false }) minuteListRef: ElementRef<HTMLElement>;	23✔
50		23✔
51	@ViewChild('secondListElement', { static: false }) secondListRef: ElementRef<HTMLElement>;	23✔
52		23✔
53	/**
54	* 展示的日期格式，支持 'HH:mm:ss' \| 'HH:mm' \| 'mm:ss'
55	* @type string	23✔
56	* @default HH:mm:ss	23✔
57	*/	23✔
58	@Input() set thyFormat(value: string) {	23✔
59	if (value) {
60	const formatSet = new Set(value);
61	this.showHourColumn = formatSet.has('H') \|\| formatSet.has('h');
62	this.showMinuteColumn = formatSet.has('m');	23✔
63	this.showSecondColumn = formatSet.has('s');	23✔
64	} else {	23✔
65	this.showHourColumn = true;
66	this.showMinuteColumn = true;
67	this.showSecondColumn = true;	4✔
68	}	4✔
69	this.showColumnCount = [this.showHourColumn, this.showMinuteColumn, this.showSecondColumn].filter(m => m).length;	4✔
70	this.cdr.markForCheck();	4✔
71	}
72
73	/**	3✔
74	* 小时间隔步长	3✔
75	* @type number	3✔
76	*/	3✔
77	@Input() thyHourStep: number = 1;
78
79	/**	3✔
80	* 分钟间隔步长	3✔
81	* @type number	3✔
82	*/	3✔
83	@Input() thyMinuteStep: number = 1;
84
85	/**	1✔
86	* 秒间隔步长	1✔
87	* @type number	1✔
88	*/	1✔
89	@Input() thySecondStep: number = 1;
90
91	/**	2!
92	* 展示选择此刻	2✔
93	* @type boolean
94	*/	10!
95	@Input({ transform: coerceBooleanProperty }) thyShowSelectNow = true;	121✔
96		121✔
97	/**
98	* 展示底部操作
99	* @type boolean	60✔
100	*/	31✔
101	@Input({ transform: coerceBooleanProperty }) thyShowOperations = true;	31✔
102
103	/**
104	* 选择时间触发的事件	29✔
105	* @type EventEmitter<Date>
106	*/	60✔
107	@Output() thyPickChange = new EventEmitter<Date>();	60✔
108
109	/**
110	* 关闭面板事件	23✔
111	* @type EventEmitter<void>
112	*/
113	@Output() thyClosePanel = new EventEmitter<void>();	23✔
114
115	// margin-top + 1px border
116	SCROLL_OFFSET_SPACING = 5;	7,628✔
117
118	SCROLL_DEFAULT_DURATION = 120;
119		52✔
120	prefixCls = 'thy-time-picker-panel';	52✔
121		52✔
122	hourRange: ReadonlyArray<{ value: number; disabled: boolean }> = [];	52✔
123
124	minuteRange: ReadonlyArray<{ value: number; disabled: boolean }> = [];	180✔
125		69✔
126	secondRange: ReadonlyArray<{ value: number; disabled: boolean }> = [];	3,052✔
127		3,052✔
128	showHourColumn = true;
129
130	showMinuteColumn = true;
131
132	showSecondColumn = true;
133
134	showColumnCount: number = 3;	32✔
135		32✔
136	value: Date;	32✔
137
138	hour: number;
139		23!
140	minute: number;	23✔
141
142	second: number;	23!
143		23✔
144	initialScrollPosition: boolean;
145		23!
146	onValueChangeFn: (val: Date) => void = () => void 0;	23✔
147
148	onTouchedFn: () => void = () => void 0;	23✔
149
150	constructor(private cdr: ChangeDetectorRef, private ngZone: NgZone) {}	×
151		265✔
152	ngOnInit(): void {	114✔
153	this.generateTimeRange();	114✔
154	this.initialValue();
155	setTimeout(() => {	151✔
156	this.initialScrollPosition = true;	151✔
157	});	151✔
158	}	151✔
159		144✔
160	generateTimeRange() {	144!
UNCOV 161	this.hourRange = this.buildTimeRange(24, this.thyHourStep);	×
162	this.minuteRange = this.buildTimeRange(60, this.thyMinuteStep);
163	this.secondRange = this.buildTimeRange(60, this.thySecondStep);	144✔
164	}
165
166	pickHours(hours: { value: number; disabled: boolean }, index: number) {
167	this.value.setHours(hours.value);	×
168	this.hour = hours.value;	60✔
169	this.thyPickChange.emit(this.value);	153✔
170	this.scrollTo(this.hourListRef.nativeElement, index);
171	}	60✔
172		293✔
173	pickMinutes(minutes: { value: number; disabled: boolean }, index: number) {
174	this.value.setMinutes(minutes.value);	60✔
175	this.minute = minutes.value;	281✔
176	this.thyPickChange.emit(this.value);
177	this.scrollTo(this.minuteListRef.nativeElement, index);
178	}
179
180	pickSeconds(seconds: { value: number; disabled: boolean }, index: number) {	23✔
181	this.value.setSeconds(seconds.value);	23✔
182	this.second = seconds.value;
183	this.thyPickChange.emit(this.value);
184	this.scrollTo(this.secondListRef.nativeElement, index);	1✔
185	}
186
187	selectNow() {
188	this.value = new Date();	1✔
189	this.setHMSProperty();
190	this.thyPickChange.emit(this.value);
191	this.thyClosePanel.emit();
192	}
193
194	confirmPickTime() {
195	this.onValueChangeFn(this.value \|\| new Date());
196	this.thyClosePanel.emit();
197	}
198
199	scrollTo(container: HTMLElement, index: number = 0, duration: number = this.SCROLL_DEFAULT_DURATION) {
200	const offsetTop = (container.children[index] as HTMLElement).offsetTop - this.SCROLL_OFFSET_SPACING;
201	this.runScrollAnimationFrame(container, offsetTop, duration);
202	}	1✔
203
204	writeValue(value: Date \| number): void {
205	if (value && isValid(value)) {
206	this.value = new Date(value);
207	this.setHMSProperty();
208	} else {
209	this.initialValue();
210	}
211	this.autoScroll(this.initialScrollPosition ? this.SCROLL_DEFAULT_DURATION : 0);	23✔
212
213	this.cdr.markForCheck();
214	}
215
216	registerOnChange(fn: (value: Date) => void): void {
217	this.onValueChangeFn = fn;
218	}
219
220	registerOnTouched(fn: () => void): void {
221	this.onTouchedFn = fn;
222	}
223
224	trackByFn(index: number): number {
225	return index;
226	}
227
228	private initialValue() {
229	this.hour = 0;
230	this.minute = 0;
231	this.second = 0;
232	this.value = new TinyDate().setHms(0, 0, 0).nativeDate;
233	}
234
235	private buildTimeRange(length: number, step: number = 1, start: number = 0, disables: number[] = []) {
236	return new Array(Math.ceil(length / step)).fill(0).map((_, i) => {
237	const value = (i + start) * step;
238	return {
239	value: value,
240	disabled: disables.indexOf(value) > -1
241	};
242	});
243	}
244
245	private setHMSProperty() {
246	this.hour = this.value.getHours();
247	this.minute = this.value.getMinutes();
248	this.second = this.value.getSeconds();
249	}
250
251	private resetScrollPosition() {
252	if (this.hourListRef) {
253	this.hourListRef.nativeElement.scrollTop = 0;
254	}
255	if (this.minuteListRef) {
256	this.minuteListRef.nativeElement.scrollTop = 0;
257	}
258	if (this.secondListRef) {
259	this.secondListRef.nativeElement.scrollTop = 0;
260	}
261	this.initialScrollPosition = false;
262	}
263
264	private runScrollAnimationFrame(container: HTMLElement, to: number, duration: number = this.SCROLL_DEFAULT_DURATION) {
265	if (duration <= 0) {
266	container.scrollTop = to;
267	return;
268	}
269	const offset = to - container.scrollTop;
270	const frame = (offset / duration) * 10;
271	this.ngZone.runOutsideAngular(() => {
272	reqAnimFrame(() => {
273	container.scrollTop += frame;
274	if (container.scrollTop === to) {
275	return;
276	}
277	this.runScrollAnimationFrame(container, to, duration - 10);
278	});
279	});
280	}
281
282	private autoScroll(duration: number = this.SCROLL_DEFAULT_DURATION) {
283	if (this.hourListRef) {
284	this.scrollTo(
285	this.hourListRef.nativeElement,
286	this.hourRange.findIndex(m => m.value === this.hour),
287	duration
288	);
289	}
290	if (this.minuteListRef) {
291	this.scrollTo(
292	this.minuteListRef.nativeElement,
293	this.minuteRange.findIndex(m => m.value === this.minute),
294	duration
295	);
296	}
297	if (this.secondListRef) {
298	this.scrollTo(
299	this.secondListRef.nativeElement,
300	this.secondRange.findIndex(m => m.value === this.second),
301	duration
302	);
303	}
304	}
305
306	ngOnDestroy(): void {
307	// 关闭面板时有 0.2s 的动画，所以延迟 200ms 再重置滚动位置
308	setTimeout(() => {
309	this.resetScrollPosition();
310	}, 200);
311	}
312	}

atinc / ngx-tethys / e62d3b10-1466-49c3-aabd-707148681fc8

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