Browse Source

Merge pull request #14433 from mtsymbarov-del/fix/entities-table-widget

Fixed displaying of disabled data in column index in Column action
pull/14454/head
Vladyslav Prykhodko 10 months ago
committed by GitHub
parent
commit
32c3b31beb
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 6
      ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts

6
ui-ngx/src/app/modules/home/components/widget/widget-config.component.ts

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

Loading…
Cancel
Save