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

UI: Fixed cancel event on color picker

Browse Source
This commit is contained in:
ArtemDzhereleiko 2022-01-10 15:21:44 +02:00
parent bbab11d5aa
commit fa1cd21473
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/shared/components/dialog/color-picker-dialog.component.ts
View File

@ -67,7 +67,7 @@ export class ColorPickerDialogComponent extends DialogComponent<ColorPickerDialo
} }
cancel(): void { cancel(): void {
this.dialogRef.close(this.data.color); this.dialogRef.close(null);
} }
select(): void { select(): void {

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

@ -217,7 +217,7 @@ export class JsonFormComponent implements OnInit, ControlValueAccessor, Validato
val: tinycolor.ColorFormats.RGBA, val: tinycolor.ColorFormats.RGBA,
colorSelectedFn: (color: tinycolor.ColorFormats.RGBA) => void) { colorSelectedFn: (color: tinycolor.ColorFormats.RGBA) => void) {
this.dialogs.colorPicker(tinycolor(val).toRgbString()).subscribe((color) => { this.dialogs.colorPicker(tinycolor(val).toRgbString()).subscribe((color) => {
if (colorSelectedFn) { if (color && colorSelectedFn) {
colorSelectedFn(tinycolor(color).toRgb()); colorSelectedFn(tinycolor(color).toRgb());
} }
}); });