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

Changed labelText and reqiredText logic

Browse Source
This commit is contained in:
kalytka 2023-03-27 13:52:40 +03:00
parent 464e87fe89
commit 78ffd10dd3
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.html
View File

@ -16,7 +16,7 @@
--> -->
<mat-form-field [formGroup]="selectEntityFormGroup" class="mat-block" [appearance]="appearance"> <mat-form-field [formGroup]="selectEntityFormGroup" class="mat-block" [appearance]="appearance">
<mat-label>{{ entityText | translate }}</mat-label> <mat-label>{{ label | translate }}</mat-label>
<input matInput type="text" <input matInput type="text"
#entityInput #entityInput
formControlName="entity" formControlName="entity"
@ -42,6 +42,6 @@
</mat-option> </mat-option>
</mat-autocomplete> </mat-autocomplete>
<mat-error *ngIf="selectEntityFormGroup.get('entity').hasError('required')"> <mat-error *ngIf="selectEntityFormGroup.get('entity').hasError('required')">
{{ entityRequiredText | translate }} {{ requiredErrorText | translate }}
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>

21
ui-ngx/src/app/shared/components/entity/entity-autocomplete.component.ts
View File

@ -71,7 +71,6 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
this.dirty = true; this.dirty = true;
} }
} }
@Input() @Input()
set entitySubtype(entitySubtype: string) { set entitySubtype(entitySubtype: string) {
if (this.entitySubtypeValue !== entitySubtype) { if (this.entitySubtypeValue !== entitySubtype) {
@ -249,12 +248,6 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
break; break;
} }
} }
if (this.labelText && this.labelText.length) {
this.entityText = this.labelText;
}
if (this.requiredText && this.requiredText.length) {
this.entityRequiredText = this.requiredText;
}
const currentEntity = this.getCurrentEntity(); const currentEntity = this.getCurrentEntity();
if (currentEntity) { if (currentEntity) {
const currentEntityType = currentEntity.id.entityType; const currentEntityType = currentEntity.id.entityType;
@ -384,4 +377,18 @@ export class EntityAutocompleteComponent implements ControlValueAccessor, OnInit
} }
return entityType; return entityType;
} }
get label(): string {
if (this.labelText && this.labelText.length) {
return this.labelText;
}
return this.entityText;
}
get requiredErrorText(): string {
if (this.requiredText && this.requiredText.length) {
return this.requiredText;
}
return this.entityRequiredText;
}
} }