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

Merge pull request #10012 from ArtemDzhereleiko/AD/bug-fix/time-table/default-column-to-display

Browse Source 
Fixed default column visibility for timeseries table widget
This commit is contained in:
Igor Kulikov 2024-01-24 18:21:52 +02:00 committed by GitHub
commit c6d98aa0dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,9 +407,10 @@ export class TimeseriesTableWidgetComponent extends PageComponent implements OnI
} }
} }
if (this.sources.length) { if (this.sources.length) {
this.prepareDisplayedColumn(); this.sources.forEach((source, index) => {
this.sources[this.sourceIndex].displayedColumns = this.prepareDisplayedColumn(index);
this.displayedColumns[this.sourceIndex].filter(value => value.display).map(value => value.def); source.displayedColumns = this.displayedColumns[index].filter(value => value.display).map(value => value.def);
});
} }
this.updateActiveEntityInfo(); this.updateActiveEntityInfo();
} }
@ -438,8 +439,6 @@ export class TimeseriesTableWidgetComponent extends PageComponent implements OnI
const source = this.sources[this.sourceIndex]; const source = this.sources[this.sourceIndex];
this.prepareDisplayedColumn();
const providers: StaticProvider[] = [ const providers: StaticProvider[] = [
{ {
provide: DISPLAY_COLUMNS_PANEL_DATA, provide: DISPLAY_COLUMNS_PANEL_DATA,
@ -472,11 +471,11 @@ export class TimeseriesTableWidgetComponent extends PageComponent implements OnI
} }
} }
private prepareDisplayedColumn() { private prepareDisplayedColumn(index: number) {
if (!this.displayedColumns[this.sourceIndex]) { if (!this.displayedColumns[index]) {
this.displayedColumns[this.sourceIndex] = this.sources[this.sourceIndex].displayedColumns.map(value => { this.displayedColumns[index] = this.sources[index].displayedColumns.map(value => {
let title = ''; let title = '';
const header = this.sources[this.sourceIndex].header.find(column => column.index.toString() === value); const header = this.sources[index].header.find(column => column.index.toString() === value);
if (value === '0') { if (value === '0') {
title = 'Timestamp'; title = 'Timestamp';
} else if (value === 'actions') { } else if (value === 'actions') {