Browse Source
Merge pull request #14298 from mtsymbarov-del/fix/control-widget-parser-fn
Fixed parse function calling for control widgets
pull/14320/head
Vladyslav Prykhodko
7 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
27 additions and
12 deletions
-
ui-ngx/src/app/modules/home/components/widget/lib/rpc/led-indicator.component.ts
-
ui-ngx/src/app/modules/home/components/widget/lib/rpc/round-switch.component.ts
-
ui-ngx/src/app/modules/home/components/widget/lib/rpc/switch.component.ts
|
|
|
@ -332,11 +332,16 @@ export class LedIndicatorComponent extends PageComponent implements OnInit, OnDe |
|
|
|
if (keyData && keyData.data && keyData.data[0]) { |
|
|
|
const attrValue = keyData.data[0][1]; |
|
|
|
if (isDefined(attrValue)) { |
|
|
|
let parsed = null; |
|
|
|
let valueToParse = attrValue; |
|
|
|
try { |
|
|
|
parsed = this.parseValueFunction(JSON.parse(attrValue)); |
|
|
|
} catch (e){/**/} |
|
|
|
value = !!parsed; |
|
|
|
valueToParse = JSON.parse(attrValue); |
|
|
|
} catch (e) {/**/} |
|
|
|
|
|
|
|
try { |
|
|
|
value = !!this.parseValueFunction(valueToParse); |
|
|
|
} catch (e) { |
|
|
|
value = false; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -330,11 +330,16 @@ export class RoundSwitchComponent extends PageComponent implements OnInit, OnDes |
|
|
|
if (keyData && keyData.data && keyData.data[0]) { |
|
|
|
const attrValue = keyData.data[0][1]; |
|
|
|
if (isDefined(attrValue)) { |
|
|
|
let parsed = null; |
|
|
|
let valueToParse = attrValue; |
|
|
|
try { |
|
|
|
parsed = this.parseValueFunction(JSON.parse(attrValue)); |
|
|
|
} catch (e){/**/} |
|
|
|
value = !!parsed; |
|
|
|
valueToParse = JSON.parse(attrValue); |
|
|
|
} catch (e) {/**/} |
|
|
|
|
|
|
|
try { |
|
|
|
value = !!this.parseValueFunction(valueToParse); |
|
|
|
} catch (e) { |
|
|
|
value = false; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -373,11 +373,16 @@ export class SwitchComponent extends PageComponent implements AfterViewInit, OnD |
|
|
|
if (keyData && keyData.data && keyData.data[0]) { |
|
|
|
const attrValue = keyData.data[0][1]; |
|
|
|
if (isDefined(attrValue)) { |
|
|
|
let parsed = null; |
|
|
|
let valueToParse = attrValue; |
|
|
|
try { |
|
|
|
parsed = this.parseValueFunction(JSON.parse(attrValue)); |
|
|
|
} catch (e){/**/} |
|
|
|
value = !!parsed; |
|
|
|
valueToParse = JSON.parse(attrValue); |
|
|
|
} catch (e) {/**/} |
|
|
|
|
|
|
|
try { |
|
|
|
value = !!this.parseValueFunction(valueToParse); |
|
|
|
} catch (e) { |
|
|
|
value = false; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|