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

Merge pull request #4717 from vvlladd28/bug/widget-table/updated-data

Browse Source 
UI: Fixed not correct show data in table widget
This commit is contained in:
Igor Kulikov 2021-06-14 19:23:38 +03:00 committed by GitHub
commit c4037a9fa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.ts
View File

@ -426,7 +426,7 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
this.displayedColumns.push('actions'); this.displayedColumns.push('actions');
} }
this.alarmsDatasource = new AlarmsDatasource(this.subscription, latestDataKeys); this.alarmsDatasource = new AlarmsDatasource(this.subscription, latestDataKeys, this.ngZone);
if (this.enableSelection) { if (this.enableSelection) {
this.alarmsDatasource.selectionModeChanged$.subscribe((selectionMode) => { this.alarmsDatasource.selectionModeChanged$.subscribe((selectionMode) => {
const hideTitlePanel = selectionMode || this.textSearchMode; const hideTitlePanel = selectionMode || this.textSearchMode;
@ -957,7 +957,8 @@ class AlarmsDatasource implements DataSource<AlarmDataInfo> {
private appliedSortOrderLabel: string; private appliedSortOrderLabel: string;
constructor(private subscription: IWidgetSubscription, constructor(private subscription: IWidgetSubscription,
private dataKeys: Array<DataKey>) { private dataKeys: Array<DataKey>,
private ngZone: NgZone) {
} }
connect(collectionViewer: CollectionViewer): Observable<AlarmDataInfo[] | ReadonlyArray<AlarmDataInfo>> { connect(collectionViewer: CollectionViewer): Observable<AlarmDataInfo[] | ReadonlyArray<AlarmDataInfo>> {
@ -989,6 +990,7 @@ class AlarmsDatasource implements DataSource<AlarmDataInfo> {
updateAlarms() { updateAlarms() {
const subscriptionAlarms = this.subscription.alarms; const subscriptionAlarms = this.subscription.alarms;
let alarms = new Array<AlarmDataInfo>(); let alarms = new Array<AlarmDataInfo>();
let isEmptySelection = false;
subscriptionAlarms.data.forEach((alarmData) => { subscriptionAlarms.data.forEach((alarmData) => {
alarms.push(this.alarmDataToInfo(alarmData)); alarms.push(this.alarmDataToInfo(alarmData));
}); });
@ -1001,7 +1003,7 @@ class AlarmsDatasource implements DataSource<AlarmDataInfo> {
const toRemove = this.selection.selected.filter(alarmId => alarmIds.indexOf(alarmId) === -1); const toRemove = this.selection.selected.filter(alarmId => alarmIds.indexOf(alarmId) === -1);
this.selection.deselect(...toRemove); this.selection.deselect(...toRemove);
if (this.selection.isEmpty()) { if (this.selection.isEmpty()) {
this.onSelectionModeChanged(false); isEmptySelection = true;
} }
} }
const alarmsPageData: PageData<AlarmDataInfo> = { const alarmsPageData: PageData<AlarmDataInfo> = {
@ -1010,9 +1012,14 @@ class AlarmsDatasource implements DataSource<AlarmDataInfo> {
totalElements: subscriptionAlarms.totalElements, totalElements: subscriptionAlarms.totalElements,
hasNext: subscriptionAlarms.hasNext hasNext: subscriptionAlarms.hasNext
}; };
this.alarmsSubject.next(alarms); this.ngZone.run(() => {
this.pageDataSubject.next(alarmsPageData); if (isEmptySelection) {
this.dataLoading = false; this.onSelectionModeChanged(false);
}
this.alarmsSubject.next(alarms);
this.pageDataSubject.next(alarmsPageData);
this.dataLoading = false;
});
} }
private alarmDataToInfo(alarmData: AlarmData): AlarmDataInfo { private alarmDataToInfo(alarmData: AlarmData): AlarmDataInfo {

14
ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.ts
View File

@ -415,8 +415,7 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
if (this.actionCellDescriptors.length) { if (this.actionCellDescriptors.length) {
this.displayedColumns.push('actions'); this.displayedColumns.push('actions');
} }
this.entityDatasource = new EntityDatasource( this.entityDatasource = new EntityDatasource(this.translate, dataKeys, this.subscription, this.ngZone);
this.translate, dataKeys, this.subscription);
} }
private editColumnsToDisplay($event: Event) { private editColumnsToDisplay($event: Event) {
@ -689,7 +688,8 @@ class EntityDatasource implements DataSource<EntityData> {
constructor( constructor(
private translate: TranslateService, private translate: TranslateService,
private dataKeys: Array<DataKey>, private dataKeys: Array<DataKey>,
private subscription: IWidgetSubscription private subscription: IWidgetSubscription,
private ngZone: NgZone
) { ) {
} }
@ -732,9 +732,11 @@ class EntityDatasource implements DataSource<EntityData> {
totalElements: datasourcesPageData.totalElements, totalElements: datasourcesPageData.totalElements,
hasNext: datasourcesPageData.hasNext hasNext: datasourcesPageData.hasNext
}; };
this.entitiesSubject.next(entities); this.ngZone.run(() => {
this.pageDataSubject.next(entitiesPageData); this.entitiesSubject.next(entities);
this.dataLoading = false; this.pageDataSubject.next(entitiesPageData);
this.dataLoading = false;
});
} }
private datasourceToEntityData(datasource: Datasource, data: DatasourceData[]): EntityData { private datasourceToEntityData(datasource: Datasource, data: DatasourceData[]): EntityData {

13
ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.ts
View File

@ -235,7 +235,7 @@ export class TimeseriesTableWidgetComponent extends PageComponent implements OnI
} }
public getTabLabel(source: TimeseriesTableSource){ public getTabLabel(source: TimeseriesTableSource){
if(this.useEntityLabel){ if (this.useEntityLabel) {
return source.datasource.entityLabel || source.datasource.entityName; return source.datasource.entityLabel || source.datasource.entityName;
} else { } else {
return source.datasource.entityName; return source.datasource.entityName;
@ -286,7 +286,7 @@ export class TimeseriesTableWidgetComponent extends PageComponent implements OnI
if (this.actionCellDescriptors.length) { if (this.actionCellDescriptors.length) {
source.displayedColumns.push('actions'); source.displayedColumns.push('actions');
} }
const tsDatasource = new TimeseriesDatasource(source, this.hideEmptyLines, this.dateFormatFilter, this.datePipe); const tsDatasource = new TimeseriesDatasource(source, this.hideEmptyLines, this.dateFormatFilter, this.datePipe, this.ngZone);
tsDatasource.dataUpdated(this.data); tsDatasource.dataUpdated(this.data);
this.sources.push(source); this.sources.push(source);
} }
@ -545,7 +545,8 @@ class TimeseriesDatasource implements DataSource<TimeseriesRow> {
private source: TimeseriesTableSource, private source: TimeseriesTableSource,
private hideEmptyLines: boolean, private hideEmptyLines: boolean,
private dateFormatFilter: string, private dateFormatFilter: string,
private datePipe: DatePipe private datePipe: DatePipe,
private ngZone: NgZone
) { ) {
this.source.timeseriesDatasource = this; this.source.timeseriesDatasource = this;
} }
@ -568,8 +569,10 @@ class TimeseriesDatasource implements DataSource<TimeseriesRow> {
catchError(() => of(emptyPageData<TimeseriesRow>())), catchError(() => of(emptyPageData<TimeseriesRow>())),
).subscribe( ).subscribe(
(pageData) => { (pageData) => {
this.rowsSubject.next(pageData.data); this.ngZone.run(() => {
this.pageDataSubject.next(pageData); this.rowsSubject.next(pageData.data);
this.pageDataSubject.next(pageData);
});
} }
); );
} }