Browse Source

Merge branch 'feature/modbus-extended-functionality' of github.com:maxunbearable/thingsboard into improvement/gateway-dashboard

pull/11251/head
Vladyslav_Prykhodko 2 years ago
parent
commit
8c1e3a977d
  1. 2
      ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mapping-table/mapping-table.component.ts
  2. 2
      ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-master-table/modbus-master-table.component.ts
  3. 0
      ui-ngx/src/app/shared/components/table/table-datasource.abstract.ts

2
ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mapping-table/mapping-table.component.ts

@ -58,7 +58,7 @@ import { coerceBoolean } from '@shared/decorators/coercion';
import { SharedModule } from '@shared/shared.module'; import { SharedModule } from '@shared/shared.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { TruncateTooltipDirective } from '@shared/directives/truncate-tooltip.directive'; import { TruncateTooltipDirective } from '@shared/directives/truncate-tooltip.directive';
import { TbTableDatasource } from '@home/components/table/table-datasource.abstract'; import { TbTableDatasource } from '@shared/components/table/table-datasource.abstract';
@Component({ @Component({
selector: 'tb-mapping-table', selector: 'tb-mapping-table',

2
ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-master-table/modbus-master-table.component.ts

@ -49,7 +49,7 @@ import { isDefinedAndNotNull, isUndefinedOrNull } from '@core/utils';
import { SharedModule } from '@shared/shared.module'; import { SharedModule } from '@shared/shared.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { ModbusSlaveDialogComponent } from '../modbus-slave-dialog/modbus-slave-dialog.component'; import { ModbusSlaveDialogComponent } from '../modbus-slave-dialog/modbus-slave-dialog.component';
import { TbTableDatasource } from '@home/components/table/table-datasource.abstract'; import { TbTableDatasource } from '@shared/components/table/table-datasource.abstract';
@Component({ @Component({
selector: 'tb-modbus-master-table', selector: 'tb-modbus-master-table',

0
ui-ngx/src/app/modules/home/components/table/table-datasource.abstract.ts → ui-ngx/src/app/shared/components/table/table-datasource.abstract.ts

Loading…
Cancel
Save