Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
This commit is contained in:
commit
2dfa34db40
|
@ -333,6 +333,7 @@ export class MultipleAutoCompleteComponent extends _CustomComponentMixinBase imp
|
|||
writeValue(value: any): void {
|
||||
this.value = Array.isArray(value) ? value : null;
|
||||
// Update chips observable
|
||||
this.autocompleteInput.nativeElement.value = '';
|
||||
this._items = null;
|
||||
this.getSelectedItems(this.value);
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ import { Subscription } from "rxjs";
|
|||
template: `
|
||||
<div class="editor-wrapper" [class]="wrapperClasses">
|
||||
<angular-editor class="full-width editor" [ngClass]="editable ? '': 'disabled'" [id]="id"
|
||||
[config]="editorConfig" [formControl]="form" [required]="form.value ? false: required"
|
||||
[config]="editorConfig" [formControl]="form" [required]="form.value ? false : required"
|
||||
placeholder="{{(placeholder? (placeholder | translate) : '') + (required ? ' *': '')}}"
|
||||
(paste)="pasteWithoutFormatting($event)"></angular-editor>
|
||||
<mat-icon *ngIf="form.value && editable" (click)="parentFormGroup.get(controlName).patchValue('')" class="clear">close</mat-icon>
|
||||
|
|
|
@ -164,7 +164,7 @@ export class DescriptionFormFieldComponent extends BaseComponent implements OnIn
|
|||
// }
|
||||
break;
|
||||
case DescriptionTemplateFieldType.CHECK_BOX:
|
||||
if (this.propertiesFormGroup?.get(this.field.id).get('textValue').value == "false") this.propertiesFormGroup?.get(this.field.id).get('textValue').setValue(undefined);
|
||||
this.propertiesFormGroup?.get(this.field.id).get('textValue').setValue(this.propertiesFormGroup?.get(this.field.id).get('textValue').value === 'true');
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue