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

Add support correct entityField key name: entityName and entityType

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2020-07-29 13:40:50 +03:00 committed by Andrew Shvayka
parent 6e1b343f50
commit e77138a187
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts
View File

@ -87,7 +87,6 @@ import {
import { sortItems } from '@shared/models/page/page-link';
import { entityFields } from '@shared/models/entity.models';
import { DatePipe } from '@angular/common';
import { alarmFields } from '@shared/models/alarm.models';
interface EntitiesTableWidgetSettings extends TableWidgetSettings {
entitiesTitle: string;
@ -659,7 +658,9 @@ class EntityDatasource implements DataSource<EntityData> {
this.dataKeys.forEach((dataKey, index) => {
const keyData = data[index].data;
if (keyData && keyData.length && keyData[0].length > 1) {
entity[dataKey.label] = keyData[0][1];
if (data[index].dataKey.type !== DataKeyType.entityField || !entity.hasOwnProperty(dataKey.label)) {
entity[dataKey.label] = keyData[0][1];
}
} else {
entity[dataKey.label] = '';
}