Merge remote-tracking branch 'upstream/lts-4.3' into rc

7 months ago · 460992ce13
1 changed files with 3 additions and 1 deletions
--- a/ui-ngx/src/app/shared/components/entity/entity-key-autocomplete.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-key-autocomplete.component.ts
@ -140,8 +140,10 @@ export class EntityKeyAutocompleteComponent implements ControlValueAccessor, Val
      changes.dataKeyType.currentValue !== changes.dataKeyType.previousValue;

    if (filterChanged || keyScopeChanged || keyTypeChanged) {
-      this.keyControl.setValue('', {emitEvent: false});
      this.cachedResult = null;
+      if (!this.keyControl.disabled) {
+        this.keyControl.setValue('', {emitEvent: false});
+      }
    }
  }