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

UI: Fixed multiple datasource processing data in map widgets

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2021-04-02 17:06:01 +03:00
parent 593f95a7af
commit aabf5c792a
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,8 @@ import {
createLabelFromDatasource, createLabelFromDatasource,
hashCode, hashCode,
isDefined, isDefined,
isDefinedAndNotNull, isFunction, isDefinedAndNotNull,
isFunction,
isNumber, isNumber,
isUndefined, isUndefined,
padValue padValue
@ -30,7 +31,7 @@ import { Datasource, DatasourceData } from '@shared/models/widget.models';
import _ from 'lodash'; import _ from 'lodash';
import { mapProviderSchema, providerSets } from '@home/components/widget/lib/maps/schemes'; import { mapProviderSchema, providerSets } from '@home/components/widget/lib/maps/schemes';
import { addCondition, mergeSchemes } from '@core/schema-utils'; import { addCondition, mergeSchemes } from '@core/schema-utils';
import L, {Projection} from "leaflet"; import L from 'leaflet';
export function getProviderSchema(mapProvider: MapProviders, ignoreImageMap = false) { export function getProviderSchema(mapProvider: MapProviders, ignoreImageMap = false) {
const providerSchema = _.cloneDeep(mapProviderSchema); const providerSchema = _.cloneDeep(mapProviderSchema);
@ -318,22 +319,24 @@ export const parseWithTranslation = {
}; };
export function parseData(input: DatasourceData[]): FormattedData[] { export function parseData(input: DatasourceData[]): FormattedData[] {
return _(input).groupBy(el => el?.datasource?.entityName) return _(input).groupBy(el => el?.datasource.entityId + el?.datasource.entityType)
.values().value().map((entityArray, i) => { .values().value().map((entityArray, i) => {
const obj: FormattedData = { const obj: FormattedData = {
entityName: entityArray[0]?.datasource?.entityName, entityName: entityArray[0]?.datasource?.entityName,
entityId: entityArray[0]?.datasource?.entityId, entityId: entityArray[0].datasource.entityId,
entityType: entityArray[0]?.datasource?.entityType, entityType: entityArray[0].datasource.entityType,
$datasource: entityArray[0]?.datasource, $datasource: entityArray[0].datasource,
dsIndex: i, dsIndex: i,
deviceType: null deviceType: null
}; };
entityArray.filter(el => el.data.length).forEach(el => { entityArray.filter(el => el.data.length).forEach(el => {
const indexDate = el?.data?.length ? el.data.length - 1 : 0; const indexDate = el.data.length ? el.data.length - 1 : 0;
obj[el?.dataKey?.label] = el?.data[indexDate][1]; if (!obj.hasOwnProperty(el.dataKey.label) || el.data[indexDate][1] !== '') {
obj[el?.dataKey?.label + '|ts'] = el?.data[indexDate][0]; obj[el.dataKey.label] = el.data[indexDate][1];
if (el?.dataKey?.label === 'type') { obj[el.dataKey.label + '|ts'] = el.data[indexDate][0];
obj.deviceType = el?.data[indexDate][1]; if (el.dataKey.label === 'type') {
obj.deviceType = el.data[indexDate][1];
}
} }
}); });
return obj; return obj;