修复this.statement传相同条件无效的问题

o2web/source/o2_core/o2/xScript/CMSEnvironment.js

@@ -1204,9 +1204,19 @@ MWF.xScript.CMSEnvironment = function(ev){
         },
         parseFilter : function( filter, parameter ){
             if( typeOf(filter) !== "array" )return [];
+            if( !parameter )parameter = {};
             var filterList = [];
             ( filter || [] ).each( function (d) {
-                var parameterName = d.path.replace(/\./g, "_");
+                //var parameterName = d.path.replace(/\./g, "_");
+                var pName = d.path.replace(/\./g, "_");
+
+                var parameterName = pName;
+                var suffix = 1;
+                while( parameter[parameterName] ){
+                    parameterName = pName + "_" + suffix;
+                    suffix++;
+                }
+
                 var value = d.value;
                 if( d.comparison === "like" || d.comparison === "notLike" ){
                     if( value.substr(0, 1) !== "%" )value = "%"+value;
@@ -1219,6 +1229,8 @@ MWF.xScript.CMSEnvironment = function(ev){
                         value = "{d '"+value+"'}"
                     }else if( d.formatType === "timeValue" ){
                         value = "{t '"+value+"'}"
+                    } else if (d.formatType === "numberValue"){
+                        value = parseFloat(value);
                     }
                     parameter[ parameterName ] = value;
                 }

o2web/source/o2_core/o2/xScript/Environment.js

@@ -1925,9 +1925,19 @@ MWF.xScript.Environment = function(ev){
         },
         parseFilter : function( filter, parameter ){
             if( typeOf(filter) !== "array" )return [];
+            if( !parameter )parameter = {};
             var filterList = [];
             ( filter || [] ).each( function (d) {
-                var parameterName = d.path.replace(/\./g, "_");
+                //var parameterName = d.path.replace(/\./g, "_");
+                var pName = d.path.replace(/\./g, "_");
+
+                var parameterName = pName;
+                var suffix = 1;
+                while( parameter[parameterName] ){
+                    parameterName = pName + "_" + suffix;
+                    suffix++;
+                }
+
                 var value = d.value;
                 if( d.comparison === "like" || d.comparison === "notLike" ){
                     if( value.substr(0, 1) !== "%" )value = "%"+value;
@@ -1940,6 +1950,8 @@ MWF.xScript.Environment = function(ev){
                         value = "{d '"+value+"'}"
                     }else if( d.formatType === "timeValue" ){
                         value = "{t '"+value+"'}"
+                    } else if (d.formatType === "numberValue"){
+                        value = parseFloat(value);
                     }
                     parameter[ parameterName ] = value;
                 }

o2web/source/o2_core/o2/xScript/PageEnvironment.js

@@ -1305,9 +1305,18 @@ if (!MWF.xScript || !MWF.xScript.PageEnvironment) {
             },
             parseFilter: function (filter, parameter) {
                 if (typeOf(filter) !== "array") return [];
+            if( !parameter )parameter = {};
                 var filterList = [];
                 (filter || []).each(function (d) {
-                    var parameterName = d.path.replace(/\./g, "_");
+                    //var parameterName = d.path.replace(/\./g, "_");
+                    var pName = d.path.replace(/\./g, "_");
+
+                    var parameterName = pName;
+                    var suffix = 1;
+                    while( parameter[parameterName] ){
+                        parameterName = pName + "_" + suffix;
+                        suffix++;
+                    }
                     var value = d.value;
                     if (d.comparison === "like" || d.comparison === "notLike") {
                         if (value.substr(0, 1) !== "%") value = "%" + value;
@@ -1320,6 +1329,8 @@ if (!MWF.xScript || !MWF.xScript.PageEnvironment) {
                             value = "{d '" + value + "'}"
                         } else if (d.formatType === "timeValue") {
                             value = "{t '" + value + "'}"
+                        } else if (d.formatType === "numberValue"){
+                            value = parseFloat(value);
                         }
                         parameter[parameterName] = value;
                     }

o2web/source/o2_core/o2/xScript/ViewEnvironment.js

@@ -3313,9 +3313,18 @@ MWF.xScript.ViewEnvironment = function (ev) {
         },
         parseFilter : function( filter, parameter ){
             if( typeOf(filter) !== "array" )return [];
+            if( !parameter )parameter = {};
             var filterList = [];
             ( filter || [] ).each( function (d) {
-                var parameterName = d.path.replace(/\./g, "_");
+                //var parameterName = d.path.replace(/\./g, "_");
+                var pName = d.path.replace(/\./g, "_");
+
+                var parameterName = pName;
+                var suffix = 1;
+                while( parameter[parameterName] ){
+                    parameterName = pName + "_" + suffix;
+                    suffix++;
+                }
                 var value = d.value;
                 if( d.comparison === "like" || d.comparison === "notLike" ){
                     if( value.substr(0, 1) !== "%" )value = "%"+value;
@@ -3328,6 +3337,8 @@ MWF.xScript.ViewEnvironment = function (ev) {
                         value = "{d '"+value+"'}"
                     }else if( d.formatType === "timeValue" ){
                         value = "{t '"+value+"'}"
+                    } else if (d.formatType === "numberValue"){
+                        value = parseFloat(value);
                     }
                     parameter[ parameterName ] = value;
                 }