Skip to content

Commit 6ad6b96

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
尝试修复iclient9 sonar上的严重问题。review by zhurch
1 parent 10aed91 commit 6ad6b96

File tree

3 files changed

+36
-6
lines changed

3 files changed

+36
-6
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36873,7 +36873,12 @@ SuperMap.CartoCSS = SuperMap.Class({
3687336873
if (prop !== 'zoom' && prop !== 'frames' && prop !== "attachment" && prop != "elements") {
3687436874
//对layer-index作特殊处理以实现图层的控制
3687536875
if (prop === "layer-index") {
36876-
var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");
36876+
/*var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");*/
36877+
var getLayerIndex = function(attributes,zoom){
36878+
var _value = null;
36879+
shader[prop].join('\n');
36880+
return _value;
36881+
};
3687736882
var layerIndex = getLayerIndex();
3687836883
Object.defineProperty(shaderArray, "layerIndex", {
3687936884
configurable: true,
@@ -36894,7 +36899,12 @@ SuperMap.CartoCSS = SuperMap.Class({
3689436899
var featureFilterStart = index + myKeyword.length;
3689536900
var featureFilterEnd = body.indexOf(")", featureFilterStart + 1);
3689636901
var featureFilterStr = "featureId&&(featureId" + body.substring(featureFilterStart, featureFilterEnd) + ")";
36897-
var featureFilter = Function("featureId", "if(" + featureFilterStr + "){return true;}return false;");
36902+
/*var featureFilter = Function("featureId", "if(" + featureFilterStr + "){return true;}return false;");*/
36903+
var featureFilter = function(featureId){
36904+
if(featureFilterStr){
36905+
return true;}
36906+
return false;
36907+
}
3689836908
Object.defineProperty(shaderArray, "featureFilter", {
3689936909
configurable: true,
3690036910
enumerable: false,

‎dist/iclient9-openlayers.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28007,7 +28007,12 @@ SuperMap.CartoCSS = SuperMap.Class({
2800728007
if (prop !== 'zoom' && prop !== 'frames' && prop !== "attachment" && prop != "elements") {
2800828008
//对layer-index作特殊处理以实现图层的控制
2800928009
if (prop === "layer-index") {
28010-
var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");
28010+
/*var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");*/
28011+
var getLayerIndex = function(attributes,zoom){
28012+
var _value = null;
28013+
shader[prop].join('\n');
28014+
return _value;
28015+
};
2801128016
var layerIndex = getLayerIndex();
2801228017
Object.defineProperty(shaderArray, "layerIndex", {
2801328018
configurable: true,
@@ -28028,7 +28033,12 @@ SuperMap.CartoCSS = SuperMap.Class({
2802828033
var featureFilterStart = index + myKeyword.length;
2802928034
var featureFilterEnd = body.indexOf(")", featureFilterStart + 1);
2803028035
var featureFilterStr = "featureId&&(featureId" + body.substring(featureFilterStart, featureFilterEnd) + ")";
28031-
var featureFilter = Function("featureId", "if(" + featureFilterStr + "){return true;}return false;");
28036+
/*var featureFilter = Function("featureId", "if(" + featureFilterStr + "){return true;}return false;");*/
28037+
var featureFilter = function(featureId){
28038+
if(featureFilterStr){
28039+
return true;}
28040+
return false;
28041+
}
2803228042
Object.defineProperty(shaderArray, "featureFilter", {
2803328043
configurable: true,
2803428044
enumerable: false,

‎src/common/style/CartoCSS.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,12 @@ SuperMap.CartoCSS = SuperMap.Class({
943943
if (prop !== 'zoom' && prop !== 'frames' && prop !== "attachment" && prop != "elements") {
944944
//对layer-index作特殊处理以实现图层的控制
945945
if (prop === "layer-index") {
946-
var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");
946+
/*var getLayerIndex = Function("attributes", "zoom", "var _value = null;" + shader[prop].join('\n') + "; return _value; ");*/
947+
var getLayerIndex = function(attributes,zoom){
948+
var _value = null;
949+
shader[prop].join('\n');
950+
return _value;
951+
};
947952
var layerIndex = getLayerIndex();
948953
Object.defineProperty(shaderArray, "layerIndex", {
949954
configurable: true,
@@ -964,7 +969,12 @@ SuperMap.CartoCSS = SuperMap.Class({
964969
var featureFilterStart = index + myKeyword.length;
965970
var featureFilterEnd = body.indexOf(")", featureFilterStart + 1);
966971
var featureFilterStr = "featureId&&(featureId" + body.substring(featureFilterStart, featureFilterEnd) + ")";
967-
var featureFilter = Function("featureId", "if(" + featureFilterStr + "){return true;}return false;");
972+
/*var featureFilter = Function("featureId", "if(" + featureFilterStr + "){return true;}return false;");*/
973+
var featureFilter = function(featureId){
974+
if(featureFilterStr){
975+
return true;}
976+
return false;
977+
}
968978
Object.defineProperty(shaderArray, "featureFilter", {
969979
configurable: true,
970980
enumerable: false,

0 commit comments

Comments
 (0)