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

Update flot-widget.ts

Browse Source
This commit is contained in:
Igor Kulikov 2022-11-02 15:34:45 +02:00 committed by GitHub
parent 4d12e4a1e7
commit d61b38fc8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts
View File

@ -911,7 +911,7 @@ export class TbFlot {
data.forEach((keyData) => { data.forEach((keyData) => {
const skip = isLatest && !keyData.dataKey.settings.useAsThreshold; const skip = isLatest && !keyData.dataKey.settings.useAsThreshold;
if (!skip && keyData && keyData.data && keyData.data[0]) { if (!skip && keyData && keyData.data && keyData.data[0]) {
const values = this.parsThresholdData(keyData.data[0][1]); const values = this.parseThresholdData(keyData.data[0][1]);
values.forEach(v => { values.forEach(v => {
const threshold = this.processSingleDataValue(v, keyData, keyData.dataKey.settings, existingThresholds, isLatest); const threshold = this.processSingleDataValue(v, keyData, keyData.dataKey.settings, existingThresholds, isLatest);
if (threshold != null) { if (threshold != null) {
@ -923,11 +923,11 @@ export class TbFlot {
return thresholds; return thresholds;
} }
private parsThresholdData(value: any): Array<any> { private parseThresholdData(value: any): Array<any> {
let values; let values;
try { try {
const parseData = JSON.parse(value); const parsedData = JSON.parse(value);
values = Array.isArray(parseData) ? parseData : [parseData]; values = Array.isArray(parsedData) ? parsedData : [parsedData];
} catch (e) { } catch (e) {
values = [value]; values = [value];
} }