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

reload entity fix

Browse Source
This commit is contained in:
mpetrov 2024-08-19 18:36:31 +03:00
parent 49da787fc4
commit dc336c3752
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
View File

@ -1218,16 +1218,17 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
return throwError(() => err); return throwError(() => err);
}) })
).subscribe((dashboard) => { ).subscribe((dashboard) => {
this.setEditMode(false, false);
this.dashboard = dashboard;
if (reInitDashboard) { if (reInitDashboard) {
const dashboardPageInitData: DashboardPageInitData = { const dashboardPageInitData: DashboardPageInitData = {
dashboard, dashboard,
currentDashboardId: dashboard.id ? dashboard.id.id : null, currentDashboardId: dashboard.id ? dashboard.id.id : null,
widgetEditMode: false, widgetEditMode: this.widgetEditMode,
singlePageMode: false singlePageMode: this.singlePageMode
}; };
this.init(dashboardPageInitData); this.init(dashboardPageInitData);
} else {
this.dashboard = dashboard;
this.setEditMode(false, false);
} }
}); });
} }

6
ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
View File

@ -402,7 +402,7 @@ export class EntitiesTableComponent extends PageComponent implements IEntitiesTa
this.cd.detectChanges(); this.cd.detectChanges();
} }
updateData(closeDetails: boolean = true) { updateData(closeDetails: boolean = true, reloadEntity: boolean = true) {
if (closeDetails) { if (closeDetails) {
this.isDetailsOpen = false; this.isDetailsOpen = false;
} }
@ -427,7 +427,7 @@ export class EntitiesTableComponent extends PageComponent implements IEntitiesTa
timePageLink.endTime = interval.endTime; timePageLink.endTime = interval.endTime;
} }
this.dataSource.loadEntities(this.pageLink); this.dataSource.loadEntities(this.pageLink);
if (this.isDetailsOpen && this.entityDetailsPanel) { if (reloadEntity && this.isDetailsOpen && this.entityDetailsPanel) {
this.entityDetailsPanel.reloadEntity(); this.entityDetailsPanel.reloadEntity();
} }
} }
@ -511,7 +511,7 @@ export class EntitiesTableComponent extends PageComponent implements IEntitiesTa
} }
onEntityUpdated(entity: BaseData<HasId>) { onEntityUpdated(entity: BaseData<HasId>) {
this.updateData(false); this.updateData(false, false);
this.entitiesTableConfig.entityUpdated(entity); this.entitiesTableConfig.entityUpdated(entity);
} }