diff --git a/projects/common-form-elements/src/lib/dynamic-dropdown/dynamic-dropdown.component.html b/projects/common-form-elements/src/lib/dynamic-dropdown/dynamic-dropdown.component.html index 9f5acfc830de4651df6555b7774bb3da3ed9d87a..8105b7ef6630de20185256db6298478dfb459048 100644 --- a/projects/common-form-elements/src/lib/dynamic-dropdown/dynamic-dropdown.component.html +++ b/projects/common-form-elements/src/lib/dynamic-dropdown/dynamic-dropdown.component.html @@ -6,8 +6,9 @@ <input [(ngModel)]="searchInput" (keyup)="filterItem()" (click)="showAllList()" class="searchbox-input" type="text" [hidden]="!isSearchable" autocomplete="off"> <label *ngIf="!showSelectdItem && isSearchable && !hidePlaceholder" for="searchbox-input" class="float-label">{{placeholder}}</label> <label *ngIf="!showSelectdItem && !isSearchable" for="searchbox-input" class="not-searchable-label">{{placeholder}}</label> - <label *ngIf="showSelectdItem && isSearchable" for="searchbox-input" class="float-label">{{showSelectdItem}}</label> - <label *ngIf="showSelectdItem && !isSearchable" for="searchbox-input" class="not-searchable-label">{{showSelectdItem}}</label> + <label *ngIf="showSelectdItem && isSearchable && formControlRef.value?.length" for="searchbox-input" class="float-label">{{showSelectdItem}}</label> + <label *ngIf="showSelectdItem && !isSearchable && formControlRef.value?.length" for="searchbox-input" class="not-searchable-label">{{showSelectdItem}}</label> + <label *ngIf="field.default && !showSelectdItem" for="searchbox-input" class="not-searchable-label">{{field.default}}</label> </div> <sb-icon-dropdown class="dropdown-icon"></sb-icon-dropdown> <div [hidden]="!showDropdown"> diff --git a/projects/common-form-elements/src/lib/dynamic-dropdown/dynamic-dropdown.component.ts b/projects/common-form-elements/src/lib/dynamic-dropdown/dynamic-dropdown.component.ts index 2b91ccfd33d16db70054ce37f379a487f185742b..eccb0be0f434012f9a24b80bca44efe02d2499df 100644 --- a/projects/common-form-elements/src/lib/dynamic-dropdown/dynamic-dropdown.component.ts +++ b/projects/common-form-elements/src/lib/dynamic-dropdown/dynamic-dropdown.component.ts @@ -41,6 +41,7 @@ export class DynamicDropdownComponent implements OnInit, OnChanges, OnDestroy { public searchInput:any; public hidePlaceholder:boolean = false; private dispose$ = new Subject<undefined>(); + public editable:boolean; options$?: Observable<FieldConfigOption<any>[]>; contextValueChangesSubscription?: Subscription; @@ -76,7 +77,7 @@ export class DynamicDropdownComponent implements OnInit, OnChanges, OnDestroy { } if (this.field && this.field.editable) { - this.disabled = this.field.editable; + this.editable = this.field.editable; } // if (this.context) { @@ -139,7 +140,7 @@ export class DynamicDropdownComponent implements OnInit, OnChanges, OnDestroy { } showList(event) { - if (this.disabled !== true || this.isDependsInvalid) { + if (this.editable !== true || this.isDependsInvalid) { return; }