From 834a9c9c25dcafa50e738c8c4075612eab681ee4 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 20 Nov 2018 16:26:30 +0200 Subject: [PATCH] Fixed header support. --- ui/package.json | 5 +++-- ui/src/app/app.js | 2 ++ .../components/widget/action/manage-widget-actions.tpl.html | 2 +- ui/src/app/dashboard/states/manage-dashboard-states.tpl.html | 2 +- ui/src/app/entity/attribute/attribute-table.tpl.html | 2 +- ui/src/app/entity/relation/relation-table.tpl.html | 2 +- ui/src/app/extension/extension-table.tpl.html | 2 +- ui/src/app/widget/lib/alarms-table-widget.tpl.html | 2 +- ui/src/app/widget/lib/entities-table-widget.tpl.html | 2 +- ui/src/app/widget/lib/timeseries-table-widget.tpl.html | 2 +- 10 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ui/package.json b/ui/package.json index b9f6822372..7050ae78f3 100644 --- a/ui/package.json +++ b/ui/package.json @@ -22,14 +22,15 @@ "angular-carousel": "^1.0.1", "angular-cookies": "1.5.8", "angular-drag-and-drop-lists": "^1.4.0", + "angular-fixed-table-header": "^0.2.1", "angular-fullscreen": "git://github.com/fabiobiondi/angular-fullscreen.git#master", "angular-gridster": "^0.13.14", "angular-hotkeys": "^1.7.0", "angular-jwt": "^0.1.6", "angular-material": "1.1.9", "angular-material-data-table": "^0.10.9", - "angular-material-icons": "^0.7.1", "angular-material-expansion-panel": "^0.7.2", + "angular-material-icons": "^0.7.1", "angular-messages": "1.5.8", "angular-route": "1.5.8", "angular-sanitize": "1.5.8", @@ -66,9 +67,9 @@ "md-color-picker": "0.2.6", "mdPickers": "git://github.com/alenaksu/mdPickers.git#0.7.5", "moment": "^2.15.0", + "ngFlowchart": "git://github.com/thingsboard/ngFlowchart.git#master", "ngclipboard": "^1.1.1", "ngreact": "^0.3.0", - "ngFlowchart": "git://github.com/thingsboard/ngFlowchart.git#master", "objectpath": "^1.2.1", "oclazyload": "^1.0.9", "raphael": "^2.2.7", diff --git a/ui/src/app/app.js b/ui/src/app/app.js index 31b53a0d03..3fd30192e4 100644 --- a/ui/src/app/app.js +++ b/ui/src/app/app.js @@ -39,6 +39,7 @@ import uiRouter from 'angular-ui-router'; import angularJwt from 'angular-jwt'; import 'angular-drag-and-drop-lists'; import mdDataTable from 'angular-material-data-table'; +import fixedTableHeader from 'angular-fixed-table-header'; import 'angular-material-expansion-panel'; import ngTouch from 'angular-touch'; import 'angular-carousel'; @@ -114,6 +115,7 @@ angular.module('thingsboard', [ angularJwt, 'dndLists', mdDataTable, + fixedTableHeader, 'material.components.expansionPanels', ngTouch, 'angular-carousel', diff --git a/ui/src/app/components/widget/action/manage-widget-actions.tpl.html b/ui/src/app/components/widget/action/manage-widget-actions.tpl.html index 07f76f2e33..eb98650658 100644 --- a/ui/src/app/components/widget/action/manage-widget-actions.tpl.html +++ b/ui/src/app/components/widget/action/manage-widget-actions.tpl.html @@ -56,7 +56,7 @@ - + diff --git a/ui/src/app/dashboard/states/manage-dashboard-states.tpl.html b/ui/src/app/dashboard/states/manage-dashboard-states.tpl.html index 1ac230247a..c214fd084b 100644 --- a/ui/src/app/dashboard/states/manage-dashboard-states.tpl.html +++ b/ui/src/app/dashboard/states/manage-dashboard-states.tpl.html @@ -72,7 +72,7 @@
widget-config.action-source widget-config.action-name
- + diff --git a/ui/src/app/entity/attribute/attribute-table.tpl.html b/ui/src/app/entity/attribute/attribute-table.tpl.html index ecbcf00fd6..39c1c61694 100644 --- a/ui/src/app/entity/attribute/attribute-table.tpl.html +++ b/ui/src/app/entity/attribute/attribute-table.tpl.html @@ -126,7 +126,7 @@
dashboard.state-name dashboard.state-id
- + diff --git a/ui/src/app/entity/relation/relation-table.tpl.html b/ui/src/app/entity/relation/relation-table.tpl.html index a2b0920b4e..9a50666ae4 100644 --- a/ui/src/app/entity/relation/relation-table.tpl.html +++ b/ui/src/app/entity/relation/relation-table.tpl.html @@ -90,7 +90,7 @@
attribute.last-update-time attribute.key
- +
relation.type - + diff --git a/ui/src/app/widget/lib/alarms-table-widget.tpl.html b/ui/src/app/widget/lib/alarms-table-widget.tpl.html index 39843e19ea..e795ed30cb 100644 --- a/ui/src/app/widget/lib/alarms-table-widget.tpl.html +++ b/ui/src/app/widget/lib/alarms-table-widget.tpl.html @@ -60,7 +60,7 @@
extension.id extension.type
- +
{{ key.title }} diff --git a/ui/src/app/widget/lib/entities-table-widget.tpl.html b/ui/src/app/widget/lib/entities-table-widget.tpl.html index 66932a052f..a44144ffe9 100644 --- a/ui/src/app/widget/lib/entities-table-widget.tpl.html +++ b/ui/src/app/widget/lib/entities-table-widget.tpl.html @@ -39,7 +39,7 @@ - +
{{ column.title }} diff --git a/ui/src/app/widget/lib/timeseries-table-widget.tpl.html b/ui/src/app/widget/lib/timeseries-table-widget.tpl.html index 08c4c9ef9a..1b95e62103 100644 --- a/ui/src/app/widget/lib/timeseries-table-widget.tpl.html +++ b/ui/src/app/widget/lib/timeseries-table-widget.tpl.html @@ -43,7 +43,7 @@ - +