egovamap 0.17.5 → 0.17.8

package/egovamap/egovaBI.js

@@ -57,7 +57,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
     }
 
     function rgbToRgbArray(color) {
-        if (!color || (typeof color == 'string'&&color.indexOf('rgb') == -1)) return color;
+        if (!color || (typeof color == 'string'&&color.indexOf('rgb') == -1) || Object.prototype.toString.call(color) === '[object Array]') return color;
 	
         var r, g, b, a;
         var rgbaAttr = color.match(/[\d.]+/g);
@@ -109,6 +109,16 @@ var egovaBI = function(globeMap, gisMap, mapType){
         let hasHover = null;
         let callback = null;
         datalist = positions.map(function(p) {
+            if(options.textStyle.label) {
+                for (const key in p) {
+                    if(key !== "id" && key !== "x" && key !== "y" && key !== "objectID"){
+                        if(!p.label) p.label = [];
+                        var labelItem = {};
+                        labelItem[key] = p[key];
+                        p.label.push(labelItem);
+                    }
+                }
+            }
             p.minZoom = options.common.beginLevel;
             p.maxZoom = options.common.endLevel;
             p.symbolType = -1;

package/egovamap/egovagisviewer.js

@@ -1348,6 +1348,12 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         params.push(cb);
         that.callMap.apply(that, params);
     }
+	
+	that.stopEdit = function() {
+        if (scene == null)
+            return;
+        that.callMap('stopEdit');
+    };
 
     /* 圆饼图  */
     that.addCircleChart = function (name, data, color, param, id, minZoom, maxZoom, clickCallback) {

package/egovamap/egovamap.js

@@ -2145,6 +2145,14 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 			gisMap.editGraphic.apply(this, arguments);
 		}
 	}
+	
+	that.stopEdit = function() {
+        if (scene == null)
+            return;
+        if (gisMap != null) {
+            gisMap.stopEdit.apply(this, arguments);
+        }
+    };
 
 	/* 区域饼图  */
 	that.addCircleChart = function (name, data, color, param, minZoom, maxZoom, clickCallback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egovamap",
-  "version": "0.17.5",
+  "version": "0.17.8",
   "description": "eUrbanGIS SDK",
   "main": "index.js",
   "scripts": {