Browse Source
Merge pull request #514 from jktu2870/improvement/timeseriesTable/search
Additional improvements for widget "Timeseries - table"
pull/528/head
Igor Kulikov
9 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
14 additions and
9 deletions
-
ui/src/app/locale/locale.constant.js
-
ui/src/app/widget/lib/timeseries-table-widget.tpl.html
|
|
|
@ -1214,6 +1214,7 @@ export default angular.module('thingsboard.locale', []) |
|
|
|
"remove-widget-text": "After the confirmation the widget and all related data will become unrecoverable.", |
|
|
|
"timeseries": "Time series", |
|
|
|
"search-data": "Search data", |
|
|
|
"no-data-found": "No data found", |
|
|
|
"latest-values": "Latest values", |
|
|
|
"rpc": "Control widget", |
|
|
|
"alarm": "Alarm widget", |
|
|
|
|
|
|
|
@ -41,7 +41,7 @@ |
|
|
|
<md-tabs flex md-selected="vm.sourceIndex" ng-class="{'tb-headless': vm.sources.length === 1}" |
|
|
|
id="tabs" md-border-bottom flex> |
|
|
|
<md-tab ng-repeat="source in vm.sources" label="{{ source.datasource.name }}"> |
|
|
|
<md-table-container> |
|
|
|
<md-table-container class="tb-absolute-fill layout-column"> |
|
|
|
<table md-table> |
|
|
|
<thead md-head md-order="source.query.order" md-on-reorder="vm.onReorder(source)"> |
|
|
|
<tr md-row> |
|
|
|
@ -70,16 +70,20 @@ |
|
|
|
</tr> |
|
|
|
</tbody> |
|
|
|
</table> |
|
|
|
<md-divider></md-divider> |
|
|
|
<span ng-show="!vm.sources[vm.sourceIndex].data.length" |
|
|
|
layout-align="center center" |
|
|
|
class="no-data-found" translate>widget.no-data-found</span> |
|
|
|
</md-table-container> |
|
|
|
<md-table-pagination ng-if="vm.displayPagination" |
|
|
|
md-limit="source.query.limit" |
|
|
|
md-limit-options="vm.limitOptions" |
|
|
|
md-page="source.query.page" |
|
|
|
md-total="{{source.data.length}}" |
|
|
|
md-on-paginate="vm.onPaginate(source)" |
|
|
|
md-page-select> |
|
|
|
</md-table-pagination> |
|
|
|
</md-tab> |
|
|
|
</md-tabs> |
|
|
|
<md-table-pagination ng-if="vm.displayPagination" |
|
|
|
md-limit="vm.sources[vm.sourceIndex].query.limit" |
|
|
|
md-limit-options="vm.limitOptions" |
|
|
|
md-page="vm.sources[vm.sourceIndex].query.page" |
|
|
|
md-total="{{vm.sources[vm.sourceIndex].data.length}}" |
|
|
|
md-on-paginate="vm.onPaginate(vm.sources[vm.sourceIndex])" |
|
|
|
md-page-select> |
|
|
|
</md-table-pagination> |
|
|
|
</div> |
|
|
|
</div> |
