diff --git a/src/main/webapp/static/global/scripts/ipRegion.js b/src/main/webapp/static/global/scripts/ipRegion.js index 9d8bc226a..62b44a4f2 100644 --- a/src/main/webapp/static/global/scripts/ipRegion.js +++ b/src/main/webapp/static/global/scripts/ipRegion.js @@ -71,15 +71,17 @@ var processPattern=function(selector,pattern){ * ip默认选项处理 */ var initCommIpVal=function(){ - var action,regionCode,serviceType,ipPortShow,ipType, + var action,regionCode,ipPortShow,ipType,serviceId, srcIpPattern,destIpPattern,srcPortPattern,destPortPattern, direction,protocol,regionType; if($("input[name$='action']:checked").length>0){ regionCode=$("input[name$='action']:checked").attr("regionCode"); action=$("input[name$='action']:checked").val(); + serviceId=$("input[name$='action']:checked").attr("serviceId"); }else{ regionCode=$("input[name$='action']").attr("regionCode"); action=$("input[name$='action']").val(); + serviceId=$("input[name$='action']").attr("serviceId"); } if(regionCode){ if(regionCode.indexOf(",")==-1){ @@ -102,6 +104,11 @@ var initCommIpVal=function(){ } } if(regionCode){//IP域大于1个,根据action获取ip属性 + + if($("input[name$='cfgRegionCode'][value='"+regionCode+"']")&&$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("regionType")==1){ + }else if(serviceId==149||serviceId==37){//ASN比较特殊,action与ip的相同但是service id不同,这里调用regionCode=5的话会导致获取不到正确的属性 + regionCode=$("input[name$='action'][value='"+action+"'][serviceId!='"+serviceId+"']").attr("regionCode"); + } ipPortShow=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipPortShow"), ipType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipType"), srcIpPattern=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("srcIpPattern"), @@ -230,7 +237,7 @@ var changeIPVal=function(obj){ } if(regionCode){ if(regionCode.indexOf(",")==-1){ - $("#cfgRegionCode"+regionCode).attr("name","cfgRegionCode"); + $("#cfgRegionCode"+regionCode).attr("name","cfgRegionCode"); $("#cfgType"+regionCode).attr("name","cfgType"); }else{ var _region=''; @@ -327,7 +334,7 @@ var changeIPVal=function(obj){ o.find("select[name$='ipType']").selectpicker("refresh"); } } - + } //源ip格式处理 changePattern(o,"srcIpPattern",srcIpPattern);