From 44d70b9fdfe52f198b1a5ae1f501589b7cbcaf90 Mon Sep 17 00:00:00 2001 From: Maksym Dudnik Date: Wed, 27 Feb 2019 16:26:10 +0200 Subject: [PATCH 1/2] Google and tencent polygon color function fixed --- ui/src/app/widget/lib/google-map.js | 4 ++-- ui/src/app/widget/lib/tencent-map.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/src/app/widget/lib/google-map.js b/ui/src/app/widget/lib/google-map.js index ba1ae1f65e..17e040be78 100644 --- 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*/ diff --git a/ui/src/app/widget/lib/tencent-map.js b/ui/src/app/widget/lib/tencent-map.js index 6ce387e46a..b42c17fd44 100644 --- 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*/ From 501179e22f289429d5aa10cd48580c12b99beec9 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 27 Feb 2019 17:02:28 +0200 Subject: [PATCH 2/2] Update package.lock --- msa/js-executor/package-lock.json | 2 +- msa/web-ui/package-lock.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/msa/js-executor/package-lock.json b/msa/js-executor/package-lock.json index 1af16309a7..a01d4a9053 100644 --- 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": { diff --git a/msa/web-ui/package-lock.json b/msa/web-ui/package-lock.json index c50ee7d073..16d10f5961 100644 --- 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": {