13fcf11d-0958-4626-8dcf-f200b8133961

Committed 14 Jun 2024 10:13AM UTC coverage: 90.422%. Remained the same

Build # 13fcf11d-0958-4626-8dcf-f200b8133961

Build Type

push

circleci

Committed by

web-flow

Commit Message

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

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.9 hits per line

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

88.04

/src/empty/empty.component.ts

import { ThyTranslate } from 'ngx-tethys/core';
import { useHostRenderer } from '@tethys/cdk/dom';
import {
    AfterViewInit,
    Component,
    ContentChild,
    ElementRef,
    OnChanges,
    Input,
    NgZone,
    OnInit,
    TemplateRef,
    SimpleChanges
} from '@angular/core';

import { ThyEmptyConfig } from './empty.config';
import { PRESET_SVG } from './svgs';
import { DomSanitizer } from '@angular/platform-browser';
import { SafeAny } from 'ngx-tethys/types';
import { ThyIcon } from 'ngx-tethys/icon';
import { NgIf, NgClass, NgTemplateOutlet } from '@angular/common';
import { coerceBooleanProperty } from 'ngx-tethys/util';

const sizeClassMap = {
    lg: ['thy-empty-state', 'thy-empty-state--lg'],
    md: ['thy-empty-state'],
    sm: ['thy-empty-state', 'thy-empty-state--sm']
};

const sizeMap = {
    lg: {
        height: 168, // 空提示的高度
        offsetTop: 30, // 空提示图标和大小之间的空白距离，需要除去，否则会不居中
        defaultMarginTop: 120 // 不自动计算默认的 top 距离
    },
    md: {
        height: 118,
        offsetTop: 20,
        defaultMarginTop: 10
    },
    sm: {
        height: 78,
        offsetTop: 10,
        defaultMarginTop: 10
    }
};

/** https://html.spec.whatwg.org/multipage/embedded-content.html#attr-img-loading */
export type ThyEmptyImageLoading = 'eager' | 'lazy';

/** https://wicg.github.io/priority-hints/#idl-index */
export type ThyEmptyImageFetchPriority = 'high' | 'low' | 'auto';

/**
 * 空页面组件
 * @name thy-empty
 * @order 10
 */
@Component({
    selector: 'thy-empty',
    templateUrl: './empty.component.html',
    standalone: true,
    imports: [NgIf, ThyIcon, NgClass, NgTemplateOutlet]
})
export class ThyEmpty implements OnInit, AfterViewInit, OnChanges {
    /**
     * 显示文本提示信息。同时传入 thyMessage，thyTranslationKey，thyEntityName，thyEntityNameTranslateKey 时优先级最高
     */
    @Input() thyMessage: string;

    /**
     * 显示文本提示信息多语言 Key。同时传入 thyTranslationKey，thyEntityName，thyEntityNameTranslateKey 时优先级最高
     */
    @Input() thyTranslationKey: string;

    /**
     * 显示文本提示信息多语言 Key 的 Values。传入 thyTranslationKey 后，传入这个才会生效
     */
    @Input() thyTranslationValues: any;

    /**
     * 显示默认提示信息，替换默认提示信息的目标对象，比如：没有 {thyEntityName}。同时传入 thyEntityName，thyEntityNameTranslateKey 时优先级较高
     */
    @Input() thyEntityName: string;

    /**
     * thyEntityName 的多语言 Key。thyMessage，thyTranslationKey，thyEntityName 均未传入时才会生效
     */
    @Input() thyEntityNameTranslateKey: string;

    /**
     * 提示图标名
     */
    @Input() thyIconName: string;

    /**
     * 大小
     * @type sm | md | lg
     * @default md
     */
    @Input()
    set thySize(value: string) {
        this.size = value;
        if (this._initialized) {
            this.updateClass();
        }
    }

    /**
     * 距上距离
     */
    @Input() thyMarginTop: number | string;

    /**
     * 是否自动根据父容器计算高度，垂直居中
     * @default false
     */
    @Input({ transform: coerceBooleanProperty }) thyTopAuto: boolean;

    /**
     * 自动计算高度垂直居中(即 thyTopAuto 为 true)时，支持传入自定义父容器
     */
    @Input() thyContainer: ElementRef;

    /**
     * 提示图片链接
     */
    @Input() thyImageUrl: string;

    @Input() thyImageLoading?: ThyEmptyImageLoading;

    @Input() thyImageFetchPriority?: ThyEmptyImageFetchPriority;

    /**
     * 显示文本描述
     */
    @Input() thyDescription: string;

    private size: string = 'md';

    private _initialized = false;

    private hostRenderer = useHostRenderer();

    presetSvg: SafeAny;

    /**
     * 除提示图片，文本外的其他信息传入模板
     * @type TemplateRef
     */
    @ContentChild('extra') extraTemplateRef: TemplateRef<any>;

    get displayText() {
        if (this.thyMessage) {
            return this.thyMessage;
        } else if (this.thyTranslationKey) {
            return this.thyTranslate.instant(this.thyTranslationKey, this.thyTranslationValues);
        } else if (this.thyEntityName) {
            return this.thyTranslate.instant(this.thyEmptyConfig.noResultWithTargetTranslateKey, {
                target: this.thyEntityName
            });
        } else if (this.thyEntityNameTranslateKey) {
            return this.thyTranslate.instant(this.thyEmptyConfig.noResultWithTargetTranslateKey, {
                target: this.thyTranslate.instant(this.thyEntityNameTranslateKey)
            });
        } else {
            return this.thyTranslate.instant(this.thyEmptyConfig.noResultTranslateKey);
        }
    }

    private _calculatePosition() {
        const sizeOptions = sizeMap[this.thySize || 'md'];
        let marginTop = null;
        if (this.thyTopAuto) {
            // 选择参考父容器居中
            const containerElement = this.thyContainer ? this.thyContainer.nativeElement : this.elementRef.nativeElement.parentElement;
            // containerElement.height;
            let emptyStateHeight = this.elementRef.nativeElement.offsetHeight;
            // 高度没有自动计算出来使用默认值
            if (emptyStateHeight <= 10) {
                emptyStateHeight = sizeOptions.height;
            }
            marginTop = (containerElement.offsetHeight - emptyStateHeight) / 2 - sizeOptions.offsetTop;
            // marginTop = (containerElement.offsetHeight - emptyStateHeight) / 2;
            if (marginTop < 0) {
                marginTop = 0; // sizeOptions.defaultMarginTop;
            }
        } else {
            if (this.thyMarginTop) {
                marginTop = this.thyMarginTop;
            } else {
                marginTop = 0; // sizeOptions.defaultMarginTop;
            }
        }
        if (marginTop) {
            this.hostRenderer.setStyle('marginTop', marginTop + 'px');
        }
    }

    constructor(
        private thyTranslate: ThyTranslate,
        private thyEmptyConfig: ThyEmptyConfig,
        private elementRef: ElementRef,
        private ngZone: NgZone,
        private sanitizer: DomSanitizer
    ) {}

    ngOnInit() {
        this.updateClass();
        this._initialized = true;
        this.setPresetSvg(this.thyIconName);
    }

    updateClass() {
        const classList = sizeClassMap[this.size] || sizeClassMap['md'];
        if (classList) {
            this.hostRenderer.updateClass(classList);
        }
    }

    ngAfterViewInit() {
        this.ngZone.runOutsideAngular(() => {
            setTimeout(() => {
                this._calculatePosition();
            }, 50);
        });
    }

    ngOnChanges(changes: SimpleChanges): void {
        if (changes.thyIconName && changes.thyIconName.currentValue && !changes.thyIconName.firstChange) {
            this.setPresetSvg(changes.thyIconName.currentValue);
        }
    }

    setPresetSvg(icon: string) {
        this.presetSvg = '';
        let presetSvg = icon ? PRESET_SVG[icon] : PRESET_SVG.default;

        this.presetSvg = presetSvg ? this.sanitizer.bypassSecurityTrustHtml(presetSvg) : '';
    }
}

1	import { ThyTranslate } from 'ngx-tethys/core';
2	import { useHostRenderer } from '@tethys/cdk/dom';
3	import {
4	AfterViewInit,
5	Component,
6	ContentChild,
7	ElementRef,
8	OnChanges,
9	Input,
10	NgZone,
11	OnInit,
12	TemplateRef,	1✔
13	SimpleChanges
14	} from '@angular/core';
15
16	import { ThyEmptyConfig } from './empty.config';
17	import { PRESET_SVG } from './svgs';	1✔
18	import { DomSanitizer } from '@angular/platform-browser';
19	import { SafeAny } from 'ngx-tethys/types';
20	import { ThyIcon } from 'ngx-tethys/icon';
21	import { NgIf, NgClass, NgTemplateOutlet } from '@angular/common';
22	import { coerceBooleanProperty } from 'ngx-tethys/util';
23
24	const sizeClassMap = {
25	lg: ['thy-empty-state', 'thy-empty-state--lg'],
26	md: ['thy-empty-state'],
27	sm: ['thy-empty-state', 'thy-empty-state--sm']
28	};
29
30	const sizeMap = {
31	lg: {
32	height: 168, // 空提示的高度
33	offsetTop: 30, // 空提示图标和大小之间的空白距离，需要除去，否则会不居中
34	defaultMarginTop: 120 // 不自动计算默认的 top 距离
35	},
36	md: {
37	height: 118,
38	offsetTop: 20,
39	defaultMarginTop: 10	1✔
40	},
41	sm: {	36✔
42	height: 78,	36✔
43	offsetTop: 10,	3✔
44	defaultMarginTop: 10
45	}
46	};
47		105✔
48	/** https://html.spec.whatwg.org/multipage/embedded-content.html#attr-img-loading */	91✔
49	export type ThyEmptyImageLoading = 'eager' \| 'lazy';
50		14✔
51	/** https://wicg.github.io/priority-hints/#idl-index */	2✔
52	export type ThyEmptyImageFetchPriority = 'high' \| 'low' \| 'auto';
53		12✔
54	/**	2✔
55	* 空页面组件
56	* @name thy-empty
57	* @order 10
58	*/	10✔
59	@Component({	2✔
60	selector: 'thy-empty',
61	templateUrl: './empty.component.html',
62	standalone: true,
63	imports: [NgIf, ThyIcon, NgClass, NgTemplateOutlet]
64	})	8✔
65	export class ThyEmpty implements OnInit, AfterViewInit, OnChanges {
66	/**
67	* 显示文本提示信息。同时传入 thyMessage，thyTranslationKey，thyEntityName，thyEntityNameTranslateKey 时优先级最高
68	*/	33✔
69	@Input() thyMessage: string;	33✔
70		33✔
71	/**
72	* 显示文本提示信息多语言 Key。同时传入 thyTranslationKey，thyEntityName，thyEntityNameTranslateKey 时优先级最高	11!
73	*/
74	@Input() thyTranslationKey: string;	11✔
75
76	/**	11!
UNCOV 77	* 显示文本提示信息多语言 Key 的 Values。传入 thyTranslationKey 后，传入这个才会生效	×
78	*/
79	@Input() thyTranslationValues: any;	11✔
80
81	/**	11!
82	* 显示默认提示信息，替换默认提示信息的目标对象，比如：没有 {thyEntityName}。同时传入 thyEntityName，thyEntityNameTranslateKey 时优先级较高	11✔
83	*/
84	@Input() thyEntityName: string;
85
86	/**	22!
UNCOV 87	* thyEntityName 的多语言 Key。thyMessage，thyTranslationKey，thyEntityName 均未传入时才会生效	×
88	*/
89	@Input() thyEntityNameTranslateKey: string;
90		22✔
91	/**
92	* 提示图标名
93	*/	33!
UNCOV 94	@Input() thyIconName: string;	×
95
96	/**
97	* 大小
98	* @type sm \| md \| lg	33✔
99	* @default md	33✔
100	*/	33✔
101	@Input()	33✔
102	set thySize(value: string) {	33✔
103	this.size = value;	33✔
104	if (this._initialized) {	33✔
105	this.updateClass();	33✔
106	}
107	}
108		33✔
109	/**	33✔
110	* 距上距离	33✔
111	*/
112	@Input() thyMarginTop: number \| string;
113		36✔
114	/**	36!
115	* 是否自动根据父容器计算高度，垂直居中	36✔
116	* @default false
117	*/
118	@Input({ transform: coerceBooleanProperty }) thyTopAuto: boolean;
119		33✔
120	/**	33✔
121	* 自动计算高度垂直居中(即 thyTopAuto 为 true)时，支持传入自定义父容器	33✔
122	*/
123	@Input() thyContainer: ElementRef;
124
125	/**
126	* 提示图片链接	42!
UNCOV 127	*/	×
128	@Input() thyImageUrl: string;
129
130	@Input() thyImageLoading?: ThyEmptyImageLoading;
131		33✔
132	@Input() thyImageFetchPriority?: ThyEmptyImageFetchPriority;	33✔
133		33✔
134	/**
135	* 显示文本描述	1✔
136	*/
137	@Input() thyDescription: string;
138
139	private size: string = 'md';
140
141	private _initialized = false;
142		1✔
143	private hostRenderer = useHostRenderer();
144
145	presetSvg: SafeAny;
146
147	/**
148	* 除提示图片，文本外的其他信息传入模板
149	* @type TemplateRef
150	*/
151	@ContentChild('extra') extraTemplateRef: TemplateRef<any>;
152
153	get displayText() {
154	if (this.thyMessage) {
155	return this.thyMessage;
156	} else if (this.thyTranslationKey) {
157	return this.thyTranslate.instant(this.thyTranslationKey, this.thyTranslationValues);
158	} else if (this.thyEntityName) {
159	return this.thyTranslate.instant(this.thyEmptyConfig.noResultWithTargetTranslateKey, {
160	target: this.thyEntityName	1✔
161	});
162	} else if (this.thyEntityNameTranslateKey) {
163	return this.thyTranslate.instant(this.thyEmptyConfig.noResultWithTargetTranslateKey, {
164	target: this.thyTranslate.instant(this.thyEntityNameTranslateKey)
165	});
166	} else {
167	return this.thyTranslate.instant(this.thyEmptyConfig.noResultTranslateKey);
168	}
169	}
170
171	private _calculatePosition() {
172	const sizeOptions = sizeMap[this.thySize \|\| 'md'];
173	let marginTop = null;
174	if (this.thyTopAuto) {
175	// 选择参考父容器居中
176	const containerElement = this.thyContainer ? this.thyContainer.nativeElement : this.elementRef.nativeElement.parentElement;
177	// containerElement.height;
178	let emptyStateHeight = this.elementRef.nativeElement.offsetHeight;
179	// 高度没有自动计算出来使用默认值
180	if (emptyStateHeight <= 10) {
181	emptyStateHeight = sizeOptions.height;
182	}
183	marginTop = (containerElement.offsetHeight - emptyStateHeight) / 2 - sizeOptions.offsetTop;
184	// marginTop = (containerElement.offsetHeight - emptyStateHeight) / 2;
185	if (marginTop < 0) {
186	marginTop = 0; // sizeOptions.defaultMarginTop;
187	}
188	} else {
189	if (this.thyMarginTop) {
190	marginTop = this.thyMarginTop;
191	} else {
192	marginTop = 0; // sizeOptions.defaultMarginTop;
193	}
194	}
195	if (marginTop) {
196	this.hostRenderer.setStyle('marginTop', marginTop + 'px');
197	}
198	}
199
200	constructor(
201	private thyTranslate: ThyTranslate,
202	private thyEmptyConfig: ThyEmptyConfig,
203	private elementRef: ElementRef,
204	private ngZone: NgZone,
205	private sanitizer: DomSanitizer
206	) {}
207
208	ngOnInit() {
209	this.updateClass();
210	this._initialized = true;
211	this.setPresetSvg(this.thyIconName);
212	}
213
214	updateClass() {
215	const classList = sizeClassMap[this.size] \|\| sizeClassMap['md'];
216	if (classList) {
217	this.hostRenderer.updateClass(classList);
218	}
219	}
220
221	ngAfterViewInit() {
222	this.ngZone.runOutsideAngular(() => {
223	setTimeout(() => {
224	this._calculatePosition();
225	}, 50);
226	});
227	}
228
229	ngOnChanges(changes: SimpleChanges): void {
230	if (changes.thyIconName && changes.thyIconName.currentValue && !changes.thyIconName.firstChange) {
231	this.setPresetSvg(changes.thyIconName.currentValue);
232	}
233	}
234
235	setPresetSvg(icon: string) {
236	this.presetSvg = '';
237	let presetSvg = icon ? PRESET_SVG[icon] : PRESET_SVG.default;
238
239	this.presetSvg = presetSvg ? this.sanitizer.bypassSecurityTrustHtml(presetSvg) : '';
240	}
241	}

atinc / ngx-tethys / 13fcf11d-0958-4626-8dcf-f200b8133961

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