egovamap 0.18.1 → 0.18.2

package/egovamap/egovaBI.js

@@ -836,11 +836,26 @@ var egovaBI = function(globeMap, gisMap, mapType){
             // 转换一下
             var geometries = [];
             var extraGeometries = [];
+            var specialAreaS=options.specialAreaS;//玲珑平台分类设色
             for (var i = 0; i < realData.length; i++) {
                 var feature = realData[i];
                 var geom = feature.geometry;
                 geom.attributes = feature.attributes; // attributes会导致id没用，使用自带的id
-                geometries.push(geom);
+                var hasPush=false;
+                if(specialAreaS&&specialAreaS.length>0){
+                 for (var j = 0; j < specialAreaS.length; j++) {
+                   var specialArea=specialAreaS[j];
+                   if(!specialArea.geometries){
+                     specialArea.geometries=[];
+                   }
+                   let filterResult=new Function(`return ${specialArea.statusControl.compiled}`)().call(null,feature.attributes);
+                   if(filterResult==true){
+                     specialArea.geometries.push(geom);
+                     hasPush=true;
+                   }
+                 }
+                }
+                !hasPush&&(geometries.push(geom));
             }
             if (options.specialArea && options.selectedSetting.selected.length) {
                 var extraIds = options.selectedSetting.selected.map(s => s.selectID);
@@ -896,6 +911,35 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     options.eventSetting.clickCallback
                 );
             }
+            if(specialAreaS&&specialAreaS.length>0){
+                for (var j = 0; j < specialAreaS.length; j++) {
+                  var specialArea=specialAreaS[j];
+                  if(specialArea.geometries.length>0){
+                    gisMap.locateFeatureByCoords(specialArea.geometries, 'polygon',
+                  options.layerName, // id，如果已经有attributes就没用了
+                  specialArea.style, // style
+                  options.highlightStyle, // highlightStyle
+                  options.commonSetting.zoom, // zoom
+                  options.keyFieldName,
+                  specialArea.specialAreaStyle.textLabelShowEnabled&&specialArea.specialAreaStyle.labelFieldName, // keyField, labelField
+                  specialArea.labelStyle, // labelStyle
+                  false,// randomColor
+                  false, // renderCanvas
+                  true, // singleSelect
+                  {
+                      minZoom: options.visiblitySetting.beginLevel,
+                      maxZoom: options.visiblitySetting.endLevel,
+                      layerId: options.layerName,
+                      comCallbak: callback
+                      // hLabelStyle: options.hLabelStyle, // 选中文字时效果，没用
+                  },
+                  options.layerName, // layerTag
+                  options.eventSetting.clickCallback
+              );
+                  }
+                  
+                }
+              }
         }
 
         if (!data) {

package/package.json

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