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

Merge pull request #4059 from vvlladd28/bug/entities-panel/merge-additional-info

Browse Source 
Fixed merge additional info at updated entity
This commit is contained in:
Igor Kulikov 2021-02-04 19:23:39 +02:00 committed by GitHub
commit 6f2a4409c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/modules/home/components/entity/entity-details-panel.component.ts
View File

@ -44,7 +44,7 @@ import { EntityAction } from '@home/models/entity/entity-component.models';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { MatTab, MatTabGroup } from '@angular/material/tabs'; import { MatTab, MatTabGroup } from '@angular/material/tabs';
import { EntityTabsComponent } from '@home/components/entity/entity-tabs.component'; import { EntityTabsComponent } from '@home/components/entity/entity-tabs.component';
import { deepClone } from '@core/utils'; import { deepClone, mergeDeep } from '@core/utils';
@Component({ @Component({
selector: 'tb-entity-details-panel', selector: 'tb-entity-details-panel',
@ -280,7 +280,7 @@ export class EntityDetailsPanelComponent extends PageComponent implements OnInit
saveEntity() { saveEntity() {
if (this.detailsForm.valid) { if (this.detailsForm.valid) {
const editingEntity = {...this.editingEntity, ...this.entityComponent.entityFormValue()}; const editingEntity = mergeDeep(this.editingEntity, this.entityComponent.entityFormValue());
this.entitiesTableConfig.saveEntity(editingEntity).subscribe( this.entitiesTableConfig.saveEntity(editingEntity).subscribe(
(entity) => { (entity) => {
this.entity = entity; this.entity = entity;