dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor feature custom image icon.

Browse Source
This commit is contained in:
deaflynx 2025-09-04 17:03:10 +03:00
parent 34a50f8009
commit 3c2e289cb3
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui-ngx/src/app/shared/components/icon.component.ts
View File

@ -305,7 +305,7 @@ export class TbIconComponent extends _TbIconBase
this.imagePipe.transform(rawName, { asString: true, ignoreLoadingImage: true }).subscribe( this.imagePipe.transform(rawName, { asString: true, ignoreLoadingImage: true }).subscribe(
imageUrl => { imageUrl => {
const urlStr = imageUrl as string; const urlStr = imageUrl as string;
const isSvg = rawName?.endsWith('.svg'); const isSvg = urlStr?.startsWith('data:image/svg+xml') || urlStr?.endsWith('.svg');
if (isSvg) { if (isSvg) {
const safeUrl = this.sanitizer.bypassSecurityTrustResourceUrl(urlStr); const safeUrl = this.sanitizer.bypassSecurityTrustResourceUrl(urlStr);
this._iconRegistry this._iconRegistry
@ -316,10 +316,7 @@ export class TbIconComponent extends _TbIconBase
this.renderer.insertBefore(this._elementRef.nativeElement, svg, this._iconNameContent.nativeElement); this.renderer.insertBefore(this._elementRef.nativeElement, svg, this._iconNameContent.nativeElement);
this._imageElement = svg; this._imageElement = svg;
}, },
error: (err: Error) => { error: () => this._setImageElement(urlStr)
console.log('err', err)
this._setImageElement(urlStr);
}
}); });
} else { } else {
this._setImageElement(urlStr); this._setImageElement(urlStr);
@ -336,8 +333,7 @@ export class TbIconComponent extends _TbIconBase
this.renderer.addClass(imgElement, 'mat-icon'); this.renderer.addClass(imgElement, 'mat-icon');
this.renderer.setAttribute(imgElement, 'alt', 'Image icon'); this.renderer.setAttribute(imgElement, 'alt', 'Image icon');
this.renderer.setAttribute(imgElement, 'src', urlStr); this.renderer.setAttribute(imgElement, 'src', urlStr);
const elem: HTMLElement = this._elementRef.nativeElement; this.renderer.insertBefore(this._elementRef.nativeElement, imgElement, this._iconNameContent.nativeElement);
this.renderer.insertBefore(elem, imgElement, this._iconNameContent.nativeElement);
this._imageElement = imgElement; this._imageElement = imgElement;
} }