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

2019-03-04 11:48:44 +02:00 · 2019-03-04 11:48:44 +02:00 · e559521688
commit e559521688
parent 66a453749e 17067442ce
4 changed files with 5 additions and 5 deletions
--- a/msa/js-executor/package-lock.json
+++ b/msa/js-executor/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "thingsboard-js-executor",
-  "version": "2.3.0",
+  "version": "2.3.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/msa/web-ui/package-lock.json
+++ b/msa/web-ui/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "thingsboard-web-ui",
-  "version": "2.3.0",
+  "version": "2.3.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/ui/src/app/widget/lib/google-map.js
+++ b/ui/src/app/widget/lib/google-map.js
@ -367,8 +367,8 @@ export default class TbGoogleMap {
 			strokeColor: color,
 			fillColor: color,
 			strokeWeight: settings.polygonStrokeWeight
-		}
-
+		};
+		polygon.setOptions(options);
 	}
 	/* eslint-disable no-undef ,no-unused-vars*/

--- a/ui/src/app/widget/lib/tencent-map.js
+++ b/ui/src/app/widget/lib/tencent-map.js
@ -379,7 +379,7 @@ export default class TbTencentMap {
 			fillColor: color,
 			strokeWeight: settings.polygonStrokeWeight
 		}
-
+		polygon.setOptions(options);
 	}
 	/* eslint-disable no-undef ,no-unused-vars*/