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

UI: Revert code onRowClick function in table

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2021-06-14 19:39:22 +03:00
parent a0623e8e86
commit 095e8913ac
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -720,12 +720,12 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
} }
public onRowClick($event: Event, alarm: AlarmDataInfo) { public onRowClick($event: Event, alarm: AlarmDataInfo) {
const descriptors = this.ctx.actionsApi.getActionDescriptors('rowClick');
if (descriptors.length) {
if ($event) { if ($event) {
$event.stopPropagation(); $event.stopPropagation();
} }
this.alarmsDatasource.toggleCurrentAlarm(alarm); this.alarmsDatasource.toggleCurrentAlarm(alarm);
const descriptors = this.ctx.actionsApi.getActionDescriptors('rowClick');
if (descriptors.length) {
let entityId; let entityId;
let entityName; let entityName;
if (alarm && alarm.originator) { if (alarm && alarm.originator) {

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

@ -661,13 +661,13 @@ export class EntitiesTableWidgetComponent extends PageComponent implements OnIni
} }
public onRowClick($event: Event, entity: EntityData, isDouble?: boolean) { public onRowClick($event: Event, entity: EntityData, isDouble?: boolean) {
const actionSourceId = isDouble ? 'rowDoubleClick' : 'rowClick';
const descriptors = this.ctx.actionsApi.getActionDescriptors(actionSourceId);
if (descriptors.length) {
if ($event) { if ($event) {
$event.stopPropagation(); $event.stopPropagation();
} }
this.entityDatasource.toggleCurrentEntity(entity); this.entityDatasource.toggleCurrentEntity(entity);
const actionSourceId = isDouble ? 'rowDoubleClick' : 'rowClick';
const descriptors = this.ctx.actionsApi.getActionDescriptors(actionSourceId);
if (descriptors.length) {
let entityId; let entityId;
let entityName; let entityName;
let entityLabel; let entityLabel;