44e8b030-bf35-4e2b-ae24-363d1bb75653

Committed 30 Nov 2023 03:08AM UTC coverage: 90.288% (-0.02%) from 90.303%

Build # 44e8b030-bf35-4e2b-ae24-363d1bb75653

Build Type

Pull #2923

circleci

Committed by

smile1016

Commit Message

feat(select): not use template

Pull Request Pull Request #2923: feat(select):multi-select selected options support template #INFR-10631

Run Details

5320 of 6554 branches covered (0.0%)

Branch coverage included in aggregate %.

8 of 12 new or added lines in 3 files covered. (66.67%)

60 existing lines in 3 files now uncovered.

13263 of 14028 relevant lines covered (94.55%)

975.61 hits per line

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

91.24

/src/shared/select/select-control/select-control.component.ts

import { InputBoolean, InputNumber } from 'ngx-tethys/core';
import { ThyTagSize } from 'ngx-tethys/tag';
import { isUndefinedOrNull } from 'ngx-tethys/util';

import {
    ChangeDetectionStrategy,
    Component,
    ElementRef,
    EventEmitter,
    Input,
    OnInit,
    Output,
    Renderer2,
    TemplateRef,
    ViewChild
} from '@angular/core';
import { useHostRenderer } from '@tethys/cdk/dom';

import { NgClass, NgFor, NgIf, NgStyle, NgTemplateOutlet } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { ThyIconComponent } from 'ngx-tethys/icon';
import { ThyTagComponent } from 'ngx-tethys/tag';
import { SelectOptionBase } from '../../option/select-option-base';
import { ThyGridModule } from 'ngx-tethys/grid';

export type SelectControlSize = 'sm' | 'md' | 'lg' | '';

/**
 * @private
 */
@Component({
    selector: 'thy-select-control,[thySelectControl]',
    templateUrl: './select-control.component.html',
    changeDetection: ChangeDetectionStrategy.OnPush,
    standalone: true,
    imports: [FormsModule, NgClass, NgIf, NgStyle, NgFor, ThyTagComponent, NgTemplateOutlet, ThyIconComponent, ThyGridModule],
    host: {
        '[class.select-control-borderless]': 'thyBorderless'
    }
})
export class ThySelectControlComponent implements OnInit {
    inputValue = '';

    isComposing = false;

    panelOpened = false;

    isMultiple = false;

    showSearch = false;

    disabled = false;

    size: SelectControlSize;

    selectedOptions: SelectOptionBase | SelectOptionBase[];

    searchInputControlClass: { [key: string]: boolean };

    tagSize: ThyTagSize;

    private hostRenderer = useHostRenderer();

    @Input()
    @InputBoolean()
    get thyPanelOpened(): boolean {
        return this.panelOpened;
    }

    set thyPanelOpened(value: boolean) {
        this.panelOpened = value;
        if (this.panelOpened && this.thyShowSearch) {
            Promise.resolve(null).then(() => {
                this.inputElement.nativeElement.focus();
            });
        }
        if (!this.panelOpened && this.thyShowSearch) {
            Promise.resolve(null).then(() => {
                this.setInputValue('');
            });
        }
        this.setSelectControlClass();
    }

    @Input()
    @InputBoolean()
    get thyIsMultiple(): boolean {
        return this.isMultiple;
    }

    set thyIsMultiple(value: boolean) {
        this.isMultiple = value;
        this.setSelectControlClass();
    }

    @Input()
    @InputBoolean()
    get thyShowSearch(): boolean {
        return this.showSearch;
    }

    set thyShowSearch(value: boolean) {
        this.showSearch = value;
        this.setSelectControlClass();
    }

    @Input()
    get thySelectedOptions(): SelectOptionBase | SelectOptionBase[] {
        return this.selectedOptions;
    }

    set thySelectedOptions(value: SelectOptionBase | SelectOptionBase[]) {
        let sameValue = false;
        const oldValue = this.selectedOptions;
        if (this.isMultiple) {
            if (oldValue instanceof Array && value instanceof Array && oldValue.length === value.length) {
                sameValue = value.every((option, index) => option.thyValue === oldValue[index].thyValue);
            }
        } else {
            if (oldValue && value) {
                sameValue = (oldValue as SelectOptionBase).thyValue === (value as SelectOptionBase).thyValue;
            }
        }
        this.selectedOptions = value;
        if (this.panelOpened && this.thyShowSearch) {
            if (!sameValue) {
                Promise.resolve(null).then(() => {
                    this.setInputValue('');
                });
            }
            //等待组件渲染好再聚焦
            setTimeout(() => {
                if (this.panelOpened) {
                    this.inputElement.nativeElement.focus();
                }
            }, 200);
        }
    }

    @Input()
    @InputBoolean()
    get thyDisabled(): boolean {
        return this.disabled;
    }

    set thyDisabled(value: boolean) {
        this.disabled = value;
        this.setSelectControlClass();
    }

    @Input()
    customDisplayTemplate: TemplateRef<any>;

    @Input()
    @InputBoolean()
    thyAllowClear = false;

    @Input()
    thyPlaceholder = '';

    @Input()
    get thySize(): SelectControlSize {
        return this.size;
    }

    set thySize(value: SelectControlSize) {
        this.size = value;
        this.setSelectControlClass();

        if (value === 'sm') {
            this.tagSize = 'sm';
        } else if (value === 'lg') {
            this.tagSize = 'lg';
        } else {
            this.tagSize = 'md';
        }
    }

    @Input() @InputNumber() thyMaxTagCount = 0;

    @Input() @InputBoolean() thyBorderless = false;

    @Input() thyPreset: string = '';

    @Output()
    thyOnSearch = new EventEmitter<string>();

    @Output()
    public thyOnRemove = new EventEmitter<{ item: SelectOptionBase; $eventOrigin: Event }>();

    @Output()
    public thyOnClear = new EventEmitter<Event>();

    @Output()
    public thyOnBlur = new EventEmitter<Event>();

    @ViewChild('inputElement')
    inputElement: ElementRef;

    get selectedValueStyle(): { [key: string]: string } {
        let showSelectedValue = false;
        if (this.showSearch) {
            if (this.panelOpened) {
                showSelectedValue = !(this.isComposing || this.inputValue);
            } else {
                showSelectedValue = true;
            }
        } else {
            showSelectedValue = true;
        }
        return { display: showSelectedValue ? 'flex' : 'none' };
    }

    get placeholderStyle(): { [key: string]: string } {
        let placeholder = true;
        if (this.isSelectedValue) {
            placeholder = false;
        }
        if (!this.thyPlaceholder) {
            placeholder = false;
        }
        if (this.isComposing || this.inputValue) {
            placeholder = false;
        }
        return { display: placeholder ? 'block' : 'none' };
    }

    get selectedValue(): any {
        return this.thySelectedOptions;
    }

    get multipleSelectedValue(): any {
        return this.thySelectedOptions;
    }

    get maxSelectedTags() {
        if (this.thyMaxTagCount > 0 && this.thySelectedOptions instanceof Array && this.thySelectedOptions.length > this.thyMaxTagCount) {
            return this.thySelectedOptions.slice(0, this.thyMaxTagCount - 1);
        }
        return this.thySelectedOptions as SelectOptionBase[];
    }

    get showClearIcon(): boolean {
        return this.thyAllowClear && this.isSelectedValue;
    }

    get isSelectedValue(): boolean {
        return (
            (!this.isMultiple && !isUndefinedOrNull(this.thySelectedOptions)) ||
            (this.isMultiple && (<SelectOptionBase[]>this.thySelectedOptions).length > 0)
        );
    }

    constructor(private renderer: Renderer2) {}

    ngOnInit() {
        this.setSelectControlClass();
    }

    setSelectControlClass() {
        const modeType = this.isMultiple ? 'multiple' : 'single';
        const selectControlClass = {
            [`form-control`]: true,
            [`form-control-${this.thySize}`]: !!this.thySize,
            [`form-control-custom`]: true,
            [`select-control`]: true,
            [`select-control-${modeType}`]: true,
            [`select-control-show-search`]: this.showSearch,
            [`panel-is-opened`]: this.panelOpened,
            [`disabled`]: this.disabled
        };
        this.hostRenderer.updateClassByMap(selectControlClass);
        this.searchInputControlClass = {
            [`form-control`]: true,
            [`form-control-${this.thySize}`]: !!this.thySize,
            [`search-input-field`]: true,
            [`hidden`]: !this.thyShowSearch
        };
    }

    setInputValue(value: string) {
        if (value !== this.inputValue) {
            this.inputValue = value;
            this.updateWidth();
            this.thyOnSearch.emit(this.inputValue);
        }
    }

    handleBackspace(event: Event) {
        if ((event as KeyboardEvent).isComposing) {
            return;
        }
        if (this.inputValue.length === 0 && this.selectedOptions instanceof Array) {
            if (this.selectedOptions.length > 0) {
                this.removeHandle(this.selectedOptions[this.selectedOptions.length - 1], event);
            }
        }
    }

    updateWidth() {
        if (this.isMultiple && this.thyShowSearch) {
            if (this.inputValue || this.isComposing) {
                this.renderer.setStyle(this.inputElement.nativeElement, 'width', `${this.inputElement.nativeElement.scrollWidth}px`);
            } else {
                this.renderer.removeStyle(this.inputElement.nativeElement, 'width');
            }
        }
    }

    removeHandle(item: SelectOptionBase, $event: Event) {
        this.thyOnRemove.emit({ item: item, $eventOrigin: $event });
    }

    clearHandle($event: Event) {
        this.thyOnClear.emit($event);
    }

    trackValue(_index: number, option: SelectOptionBase): any {
        return option.thyValue;
    }

    onBlur(event: Event) {
        this.thyOnBlur.emit(event);
    }
}

1	import { InputBoolean, InputNumber } from 'ngx-tethys/core';
2	import { ThyTagSize } from 'ngx-tethys/tag';
3	import { isUndefinedOrNull } from 'ngx-tethys/util';
4
5	import {
6	ChangeDetectionStrategy,
7	Component,
8	ElementRef,
9	EventEmitter,
10	Input,
11	OnInit,
12	Output,
13	Renderer2,
14	TemplateRef,
15	ViewChild	1✔
16	} from '@angular/core';
17	import { useHostRenderer } from '@tethys/cdk/dom';	189✔
18
19	import { NgClass, NgFor, NgIf, NgStyle, NgTemplateOutlet } from '@angular/common';
20	import { FormsModule } from '@angular/forms';	426✔
21	import { ThyIconComponent } from 'ngx-tethys/icon';	426✔
22	import { ThyTagComponent } from 'ngx-tethys/tag';	18✔
23	import { SelectOptionBase } from '../../option/select-option-base';	18✔
24	import { ThyGridModule } from 'ngx-tethys/grid';
25
26	export type SelectControlSize = 'sm' \| 'md' \| 'lg' \| '';	426✔
27		2✔
28	/**	2✔
29	* @private
30	*/
31	@Component({	426✔
32	selector: 'thy-select-control,[thySelectControl]',
33	templateUrl: './select-control.component.html',
34	changeDetection: ChangeDetectionStrategy.OnPush,	×
35	standalone: true,
36	imports: [FormsModule, NgClass, NgIf, NgStyle, NgFor, ThyTagComponent, NgTemplateOutlet, ThyIconComponent, ThyGridModule],
37	host: {	272✔
38	'[class.select-control-borderless]': 'thyBorderless'	272✔
39	}
40	})
41	export class ThySelectControlComponent implements OnInit {	2,228✔
42	inputValue = '';
43
44	isComposing = false;	276✔
45		276✔
46	panelOpened = false;
47
48	isMultiple = false;	2,115✔
49
50	showSearch = false;
51		375✔
52	disabled = false;	375✔
53		375✔
54	size: SelectControlSize;	56✔
55		3✔
56	selectedOptions: SelectOptionBase \| SelectOptionBase[];
57
58	searchInputControlClass: { [key: string]: boolean };
59		319✔
60	tagSize: ThyTagSize;	7✔
61
62	private hostRenderer = useHostRenderer();
63		375✔
64	@Input()	375✔
65	@InputBoolean()	4✔
66	get thyPanelOpened(): boolean {	3✔
67	return this.panelOpened;	3✔
68	}
69
70	set thyPanelOpened(value: boolean) {
71	this.panelOpened = value;	4✔
72	if (this.panelOpened && this.thyShowSearch) {	4✔
73	Promise.resolve(null).then(() => {	3✔
74	this.inputElement.nativeElement.focus();
75	});
76	}
77	if (!this.panelOpened && this.thyShowSearch) {
78	Promise.resolve(null).then(() => {
79	this.setInputValue('');	603✔
80	});
81	}
82	this.setSelectControlClass();	270✔
83	}	270✔
84
85	@Input()
86	@InputBoolean()	7,084✔
87	get thyIsMultiple(): boolean {
88	return this.isMultiple;
89	}	266✔
90		266✔
91	set thyIsMultiple(value: boolean) {	266✔
92	this.isMultiple = value;	3✔
93	this.setSelectControlClass();
94	}	263✔
95		1✔
96	@Input()
97	@InputBoolean()
98	get thyShowSearch(): boolean {	262✔
99	return this.showSearch;
100	}
101
102	set thyShowSearch(value: boolean) {	57✔
103	this.showSearch = value;	57✔
104	this.setSelectControlClass();	5✔
105	}	3✔
106
107	@Input()
108	get thySelectedOptions(): SelectOptionBase \| SelectOptionBase[] {	2✔
109	return this.selectedOptions;
110	}
111
112	set thySelectedOptions(value: SelectOptionBase \| SelectOptionBase[]) {	52✔
113	let sameValue = false;
114	const oldValue = this.selectedOptions;	57✔
115	if (this.isMultiple) {
116	if (oldValue instanceof Array && value instanceof Array && oldValue.length === value.length) {
117	sameValue = value.every((option, index) => option.thyValue === oldValue[index].thyValue);	490✔
118	}	490✔
119	} else {	1✔
120	if (oldValue && value) {
121	sameValue = (oldValue as SelectOptionBase).thyValue === (value as SelectOptionBase).thyValue;	490✔
122	}	231✔
123	}
124	this.selectedOptions = value;	490✔
125	if (this.panelOpened && this.thyShowSearch) {	18✔
126	if (!sameValue) {
127	Promise.resolve(null).then(() => {	490✔
128	this.setInputValue('');
129	});
130	}	168✔
131	//等待组件渲染好再聚焦
132	setTimeout(() => {
133	if (this.panelOpened) {	2✔
134	this.inputElement.nativeElement.focus();
135	}
136	}, 200);	155✔
137	}	1✔
138	}
139		154✔
140	@Input()
141	@InputBoolean()
142	get thyDisabled(): boolean {	603✔
143	return this.disabled;
144	}
145		1,788✔
146	set thyDisabled(value: boolean) {
147	this.disabled = value;
148	this.setSelectControlClass();
149	}	262✔
150		262✔
151	@Input()	262✔
152	customDisplayTemplate: TemplateRef<any>;	262✔
153		262✔
154	@Input()	262✔
155	@InputBoolean()	262✔
156	thyAllowClear = false;	262✔
157		262✔
158	@Input()	262✔
159	thyPlaceholder = '';	262✔
160		262✔
161	@Input()	262✔
162	get thySize(): SelectControlSize {	262✔
163	return this.size;	262✔
164	}	262✔
165		262✔
166	set thySize(value: SelectControlSize) {
167	this.size = value;
168	this.setSelectControlClass();	261✔
169
170	if (value === 'sm') {
171	this.tagSize = 'sm';	1,771✔
172	} else if (value === 'lg') {	1,771✔
173	this.tagSize = 'lg';
174	} else {
175	this.tagSize = 'md';
176	}
177	}
178
179	@Input() @InputNumber() thyMaxTagCount = 0;
180
181	@Input() @InputBoolean() thyBorderless = false;
182		1,771✔
183	@Input() thyPreset: string = '';	1,771✔
184
185	@Output()
186	thyOnSearch = new EventEmitter<string>();
187
188	@Output()
189	public thyOnRemove = new EventEmitter<{ item: SelectOptionBase; $eventOrigin: Event }>();
190
191	@Output()	22✔
192	public thyOnClear = new EventEmitter<Event>();	19✔
193		19✔
194	@Output()	19✔
195	public thyOnBlur = new EventEmitter<Event>();
196
197	@ViewChild('inputElement')
UNCOV 198	inputElement: ElementRef;	×
199		×
200	get selectedValueStyle(): { [key: string]: string } {
UNCOV 201	let showSelectedValue = false;	×
202	if (this.showSearch) {	×
203	if (this.panelOpened) {	×
204	showSelectedValue = !(this.isComposing \|\| this.inputValue);
205	} else {
206	showSelectedValue = true;
207	}
208	} else {	36✔
209	showSelectedValue = true;	2!
210	}	2✔
211	return { display: showSelectedValue ? 'flex' : 'none' };
212	}
UNCOV 213		×
214	get placeholderStyle(): { [key: string]: string } {
215	let placeholder = true;
216	if (this.isSelectedValue) {
217	placeholder = false;
218	}	6✔
219	if (!this.thyPlaceholder) {
220	placeholder = false;
221	}	6✔
222	if (this.isComposing \|\| this.inputValue) {
223	placeholder = false;
224	}	96✔
225	return { display: placeholder ? 'block' : 'none' };
226	}
227		1✔
228	get selectedValue(): any {
229	return this.thySelectedOptions;	1✔
230	}
231
232	get multipleSelectedValue(): any {	1✔
233	return this.thySelectedOptions;
234	}
235
236	get maxSelectedTags() {
237	if (this.thyMaxTagCount > 0 && this.thySelectedOptions instanceof Array && this.thySelectedOptions.length > this.thyMaxTagCount) {
238	return this.thySelectedOptions.slice(0, this.thyMaxTagCount - 1);
239	}
240	return this.thySelectedOptions as SelectOptionBase[];
241	}
242
243	get showClearIcon(): boolean {
244	return this.thyAllowClear && this.isSelectedValue;
245	}
246
247	get isSelectedValue(): boolean {
248	return (
249	(!this.isMultiple && !isUndefinedOrNull(this.thySelectedOptions)) \|\|
250	(this.isMultiple && (<SelectOptionBase[]>this.thySelectedOptions).length > 0)
251	);
252	}	1✔
253
254	constructor(private renderer: Renderer2) {}
255
256	ngOnInit() {
257	this.setSelectControlClass();	1✔
258	}
259
260	setSelectControlClass() {
261	const modeType = this.isMultiple ? 'multiple' : 'single';
262	const selectControlClass = {	1✔
263	[`form-control`]: true,
264	[`form-control-${this.thySize}`]: !!this.thySize,
265	[`form-control-custom`]: true,
266	[`select-control`]: true,
267	[`select-control-${modeType}`]: true,	1✔
268	[`select-control-show-search`]: this.showSearch,
269	[`panel-is-opened`]: this.panelOpened,
270	[`disabled`]: this.disabled
271	};
272	this.hostRenderer.updateClassByMap(selectControlClass);	1✔
273	this.searchInputControlClass = {
274	[`form-control`]: true,
275	[`form-control-${this.thySize}`]: !!this.thySize,
276	[`search-input-field`]: true,	1✔
277	[`hidden`]: !this.thyShowSearch
278	};
279	}
280		1✔
281	setInputValue(value: string) {
282	if (value !== this.inputValue) {
283	this.inputValue = value;
284	this.updateWidth();	1✔
285	this.thyOnSearch.emit(this.inputValue);
286	}
287	}
288
289	handleBackspace(event: Event) {
290	if ((event as KeyboardEvent).isComposing) {
291	return;
292	}
293	if (this.inputValue.length === 0 && this.selectedOptions instanceof Array) {
294	if (this.selectedOptions.length > 0) {
295	this.removeHandle(this.selectedOptions[this.selectedOptions.length - 1], event);
296	}
297	}
298	}
299
300	updateWidth() {
301	if (this.isMultiple && this.thyShowSearch) {
302	if (this.inputValue \|\| this.isComposing) {
303	this.renderer.setStyle(this.inputElement.nativeElement, 'width', `${this.inputElement.nativeElement.scrollWidth}px`);
304	} else {
305	this.renderer.removeStyle(this.inputElement.nativeElement, 'width');
306	}
307	}
308	}
309
310	removeHandle(item: SelectOptionBase, $event: Event) {
311	this.thyOnRemove.emit({ item: item, $eventOrigin: $event });
312	}
313
314	clearHandle($event: Event) {
315	this.thyOnClear.emit($event);
316	}
317
318	trackValue(_index: number, option: SelectOptionBase): any {
319	return option.thyValue;
320	}
321
322	onBlur(event: Event) {
323	this.thyOnBlur.emit(event);
324	}
325	}

atinc / ngx-tethys / 44e8b030-bf35-4e2b-ae24-363d1bb75653

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