Merge pull request #2958 from vvlladd28/bug/rpc-widget

[3.0] Fixed not correct call custom parseValueFunction in RPC widget
This commit is contained in:
Igor Kulikov 2020-07-08 15:28:28 +03:00 committed by GitHub
commit a4022b33ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -320,7 +320,7 @@ export class LedIndicatorComponent extends PageComponent implements OnInit, OnDe
const keyData = data[0]; const keyData = data[0];
if (keyData && keyData.data && keyData.data[0]) { if (keyData && keyData.data && keyData.data[0]) {
const attrValue = keyData.data[0][1]; const attrValue = keyData.data[0][1];
if (attrValue) { if (isDefined(attrValue)) {
let parsed = null; let parsed = null;
try { try {
parsed = this.parseValueFunction(JSON.parse(attrValue)); parsed = this.parseValueFunction(JSON.parse(attrValue));

View File

@ -315,7 +315,7 @@ export class RoundSwitchComponent extends PageComponent implements OnInit, OnDes
const keyData = data[0]; const keyData = data[0];
if (keyData && keyData.data && keyData.data[0]) { if (keyData && keyData.data && keyData.data[0]) {
const attrValue = keyData.data[0][1]; const attrValue = keyData.data[0][1];
if (attrValue) { if (isDefined(attrValue)) {
let parsed = null; let parsed = null;
try { try {
parsed = this.parseValueFunction(JSON.parse(attrValue)); parsed = this.parseValueFunction(JSON.parse(attrValue));

View File

@ -333,7 +333,7 @@ export class SwitchComponent extends PageComponent implements OnInit, OnDestroy
const keyData = data[0]; const keyData = data[0];
if (keyData && keyData.data && keyData.data[0]) { if (keyData && keyData.data && keyData.data[0]) {
const attrValue = keyData.data[0][1]; const attrValue = keyData.data[0][1];
if (attrValue) { if (isDefined(attrValue)) {
let parsed = null; let parsed = null;
try { try {
parsed = this.parseValueFunction(JSON.parse(attrValue)); parsed = this.parseValueFunction(JSON.parse(attrValue));