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

Merge branch 'master' of github.com:thingsboard/thingsboard

Browse Source
This commit is contained in:
nordmif 2019-03-04 11:48:44 +02:00
commit e559521688
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
msa/js-executor/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "thingsboard-js-executor", "name": "thingsboard-js-executor",
"version": "2.3.0", "version": "2.3.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
msa/web-ui/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "thingsboard-web-ui", "name": "thingsboard-web-ui",
"version": "2.3.0", "version": "2.3.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

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

@ -367,8 +367,8 @@ export default class TbGoogleMap {
strokeColor: color, strokeColor: color,
fillColor: color, fillColor: color,
strokeWeight: settings.polygonStrokeWeight strokeWeight: settings.polygonStrokeWeight
} };
polygon.setOptions(options);
} }
/* eslint-disable no-undef ,no-unused-vars*/ /* eslint-disable no-undef ,no-unused-vars*/

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

@ -379,7 +379,7 @@ export default class TbTencentMap {
fillColor: color, fillColor: color,
strokeWeight: settings.polygonStrokeWeight strokeWeight: settings.polygonStrokeWeight
} }
polygon.setOptions(options);
} }
/* eslint-disable no-undef ,no-unused-vars*/ /* eslint-disable no-undef ,no-unused-vars*/