cff9a597-43ba-4b85-8a38-4b131b625bb3

Committed 07 Nov 2023 10:01AM UTC coverage: 90.187% (+0.02%) from 90.168%

Build # cff9a597-43ba-4b85-8a38-4b131b625bb3

Build Type

Pull #2886

circleci

Committed by

su4g

Commit Message

feat(date-picker): date picker allowed input date

Pull Request Pull Request #2886: feat(date-picker): date picker allowed input date

Run Details

5224 of 6459 branches covered (0.0%)

Branch coverage included in aggregate %.

50 of 53 new or added lines in 2 files covered. (94.34%)

6 existing lines in 2 files now uncovered.

13138 of 13901 relevant lines covered (94.51%)

978.74 hits per line

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

89.51

/src/date-picker/base-picker.component.ts

import { InputBoolean, ThyPlacement } from 'ngx-tethys/core';
import { coerceBooleanProperty, elementMatchClosest, FunctionProp, P, TinyDate } from 'ngx-tethys/util';

import {
    ChangeDetectorRef,
    Component,
    ElementRef,
    EventEmitter,
    Input,
    OnChanges,
    OnInit,
    Output,
    TemplateRef,
    ViewChild
} from '@angular/core';

import { AbstractPickerComponent } from './abstract-picker.component';
import { CompatibleValue, RangeAdvancedValue } from './inner-types';
import { CompatibleDate, ThyPanelMode } from './standard-types';
import { ThyPickerComponent } from './picker.component';
import { isValidDateString, parseFormatDate, transformDateValue } from './picker.util';

/**
 * @private
 */
@Component({
    template: ``,
    standalone: true,
    host: {
        '[attr.tabindex]': `tabIndex`,
        '(focus)': 'onFocus($event)',
        '(blur)': 'onBlur($event)'
    }
})
export class BasePickerComponent extends AbstractPickerComponent implements OnInit, OnChanges {
    showWeek = false;

    panelMode: ThyPanelMode | ThyPanelMode[];

    initialized: boolean;

    private innerPreviousDate: string;

    @ViewChild('thyPicker', { static: true }) thyPicker: ThyPickerComponent;

    @Input() thyDateRender: FunctionProp<TemplateRef<Date> | string>;

    @Input() set thyMode(value: ThyPanelMode) {
        this._panelMode = value ?? 'date';
        if (this.initialized) {
            this.setDefaultTimePickerState(this._panelMode);
        }
    }

    get thyMode() {
        return this._panelMode;
    }

    /**
     * @type EventEmitter<ThyPanelMode | ThyPanelMode[]>
     */
    @Output() readonly thyOnPanelChange = new EventEmitter<ThyPanelMode | ThyPanelMode[]>();

    /**
     * @type EventEmitter<Date[]>
     */
    @Output() readonly thyOnCalendarChange = new EventEmitter<Date[]>();

    private _showTime: object | boolean;

    /**
     * 增加时间选择功能
     * @default false
     */
    @Input() get thyShowTime(): object | boolean {
        return this._showTime;
    }
    set thyShowTime(value: object | boolean) {
        this._showTime = typeof value === 'object' ? value : coerceBooleanProperty(value);
    }

    /**
     * 是否展示时间(时、分)
     * @default false
     */
    @Input() @InputBoolean() thyMustShowTime = false;

    /**
     * 弹出位置
     * @type top | topLeft | topRight | bottom | bottomLeft | bottomRight | left | leftTop | leftBottom | right | rightTop | rightBottom
     */
    @Input() thyPlacement: ThyPlacement = 'bottomLeft';

    /**
     * @type EventEmitter<CompatibleDate | null>
     */
    @Output() readonly thyOnOk = new EventEmitter<CompatibleDate | null>();

    constructor(cdr: ChangeDetectorRef, protected element: ElementRef) {
        super(cdr);
    }

    ngOnInit(): void {
        super.ngOnInit();
        this.setDefaultTimePickerState(this._panelMode);
        this.initialized = true;
    }

    onValueChange(value: CompatibleValue | RangeAdvancedValue): void {
        this.thyPicker.entering = false;
        this.restoreTimePickerState(value as CompatibleValue);
        super.onValueChange(value);
        if (!this.flexible) {
            this.closeOverlay();
        }
        this.innerPreviousDate = this.thyPicker.getReadableValue(this.thyValue);
    }

    onInputValueChange(formatDate: string | null | Array<null>) {
        if (!formatDate || !formatDate.length) {
            const compatibleValue = formatDate ? (formatDate as CompatibleValue) : null;
            this.restoreTimePickerState(compatibleValue);
            super.onValueChange(compatibleValue);
            return;
        }
        let value = formatDate as string;
        const valueValid = isValidDateString(value);
        const valueLimitValid = valueValid ? this.isValidDateLimit(parseFormatDate(value)) : false;
        if (valueValid && valueLimitValid) {
            this.innerPreviousDate = value;
        } else {
            value = this.innerPreviousDate;
        }
        const tinyDate = value ? parseFormatDate(value) : null;
        this.restoreTimePickerState(tinyDate);
        super.onValueChange(tinyDate);
    }

    // Displays the time directly when the time must be displayed by default
    setDefaultTimePickerState(value: ThyPanelMode) {
        this.withTime = this.thyMustShowTime;
        if (this.isRange) {
            this.panelMode = this.flexible ? ['date', 'date'] : [value, value];
        } else {
            this.panelMode = value;
        }
        this.showWeek = value === 'week';
        if (!this.thyFormat) {
            const inputFormats: { [key in ThyPanelMode]?: string } = {
                year: 'yyyy',
                month: 'yyyy-MM',
                week: 'yyyy-ww周',
                date: this.thyShowTime ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd'
            };
            this.thyFormat = this.flexible ? inputFormats['date'] : inputFormats[value];
        }
    }

    // Restore after clearing time to select whether the original picker time is displayed or not
    restoreTimePickerState(value: CompatibleValue | null) {
        if (!value) {
            this.withTime = this.thyMustShowTime || this.originWithTime;
        }
    }

    // Emit thyOnCalendarChange when select date by thy-range-picker
    onCalendarChange(value: TinyDate[]): void {
        if (this.isRange) {
            const rangeValue = value.map(x => x.nativeDate);
            this.thyOnCalendarChange.emit(rangeValue);
        }
    }

    onShowTimePickerChange(show: boolean): void {
        this.withTime = show;
    }

    onResultOk(): void {
        if (this.isRange) {
            const value = this.thyValue as TinyDate[];
            if (value.length) {
                this.thyOnOk.emit([value[0].nativeDate, value[1].nativeDate]);
            } else {
                this.thyOnOk.emit([]);
            }
        } else {
            if (this.thyValue) {
                this.thyOnOk.emit((this.thyValue as TinyDate).nativeDate);
            } else {
                this.thyOnOk.emit(null);
            }
        }
        this.closeOverlay();
    }

    onOpenChange(open: boolean): void {
        this.thyOpenChange.emit(open);
        if (!open) {
            this.onTouchedFn();
        }
    }

    onFocus(event: Event) {
        this.picker.focus();
    }

    onBlur(event?: FocusEvent) {
        // Tab 聚焦后自动聚焦到 input 输入框，此分支下直接返回，无需触发 onTouchedFn
        if (elementMatchClosest(event?.relatedTarget as HTMLElement, ['date-popup', 'thy-picker'])) {
            return;
        }
        this.onTouchedFn();
    }

    onInputDate(value: string) {
        if (value && isValidDateString(value)) {
            this.thyValue = parseFormatDate(value);
        }
    }

    private isValidDateLimit(date: TinyDate): boolean {
        let disable = false;
        if (this.thyDisabledDate !== undefined) {
            disable = this.thyDisabledDate(date.nativeDate);
        }
        const minDate = this.thyMinDate ? new TinyDate(transformDateValue(this.thyMinDate).value as Date) : null;
        const maxDate = this.thyMaxDate ? new TinyDate(transformDateValue(this.thyMaxDate).value as Date) : null;
        return (
            (!minDate || date.startOfDay().nativeDate >= minDate.startOfDay().nativeDate) &&
            (!maxDate || date.startOfDay().nativeDate <= maxDate.startOfDay().nativeDate) &&
            !disable
        );
    }
}

1	import { InputBoolean, ThyPlacement } from 'ngx-tethys/core';
2	import { coerceBooleanProperty, elementMatchClosest, FunctionProp, P, TinyDate } from 'ngx-tethys/util';
3
4	import {
5	ChangeDetectorRef,
6	Component,
7	ElementRef,
8	EventEmitter,
9	Input,
10	OnChanges,
11	OnInit,	1✔
12	Output,
13	TemplateRef,	137✔
14	ViewChild	137✔
15	} from '@angular/core';	5✔
16
17	import { AbstractPickerComponent } from './abstract-picker.component';
18	import { CompatibleValue, RangeAdvancedValue } from './inner-types';
19	import { CompatibleDate, ThyPanelMode } from './standard-types';	730✔
20	import { ThyPickerComponent } from './picker.component';
21	import { isValidDateString, parseFormatDate, transformDateValue } from './picker.util';
22		451✔
23	/**
24	* @private
25	*/	60!
26	@Component({
27	template: ``,
28	standalone: true,	138✔
29	host: {	138✔
30	'[attr.tabindex]': `tabIndex`,	138✔
31	'(focus)': 'onFocus($event)',	138✔
32	'(blur)': 'onBlur($event)'	138✔
33	}	138✔
34	})	138✔
35	export class BasePickerComponent extends AbstractPickerComponent implements OnInit, OnChanges {	138✔
36	showWeek = false;
37
38	panelMode: ThyPanelMode \| ThyPanelMode[];	138✔
39		138✔
40	initialized: boolean;	138✔
41
42	private innerPreviousDate: string;
43		47✔
44	@ViewChild('thyPicker', { static: true }) thyPicker: ThyPickerComponent;	47✔
45		47✔
46	@Input() thyDateRender: FunctionProp<TemplateRef<Date> \| string>;	47✔
47		39✔
48	@Input() set thyMode(value: ThyPanelMode) {
49	this._panelMode = value ?? 'date';	47✔
50	if (this.initialized) {
51	this.setDefaultTimePickerState(this._panelMode);
52	}	10✔
53	}	5✔
54		5✔
55	get thyMode() {	5✔
56	return this._panelMode;	5✔
57	}
58		5✔
59	/**	5✔
60	* @type EventEmitter<ThyPanelMode \| ThyPanelMode[]>	5!
61	*/	5✔
62	@Output() readonly thyOnPanelChange = new EventEmitter<ThyPanelMode \| ThyPanelMode[]>();	2✔
63
64	/**
65	* @type EventEmitter<Date[]>	3✔
66	*/
67	@Output() readonly thyOnCalendarChange = new EventEmitter<Date[]>();	5✔
68		5✔
69	private _showTime: object \| boolean;	5✔
70
71	/**
72	* 增加时间选择功能
73	* @default false	143✔
74	*/	143✔
75	@Input() get thyShowTime(): object \| boolean {	58✔
76	return this._showTime;
77	}
78	set thyShowTime(value: object \| boolean) {	85✔
79	this._showTime = typeof value === 'object' ? value : coerceBooleanProperty(value);
80	}	143✔
81		143✔
82	/**	117✔
83	* 是否展示时间(时、分)
84	* @default false
85	*/
86	@Input() @InputBoolean() thyMustShowTime = false;	117✔
87
88	/**	117✔
89	* 弹出位置
90	* @type top \| topLeft \| topRight \| bottom \| bottomLeft \| bottomRight \| left \| leftTop \| leftBottom \| right \| rightTop \| rightBottom
91	*/
92	@Input() thyPlacement: ThyPlacement = 'bottomLeft';
93		57✔
94	/**	9✔
95	* @type EventEmitter<CompatibleDate \| null>
96	*/
97	@Output() readonly thyOnOk = new EventEmitter<CompatibleDate \| null>();
98
99	constructor(cdr: ChangeDetectorRef, protected element: ElementRef) {	10!
100	super(cdr);	15✔
101	}	10✔
102
103	ngOnInit(): void {
104	super.ngOnInit();
105	this.setDefaultTimePickerState(this._panelMode);	24✔
106	this.initialized = true;
107	}
108		5!
UNCOV 109	onValueChange(value: CompatibleValue \| RangeAdvancedValue): void {	×
NEW 110	this.thyPicker.entering = false;	×
UNCOV 111	this.restoreTimePickerState(value as CompatibleValue);	×
112	super.onValueChange(value);
113	if (!this.flexible) {
UNCOV 114	this.closeOverlay();	×
115	}
116	this.innerPreviousDate = this.thyPicker.getReadableValue(this.thyValue);
117	}
118		5!
119	onInputValueChange(formatDate: string \| null \| Array<null>) {	5✔
120	if (!formatDate \|\| !formatDate.length) {
121	const compatibleValue = formatDate ? (formatDate as CompatibleValue) : null;
NEW 122	this.restoreTimePickerState(compatibleValue);	×
123	super.onValueChange(compatibleValue);
124	return;
125	}	5✔
126	let value = formatDate as string;
127	const valueValid = isValidDateString(value);
128	const valueLimitValid = valueValid ? this.isValidDateLimit(parseFormatDate(value)) : false;	162✔
129	if (valueValid && valueLimitValid) {	162✔
130	this.innerPreviousDate = value;	52✔
131	} else {
132	value = this.innerPreviousDate;
133	}
134	const tinyDate = value ? parseFormatDate(value) : null;	1✔
135	this.restoreTimePickerState(tinyDate);
136	super.onValueChange(tinyDate);
137	}
138		5✔
139	// Displays the time directly when the time must be displayed by default	1✔
140	setDefaultTimePickerState(value: ThyPanelMode) {
141	this.withTime = this.thyMustShowTime;	4✔
142	if (this.isRange) {
143	this.panelMode = this.flexible ? ['date', 'date'] : [value, value];
144	} else {	10!
145	this.panelMode = value;	10✔
146	}
147	this.showWeek = value === 'week';
148	if (!this.thyFormat) {
149	const inputFormats: { [key in ThyPanelMode]?: string } = {	5✔
150	year: 'yyyy',	5!
UNCOV 151	month: 'yyyy-MM',	×
152	week: 'yyyy-ww周',
153	date: this.thyShowTime ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd'	5✔
154	};	5✔
155	this.thyFormat = this.flexible ? inputFormats['date'] : inputFormats[value];	5✔
156	}
157	}
158
159	// Restore after clearing time to select whether the original picker time is displayed or not	1✔
160	restoreTimePickerState(value: CompatibleValue \| null) {
161	if (!value) {
162	this.withTime = this.thyMustShowTime \|\| this.originWithTime;
163	}	1✔
164	}
165
166	// Emit thyOnCalendarChange when select date by thy-range-picker
167	onCalendarChange(value: TinyDate[]): void {
168	if (this.isRange) {
169	const rangeValue = value.map(x => x.nativeDate);
170	this.thyOnCalendarChange.emit(rangeValue);
171	}
172	}
173
174	onShowTimePickerChange(show: boolean): void {
175	this.withTime = show;	1✔
176	}
177
178	onResultOk(): void {
179	if (this.isRange) {	1✔
180	const value = this.thyValue as TinyDate[];
181	if (value.length) {
182	this.thyOnOk.emit([value[0].nativeDate, value[1].nativeDate]);
183	} else {
184	this.thyOnOk.emit([]);
185	}
186	} else {
187	if (this.thyValue) {
188	this.thyOnOk.emit((this.thyValue as TinyDate).nativeDate);
189	} else {
190	this.thyOnOk.emit(null);
191	}
192	}
193	this.closeOverlay();
194	}
195
196	onOpenChange(open: boolean): void {
197	this.thyOpenChange.emit(open);
198	if (!open) {
199	this.onTouchedFn();
200	}
201	}
202
203	onFocus(event: Event) {
204	this.picker.focus();
205	}
206
207	onBlur(event?: FocusEvent) {
208	// Tab 聚焦后自动聚焦到 input 输入框，此分支下直接返回，无需触发 onTouchedFn
209	if (elementMatchClosest(event?.relatedTarget as HTMLElement, ['date-popup', 'thy-picker'])) {
210	return;
211	}
212	this.onTouchedFn();
213	}
214
215	onInputDate(value: string) {
216	if (value && isValidDateString(value)) {
217	this.thyValue = parseFormatDate(value);
218	}
219	}
220
221	private isValidDateLimit(date: TinyDate): boolean {
222	let disable = false;
223	if (this.thyDisabledDate !== undefined) {
224	disable = this.thyDisabledDate(date.nativeDate);
225	}
226	const minDate = this.thyMinDate ? new TinyDate(transformDateValue(this.thyMinDate).value as Date) : null;
227	const maxDate = this.thyMaxDate ? new TinyDate(transformDateValue(this.thyMaxDate).value as Date) : null;
228	return (
229	(!minDate \|\| date.startOfDay().nativeDate >= minDate.startOfDay().nativeDate) &&
230	(!maxDate \|\| date.startOfDay().nativeDate <= maxDate.startOfDay().nativeDate) &&
231	!disable
232	);
233	}
234	}

atinc / ngx-tethys / cff9a597-43ba-4b85-8a38-4b131b625bb3

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