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

UI: Control maps labels color.

Browse Source
This commit is contained in:
Igor Kulikov 2017-03-16 11:28:00 +02:00
parent 7d4da490fe
commit 795d54b74e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/app/widget/lib/google-map.js
View File

@ -200,7 +200,7 @@ export default class TbGoogleMap {
map: this.map, map: this.map,
icon: pinImage, icon: pinImage,
shadow: pinShadow, shadow: pinShadow,
labelContent: '<b>'+settings.label+'</b>', labelContent: '<div style="color: '+ settings.labelColor +';"><b>'+settings.label+'</b></div>',
labelClass: "tb-labels", labelClass: "tb-labels",
labelAnchor: new google.maps.Point(50, height + 20) labelAnchor: new google.maps.Point(50, height + 20)
}); });

1
ui/src/app/widget/lib/map-widget.js
View File

@ -99,6 +99,7 @@ export default class TbMapWidget {
lngKeyName: "lng", lngKeyName: "lng",
showLabel: true, showLabel: true,
label: "", label: "",
labelColor: ctx.widgetConfig.color || '#000000',
color: "#FE7569", color: "#FE7569",
useColorFunction: false, useColorFunction: false,
colorFunction: null, colorFunction: null,

4
ui/src/app/widget/lib/openstreet-map.js
View File

@ -78,7 +78,7 @@ export default class TbOpenStreetMap {
marker.setIcon(icon); marker.setIcon(icon);
if (settings.showLabel) { if (settings.showLabel) {
marker.unbindTooltip(); marker.unbindTooltip();
marker.bindTooltip('<b>' + settings.label + '</b>', marker.bindTooltip('<div style="color: '+ settings.labelColor +';"><b>'+settings.label+'</b></div>',
{ className: 'tb-marker-label', permanent: true, direction: 'top', offset: [0, -height + 10] }); { className: 'tb-marker-label', permanent: true, direction: 'top', offset: [0, -height + 10] });
} }
} }
@ -101,7 +101,7 @@ export default class TbOpenStreetMap {
var marker = L.marker(location, {icon: icon}).addTo(this.map); var marker = L.marker(location, {icon: icon}).addTo(this.map);
if (settings.showLabel) { if (settings.showLabel) {
marker.bindTooltip('<b>' + settings.label + '</b>', marker.bindTooltip('<div style="color: '+ settings.labelColor +';"><b>'+settings.label+'</b></div>',
{ className: 'tb-marker-label', permanent: true, direction: 'top', offset: [0, -height + 10] }); { className: 'tb-marker-label', permanent: true, direction: 'top', offset: [0, -height + 10] });
} }