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

fix Entities Table widget column order

Browse Source
This commit is contained in:
Maksym Tsymbarov 2025-09-16 14:22:30 +03:00
parent 1bfb969245
commit 3f83e26d07
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html
View File

@ -57,7 +57,7 @@
<mat-option *ngFor="let column of configuredColumns; let $index = index" <mat-option *ngFor="let column of configuredColumns; let $index = index"
[value]="$index" [value]="$index"
[disabled]="usedCellClickColumns.includes($index)"> [disabled]="usedCellClickColumns.includes($index)">
{{ getCellClickColumnInfo($index, column) }} {{ getCellClickColumnInfo($index, column) | customTranslate }}
</mat-option> </mat-option>
</mat-select> </mat-select>
<mat-icon matSuffix <mat-icon matSuffix

21
ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts
View File

@ -926,7 +926,26 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
if (this.modelValue) { if (this.modelValue) {
const configuredColumns = new Array<CellClickColumnInfo>(); const configuredColumns = new Array<CellClickColumnInfo>();
if (this.modelValue.config?.datasources[0]?.dataKeys?.length) { if (this.modelValue.config?.datasources[0]?.dataKeys?.length) {
configuredColumns.push(...this.keysToCellClickColumns(this.modelValue.config.datasources[0].dataKeys)); const {
displayEntityLabel,
displayEntityName,
displayEntityType,
entityNameColumnTitle,
entityLabelColumnTitle
} = this.modelValue.config.settings;
const displayEntitiesArray = [];
if (isDefined(displayEntityName)) {
const displayName = entityNameColumnTitle ? entityNameColumnTitle : 'entityName';
displayEntitiesArray.push({name: displayName, label: displayName});
}
if (isDefined(displayEntityLabel)) {
const displayLabel = entityLabelColumnTitle ? entityLabelColumnTitle : 'entityLabel';
displayEntitiesArray.push({name: displayLabel, label: displayLabel});
}
if (isDefined(displayEntityType)) {
displayEntitiesArray.push({name: 'entityType', label: 'entityType'});
}
configuredColumns.push(...displayEntitiesArray, ...this.keysToCellClickColumns(this.modelValue.config.datasources[0].dataKeys));
} }
if (this.modelValue.config?.alarmSource?.dataKeys?.length) { if (this.modelValue.config?.alarmSource?.dataKeys?.length) {
configuredColumns.push(...this.keysToCellClickColumns(this.modelValue.config.alarmSource.dataKeys)); configuredColumns.push(...this.keysToCellClickColumns(this.modelValue.config.alarmSource.dataKeys));