[3.0] Entity list not correct find index for model (#2668)

* Entity list not correct find index for model

* Clear import

* Revert change

* Revert change

@@ -205,10 +205,11 @@ export class EntityListComponent implements ControlValueAccessor, OnInit, AfterV
   }
   }
 
 
   remove(entity: BaseData<EntityId>) {
   remove(entity: BaseData<EntityId>) {
-    const index = this.entities.indexOf(entity);
+    let index = this.entities.indexOf(entity);
     if (index >= 0) {
     if (index >= 0) {
       this.entities.splice(index, 1);
       this.entities.splice(index, 1);
       this.entityListFormGroup.get('entities').setValue(this.entities);
       this.entityListFormGroup.get('entities').setValue(this.entities);
+      index = this.modelValue.indexOf(entity.id.id);
       this.modelValue.splice(index, 1);
       this.modelValue.splice(index, 1);
       if (!this.modelValue.length) {
       if (!this.modelValue.length) {
         this.modelValue = null;
         this.modelValue = null;