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

Merge pull request #3061 from thingsboard/json_dialog_fix

Browse Source 
fix buf Json edit
This commit is contained in:
Igor Kulikov 2020-07-08 15:35:38 +03:00 committed by GitHub
commit 61d96b94f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui-ngx/src/app/shared/components/json-object-edit.component.ts
View File

@ -194,19 +194,19 @@ export class JsonObjectEditComponent implements OnInit, ControlValueAccessor, Va
} }
beautifyJSON() { beautifyJSON() {
const res = JSON.stringify(this.modelValue, null, 2); if (this.jsonEditor && this.objectValid) {
if (this.jsonEditor) { const res = JSON.stringify(this.modelValue, null, 2);
this.jsonEditor.setValue(res ? res : '', -1); this.jsonEditor.setValue(res ? res : '', -1);
this.updateView();
} }
this.updateView();
} }
minifyJSON() { minifyJSON() {
const res = JSON.stringify(this.modelValue); if (this.jsonEditor && this.objectValid) {
if (this.jsonEditor) { const res = JSON.stringify(this.modelValue);
this.jsonEditor.setValue(res ? res : '', -1); this.jsonEditor.setValue(res ? res : '', -1);
this.updateView();
} }
this.updateView();
} }
writeValue(value: any): void { writeValue(value: any): void {
@ -254,6 +254,7 @@ export class JsonObjectEditComponent implements OnInit, ControlValueAccessor, Va
this.objectValid = !this.required; this.objectValid = !this.required;
this.validationError = this.required ? 'Json object is required.' : ''; this.validationError = this.required ? 'Json object is required.' : '';
} }
this.modelValue = data;
this.propagateChange(data); this.propagateChange(data);
} }
} }