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

Fix conflicts

Browse Source
This commit is contained in:
Igor Kulikov 2019-08-16 12:23:39 +03:00
commit cae12002c8
10 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/src/app/components/dashboard.directive.js
View File

@ -190,6 +190,7 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, $
vm.widgetTitle = widgetTitle;
vm.widgetTitleIcon = widgetTitleIcon;
vm.widgetTitleIconStyle = widgetTitleIconStyle;
vm.widgetTitleTooltip = widgetTitleTooltip;
vm.customWidgetHeaderActions = customWidgetHeaderActions;
vm.widgetActions = widgetActions;
vm.dropWidgetShadow = dropWidgetShadow;
@ -964,6 +965,16 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, $
return style;
}
function widgetTitleTooltip(widget) {
var ctx = widgetContext(widget);
if (ctx && ctx.widgetTitleTooltip
&& ctx.widgetTitleTooltip.length) {
return ctx.widgetTitleTooltip;
} else {
return widget.config.titleTooltip;
}
}
function customWidgetHeaderActions(widget) {
var ctx = widgetContext(widget);
if (ctx && ctx.customHeaderActions && ctx.customHeaderActions.length) {

3
ui/src/app/components/dashboard.tpl.html
View File

@ -52,6 +52,9 @@
{{vm.widgetTitleIcon(widget)}}
</md-icon>
{{vm.widgetTitle(widget)}}
<md-tooltip class="tb-tooltip-multiline" ng-if="vm.widgetTitleTooltip(widget)" md-direction="{{vm.isWidgetExpanded ? 'bottom' : 'top'}}">
<span ng-bind-html="vm.widgetTitleTooltip(widget)"></span>
</md-tooltip>
</span>
<tb-timewindow aggregation="{{vm.hasAggregation(widget)}}" ng-if="vm.hasTimewindow(widget)" ng-model="widget.config.timewindow"></tb-timewindow>
</div>

4
ui/src/app/components/widget/widget-config.directive.js
View File

@ -113,6 +113,7 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout
scope.titleIcon = angular.isDefined(config.titleIcon) ? config.titleIcon : '';
scope.iconColor = angular.isDefined(config.iconColor) ? config.iconColor : 'rgba(0, 0, 0, 0.87)';
scope.iconSize = angular.isDefined(config.iconSize) ? config.iconSize : '24px';
scope.titleTooltip = angular.isDefined(config.titleTooltip) ? config.titleTooltip : '';
scope.showTitle = config.showTitle;
scope.dropShadow = angular.isDefined(config.dropShadow) ? config.dropShadow : true;
scope.enableFullscreen = angular.isDefined(config.enableFullscreen) ? config.enableFullscreen : true;
@ -240,7 +241,7 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout
}
};
scope.$watch('title + showTitleIcon + titleIcon + iconColor + iconSize + showTitle + dropShadow + enableFullscreen + backgroundColor + ' +
scope.$watch('title + showTitleIcon + titleIcon + iconColor + iconSize + titleTooltip + showTitle + dropShadow + enableFullscreen + backgroundColor + ' +
'color + padding + margin + widgetStyle + titleStyle + mobileOrder + mobileHeight + units + decimals + useDashboardTimewindow + ' +
'displayTimewindow + alarmSearchStatus + alarmsPollingInterval + showLegend', function () {
if (ngModelCtrl.$viewValue) {
@ -252,6 +253,7 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout
config.titleIcon = scope.titleIcon;
config.iconColor = scope.iconColor;
config.iconSize = scope.iconSize;
config.titleTooltip = scope.titleTooltip;
config.showTitle = scope.showTitle;
config.dropShadow = scope.dropShadow;
config.enableFullscreen = scope.enableFullscreen;

4
ui/src/app/components/widget/widget-config.tpl.html
View File

@ -215,6 +215,10 @@
<label translate>widget-config.icon-size</label>
<input ng-model="iconSize">
</md-input-container>
<md-input-container flex class="md-block">
<label translate>widget-config.title-tooltip</label>
<input name="titleTooltip" ng-model="titleTooltip">
</md-input-container>
</div>
<div layout='column' layout-align="center" layout-gt-sm='row' layout-align-gt-sm="start center">
<div layout="row" layout-padding>

1
ui/src/app/locale/locale.constant-de_DE.json
View File

@ -1498,6 +1498,7 @@
"settings": "Einstellungen",
"advanced": "Erweitert ",
"title": "Titel",
"title-tooltip": "Titel Tooltip",
"general-settings": "Allgemeine Einstellungen",
"display-title": "Titel anzeigen",
"drop-shadow": "Schlagschatten",

1
ui/src/app/locale/locale.constant-en_US.json
View File

@ -1569,6 +1569,7 @@
"settings": "Settings",
"advanced": "Advanced",
"title": "Title",
"title-tooltip": "Title Tooltip",
"general-settings": "General settings",
"display-title": "Display title",
"drop-shadow": "Drop shadow",

1
ui/src/app/locale/locale.constant-es_ES.json
View File

@ -1568,6 +1568,7 @@
"settings": "Configuración",
"advanced": "Avanzado",
"title": "Título",
"title-tooltip": "Tooltip Título",
"general-settings": "Configuración general",
"display-title": "Mostrar título",
"drop-shadow": "Colocar sombra",

1
ui/src/app/locale/locale.constant-fr_FR.json
View File

@ -1429,6 +1429,7 @@
"timewindow": "Fenêtre de temps",
"title": "Titre",
"title-style": "Style de titre",
"title-tooltip": "Tooltip de titre",
"units": "Symbole spécial à afficher à côté de la valeur",
"use-dashboard-timewindow": "Utiliser la fenêtre de temps du tableau de bord",
"widget-style": "Style du widget",

1
ui/src/app/locale/locale.constant-it_IT.json
View File

@ -1503,6 +1503,7 @@
"settings": "Impostazioni",
"advanced": "Avanzate",
"title": "Titolo",
"title-tooltip": "Tooltip titolo",
"general-settings": "Impostazioni generali",
"display-title": "Mostra titolo",
"drop-shadow": "Drop shadow",

9
ui/src/scss/main.scss
View File

@ -483,6 +483,15 @@ pre.tb-highlight {
@include line-clamp(2, 1.1);
}
.tb-tooltip-multiline {
max-width: 400px;
height: auto !important;
padding-top: 6px;
padding-bottom: 6px;
line-height: 1.5;
white-space: normal !important;
}
/***********************
* Flow
***********************/