简柏林 / thingskit · Commits

Commit 795d54b74e88d2fed97c7edd0649992645ce8e96

Authored by Igor Kulikov
1 parent 7d4da490

UI: Control maps labels color.

Inline Side-by-side
Showing 3 changed files with 4 additions and 3 deletions
@@ -200,7 +200,7 @@ export default class TbGoogleMap { @@ -200,7 +200,7 @@ export default class TbGoogleMap {
200 map: this.map, 200 map: this.map,
201 icon: pinImage, 201 icon: pinImage,
202 shadow: pinShadow, 202 shadow: pinShadow,
203 - labelContent: '<b>'+settings.label+'</b>', 203 + labelContent: '<div style="color: '+ settings.labelColor +';"><b>'+settings.label+'</b></div>',
204 labelClass: "tb-labels", 204 labelClass: "tb-labels",
205 labelAnchor: new google.maps.Point(50, height + 20) 205 labelAnchor: new google.maps.Point(50, height + 20)
206 }); 206 });
@@ -99,6 +99,7 @@ export default class TbMapWidget { @@ -99,6 +99,7 @@ export default class TbMapWidget {
99 lngKeyName: "lng", 99 lngKeyName: "lng",
100 showLabel: true, 100 showLabel: true,
101 label: "", 101 label: "",
  102 + labelColor: ctx.widgetConfig.color || '#000000',
102 color: "#FE7569", 103 color: "#FE7569",
103 useColorFunction: false, 104 useColorFunction: false,
104 colorFunction: null, 105 colorFunction: null,
@@ -78,7 +78,7 @@ export default class TbOpenStreetMap { @@ -78,7 +78,7 @@ export default class TbOpenStreetMap {
78 marker.setIcon(icon); 78 marker.setIcon(icon);
79 if (settings.showLabel) { 79 if (settings.showLabel) {
80 marker.unbindTooltip(); 80 marker.unbindTooltip();
81 - marker.bindTooltip('<b>' + settings.label + '</b>', 81 + marker.bindTooltip('<div style="color: '+ settings.labelColor +';"><b>'+settings.label+'</b></div>',
82 { className: 'tb-marker-label', permanent: true, direction: 'top', offset: [0, -height + 10] }); 82 { className: 'tb-marker-label', permanent: true, direction: 'top', offset: [0, -height + 10] });
83 } 83 }
84 } 84 }
@@ -101,7 +101,7 @@ export default class TbOpenStreetMap { @@ -101,7 +101,7 @@ export default class TbOpenStreetMap {
101 var marker = L.marker(location, {icon: icon}).addTo(this.map); 101 var marker = L.marker(location, {icon: icon}).addTo(this.map);
102 102
103 if (settings.showLabel) { 103 if (settings.showLabel) {
104 - marker.bindTooltip('<b>' + settings.label + '</b>', 104 + marker.bindTooltip('<div style="color: '+ settings.labelColor +';"><b>'+settings.label+'</b></div>',
105 { className: 'tb-marker-label', permanent: true, direction: 'top', offset: [0, -height + 10] }); 105 { className: 'tb-marker-label', permanent: true, direction: 'top', offset: [0, -height + 10] });
106 } 106 }
107 107