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

UI: Fixed image map widget - incorrect process first empty data

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2022-02-11 16:05:46 +02:00
parent 58461c8106
commit ca7da9e396
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui-ngx/src/app/modules/home/components/widget/lib/maps/common-maps-utils.ts
View File

@ -123,6 +123,7 @@ export function aspectCache(imageUrl: string): Observable<number> {
return aspect; return aspect;
})); }));
} }
return of(0);
} }
export type TranslateFunc = (key: string, defaultTranslation?: string) => string; export type TranslateFunc = (key: string, defaultTranslation?: string) => string;

5
ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts
View File

@ -94,10 +94,12 @@ export class ImageMap extends LeafletMap {
type: widgetType.latest, type: widgetType.latest,
callbacks: { callbacks: {
onDataUpdated: (subscription) => { onDataUpdated: (subscription) => {
result.next([subscription.data[0]?.data, isUpdate]); if (subscription.data[0]?.data[0]?.length > 0) {
result.next([subscription.data[0].data, isUpdate]);
isUpdate = true; isUpdate = true;
} }
} }
}
}; };
this.ctx.subscriptionApi.createSubscription(imageUrlSubscriptionOptions, true).subscribe((subscription) => { this.ctx.subscriptionApi.createSubscription(imageUrlSubscriptionOptions, true).subscribe((subscription) => {
const pageLink: EntityDataPageLink = { const pageLink: EntityDataPageLink = {
@ -126,7 +128,6 @@ export class ImageMap extends LeafletMap {
private imageFromAlias(alias: Observable<[DataSet, boolean]>): Observable<MapImage> { private imageFromAlias(alias: Observable<[DataSet, boolean]>): Observable<MapImage> {
return alias.pipe( return alias.pipe(
filter(result => result[0].length > 0),
mergeMap(res => { mergeMap(res => {
const mapImage: MapImage = { const mapImage: MapImage = {
imageUrl: res[0][0][1], imageUrl: res[0][0][1],