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

UI: Fixed switch control widget, didn't update state after get value in call rpc

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2021-03-29 19:03:44 +03:00
parent 5bb252b418
commit 766594a7aa
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui-ngx/src/app/modules/home/components/widget/lib/rpc/switch.component.ts
View File

@ -121,7 +121,7 @@ export class SwitchComponent extends PageComponent implements OnInit, OnDestroy
this.switchResize$ = new ResizeObserver(() => {
this.resize();
})
});
this.switchResize$.observe(this.switchContainerRef.nativeElement);
this.init();
}
@ -202,13 +202,13 @@ export class SwitchComponent extends PageComponent implements OnInit, OnDestroy
let width = this.switchContainer.width();
let height = this.switchContainer.height();
if (this.showOnOffLabels) {
height = height*2/3;
height = height * 2 / 3;
}
const ratio = width/height;
const ratio = width / height;
if (ratio > switchAspectRation) {
width = height*switchAspectRation;
width = height * switchAspectRation;
} else {
height = width/switchAspectRation;
height = width / switchAspectRation;
}
this.switchElement.css({width, height});
this.matSlideToggle.css({width, height, minWidth: width});
@ -232,11 +232,11 @@ export class SwitchComponent extends PageComponent implements OnInit, OnDestroy
fontSize--;
textWidth = this.measureTextWidth(text, fontSize);
}
element.css({fontSize: fontSize+'px', lineHeight: fontSize+'px'});
element.css({fontSize: fontSize + 'px', lineHeight: fontSize + 'px'});
}
private measureTextWidth(text: string, fontSize: number): number {
this.textMeasure.css({fontSize: fontSize+'px', lineHeight: fontSize+'px'});
this.textMeasure.css({fontSize: fontSize + 'px', lineHeight: fontSize + 'px'});
this.textMeasure.text(text);
return this.textMeasure.width();
}
@ -260,6 +260,7 @@ export class SwitchComponent extends PageComponent implements OnInit, OnDestroy
this.ctx.controlApi.sendTwoWayCommand(this.getValueMethod, null, this.requestTimeout).subscribe(
(responseBody) => {
this.setValue(this.parseValueFunction(responseBody));
this.ctx.detectChanges();
},
() => {
const errorText = this.ctx.defaultSubscription.rpcErrorText;