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

Merge pull request #5142 from vvlladd28/bug/json-form/full-screen

Browse Source 
UI: Fixed toggle to full-screen mode editor in JSON forms
This commit is contained in:
Igor Kulikov 2021-08-25 19:42:23 +03:00 committed by GitHub
commit 6ad78e545b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui-ngx/src/app/shared/components/json-form/json-form.component.ts
View File

@ -15,6 +15,7 @@
///
import {
ChangeDetectorRef,
Component,
ElementRef,
forwardRef,
@ -113,7 +114,8 @@ export class JsonFormComponent implements OnInit, ControlValueAccessor, Validato
constructor(public elementRef: ElementRef,
private translate: TranslateService,
private dialogs: DialogService,
protected store: Store<AppState>) {
protected store: Store<AppState>,
private cd: ChangeDetectorRef) {
}
ngOnInit(): void {
@ -216,8 +218,8 @@ export class JsonFormComponent implements OnInit, ControlValueAccessor, Validato
}
private onIconClick(key: (string | number)[],
val: string,
iconSelectedFn: (icon: string) => void) {
val: string,
iconSelectedFn: (icon: string) => void) {
this.dialogs.materialIconPicker(val).subscribe((icon) => {
if (icon && iconSelectedFn) {
iconSelectedFn(icon);
@ -229,6 +231,7 @@ export class JsonFormComponent implements OnInit, ControlValueAccessor, Validato
this.targetFullscreenElement = element;
this.isFullscreen = !this.isFullscreen;
this.fullscreenFinishFn = fullscreenFinishFn;
this.cd.markForCheck();
}
onFullscreenChanged(fullscreen: boolean) {