Showing
10 changed files
with
13 additions
and
10 deletions
| @@ -22,14 +22,15 @@ | @@ -22,14 +22,15 @@ | ||
| 22 | "angular-carousel": "^1.0.1", | 22 | "angular-carousel": "^1.0.1", |
| 23 | "angular-cookies": "1.5.8", | 23 | "angular-cookies": "1.5.8", |
| 24 | "angular-drag-and-drop-lists": "^1.4.0", | 24 | "angular-drag-and-drop-lists": "^1.4.0", |
| 25 | + "angular-fixed-table-header": "^0.2.1", | ||
| 25 | "angular-fullscreen": "git://github.com/fabiobiondi/angular-fullscreen.git#master", | 26 | "angular-fullscreen": "git://github.com/fabiobiondi/angular-fullscreen.git#master", |
| 26 | "angular-gridster": "^0.13.14", | 27 | "angular-gridster": "^0.13.14", |
| 27 | "angular-hotkeys": "^1.7.0", | 28 | "angular-hotkeys": "^1.7.0", |
| 28 | "angular-jwt": "^0.1.6", | 29 | "angular-jwt": "^0.1.6", |
| 29 | "angular-material": "1.1.9", | 30 | "angular-material": "1.1.9", |
| 30 | "angular-material-data-table": "^0.10.9", | 31 | "angular-material-data-table": "^0.10.9", |
| 31 | - "angular-material-icons": "^0.7.1", | ||
| 32 | "angular-material-expansion-panel": "^0.7.2", | 32 | "angular-material-expansion-panel": "^0.7.2", |
| 33 | + "angular-material-icons": "^0.7.1", | ||
| 33 | "angular-messages": "1.5.8", | 34 | "angular-messages": "1.5.8", |
| 34 | "angular-route": "1.5.8", | 35 | "angular-route": "1.5.8", |
| 35 | "angular-sanitize": "1.5.8", | 36 | "angular-sanitize": "1.5.8", |
| @@ -66,9 +67,9 @@ | @@ -66,9 +67,9 @@ | ||
| 66 | "md-color-picker": "0.2.6", | 67 | "md-color-picker": "0.2.6", |
| 67 | "mdPickers": "git://github.com/alenaksu/mdPickers.git#0.7.5", | 68 | "mdPickers": "git://github.com/alenaksu/mdPickers.git#0.7.5", |
| 68 | "moment": "^2.15.0", | 69 | "moment": "^2.15.0", |
| 70 | + "ngFlowchart": "git://github.com/thingsboard/ngFlowchart.git#master", | ||
| 69 | "ngclipboard": "^1.1.1", | 71 | "ngclipboard": "^1.1.1", |
| 70 | "ngreact": "^0.3.0", | 72 | "ngreact": "^0.3.0", |
| 71 | - "ngFlowchart": "git://github.com/thingsboard/ngFlowchart.git#master", | ||
| 72 | "objectpath": "^1.2.1", | 73 | "objectpath": "^1.2.1", |
| 73 | "oclazyload": "^1.0.9", | 74 | "oclazyload": "^1.0.9", |
| 74 | "raphael": "^2.2.7", | 75 | "raphael": "^2.2.7", |
| @@ -39,6 +39,7 @@ import uiRouter from 'angular-ui-router'; | @@ -39,6 +39,7 @@ import uiRouter from 'angular-ui-router'; | ||
| 39 | import angularJwt from 'angular-jwt'; | 39 | import angularJwt from 'angular-jwt'; |
| 40 | import 'angular-drag-and-drop-lists'; | 40 | import 'angular-drag-and-drop-lists'; |
| 41 | import mdDataTable from 'angular-material-data-table'; | 41 | import mdDataTable from 'angular-material-data-table'; |
| 42 | +import fixedTableHeader from 'angular-fixed-table-header'; | ||
| 42 | import 'angular-material-expansion-panel'; | 43 | import 'angular-material-expansion-panel'; |
| 43 | import ngTouch from 'angular-touch'; | 44 | import ngTouch from 'angular-touch'; |
| 44 | import 'angular-carousel'; | 45 | import 'angular-carousel'; |
| @@ -114,6 +115,7 @@ angular.module('thingsboard', [ | @@ -114,6 +115,7 @@ angular.module('thingsboard', [ | ||
| 114 | angularJwt, | 115 | angularJwt, |
| 115 | 'dndLists', | 116 | 'dndLists', |
| 116 | mdDataTable, | 117 | mdDataTable, |
| 118 | + fixedTableHeader, | ||
| 117 | 'material.components.expansionPanels', | 119 | 'material.components.expansionPanels', |
| 118 | ngTouch, | 120 | ngTouch, |
| 119 | 'angular-carousel', | 121 | 'angular-carousel', |
| @@ -56,7 +56,7 @@ | @@ -56,7 +56,7 @@ | ||
| 56 | </md-toolbar> | 56 | </md-toolbar> |
| 57 | <md-table-container> | 57 | <md-table-container> |
| 58 | <table md-table> | 58 | <table md-table> |
| 59 | - <thead md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> | 59 | + <thead fix-head md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> |
| 60 | <tr md-row> | 60 | <tr md-row> |
| 61 | <th md-column md-order-by="actionSourceName"><span translate>widget-config.action-source</span></th> | 61 | <th md-column md-order-by="actionSourceName"><span translate>widget-config.action-source</span></th> |
| 62 | <th md-column md-order-by="name"><span translate>widget-config.action-name</span></th> | 62 | <th md-column md-order-by="name"><span translate>widget-config.action-name</span></th> |
| @@ -72,7 +72,7 @@ | @@ -72,7 +72,7 @@ | ||
| 72 | </md-toolbar> | 72 | </md-toolbar> |
| 73 | <md-table-container> | 73 | <md-table-container> |
| 74 | <table md-table> | 74 | <table md-table> |
| 75 | - <thead md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> | 75 | + <thead fix-head md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> |
| 76 | <tr md-row> | 76 | <tr md-row> |
| 77 | <th md-column md-order-by="name"><span translate>dashboard.state-name</span></th> | 77 | <th md-column md-order-by="name"><span translate>dashboard.state-name</span></th> |
| 78 | <th md-column md-order-by="id"><span translate>dashboard.state-id</span></th> | 78 | <th md-column md-order-by="id"><span translate>dashboard.state-id</span></th> |
| @@ -126,7 +126,7 @@ | @@ -126,7 +126,7 @@ | ||
| 126 | </md-toolbar> | 126 | </md-toolbar> |
| 127 | <md-table-container ng-show="mode!='widget'"> | 127 | <md-table-container ng-show="mode!='widget'"> |
| 128 | <table class="tb-attribute-table" md-table md-row-select multiple="" ng-model="selectedAttributes" md-progress="attributesDeferred.promise"> | 128 | <table class="tb-attribute-table" md-table md-row-select multiple="" ng-model="selectedAttributes" md-progress="attributesDeferred.promise"> |
| 129 | - <thead md-head md-order="query.order" md-on-reorder="onReorder"> | 129 | + <thead fix-head md-head md-order="query.order" md-on-reorder="onReorder"> |
| 130 | <tr md-row> | 130 | <tr md-row> |
| 131 | <th md-column md-order-by="lastUpdateTs"><span translate>attribute.last-update-time</span></th> | 131 | <th md-column md-order-by="lastUpdateTs"><span translate>attribute.last-update-time</span></th> |
| 132 | <th md-column md-order-by="key"><span translate>attribute.key</span></th> | 132 | <th md-column md-order-by="key"><span translate>attribute.key</span></th> |
| @@ -90,7 +90,7 @@ | @@ -90,7 +90,7 @@ | ||
| 90 | </md-toolbar> | 90 | </md-toolbar> |
| 91 | <md-table-container> | 91 | <md-table-container> |
| 92 | <table md-table md-row-select multiple="" ng-model="vm.selectedRelations" md-progress="vm.relationsDeferred.promise"> | 92 | <table md-table md-row-select multiple="" ng-model="vm.selectedRelations" md-progress="vm.relationsDeferred.promise"> |
| 93 | - <thead md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> | 93 | + <thead fix-head md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> |
| 94 | <tr md-row> | 94 | <tr md-row> |
| 95 | <th md-column md-order-by="type"><span translate>relation.type</span></th> | 95 | <th md-column md-order-by="type"><span translate>relation.type</span></th> |
| 96 | <th md-column ng-if="vm.direction == vm.types.entitySearchDirection.from" | 96 | <th md-column ng-if="vm.direction == vm.types.entitySearchDirection.from" |
| @@ -111,7 +111,7 @@ | @@ -111,7 +111,7 @@ | ||
| 111 | 111 | ||
| 112 | <md-table-container flex> | 112 | <md-table-container flex> |
| 113 | <table md-table md-row-select multiple="" ng-model="vm.selectedExtensions" md-progress="vm.extensionsDeferred.promise"> | 113 | <table md-table md-row-select multiple="" ng-model="vm.selectedExtensions" md-progress="vm.extensionsDeferred.promise"> |
| 114 | - <thead md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> | 114 | + <thead fix-head md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> |
| 115 | <tr md-row> | 115 | <tr md-row> |
| 116 | <th md-column md-order-by="id"><span translate>extension.id</span></th> | 116 | <th md-column md-order-by="id"><span translate>extension.id</span></th> |
| 117 | <th md-column md-order-by="type"><span translate>extension.type</span></th> | 117 | <th md-column md-order-by="type"><span translate>extension.type</span></th> |
| @@ -60,7 +60,7 @@ | @@ -60,7 +60,7 @@ | ||
| 60 | </md-toolbar> | 60 | </md-toolbar> |
| 61 | <md-table-container flex> | 61 | <md-table-container flex> |
| 62 | <table md-table md-row-select="vm.enableSelection" multiple="" ng-model="vm.selectedAlarms"> | 62 | <table md-table md-row-select="vm.enableSelection" multiple="" ng-model="vm.selectedAlarms"> |
| 63 | - <thead md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> | 63 | + <thead fix-head md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> |
| 64 | <tr md-row> | 64 | <tr md-row> |
| 65 | <th ng-if="key.display" md-column md-order-by="{{ key.name }}" ng-repeat="key in vm.alarmSource.dataKeys"><span>{{ key.title }}</span></th> | 65 | <th ng-if="key.display" md-column md-order-by="{{ key.name }}" ng-repeat="key in vm.alarmSource.dataKeys"><span>{{ key.title }}</span></th> |
| 66 | <th md-column class="tb-action-cell" layout="row" layout-align="end center"> | 66 | <th md-column class="tb-action-cell" layout="row" layout-align="end center"> |
| @@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
| 39 | </md-toolbar> | 39 | </md-toolbar> |
| 40 | <md-table-container flex> | 40 | <md-table-container flex> |
| 41 | <table md-table> | 41 | <table md-table> |
| 42 | - <thead md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> | 42 | + <thead fix-head md-head md-order="vm.query.order" md-on-reorder="vm.onReorder"> |
| 43 | <tr md-row> | 43 | <tr md-row> |
| 44 | <th ng-if="column.display" md-column md-order-by="{{ column.name }}" ng-repeat="column in vm.columns"><span>{{ column.title }}</span></th> | 44 | <th ng-if="column.display" md-column md-order-by="{{ column.name }}" ng-repeat="column in vm.columns"><span>{{ column.title }}</span></th> |
| 45 | <th md-column class="tb-action-cell" layout="row" layout-align="end center"> | 45 | <th md-column class="tb-action-cell" layout="row" layout-align="end center"> |
| @@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
| 43 | <md-tab ng-repeat="source in vm.sources" label="{{ source.datasource.name }}"> | 43 | <md-tab ng-repeat="source in vm.sources" label="{{ source.datasource.name }}"> |
| 44 | <md-table-container class="flex"> | 44 | <md-table-container class="flex"> |
| 45 | <table md-table> | 45 | <table md-table> |
| 46 | - <thead md-head md-order="source.query.order" md-on-reorder="vm.onReorder(source)"> | 46 | + <thead fix-head md-head md-order="source.query.order" md-on-reorder="vm.onReorder(source)"> |
| 47 | <tr md-row> | 47 | <tr md-row> |
| 48 | <th ng-show="vm.showTimestamp" | 48 | <th ng-show="vm.showTimestamp" |
| 49 | md-column md-order-by="0" | 49 | md-column md-order-by="0" |