gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复packet ip address asn切换到ip配置时，没有正确获取到配置属性的bug

Browse Source
This commit is contained in:
wangxin
2019-05-28 17:00:02 +08:00
committed by duandongmei
parent df9665376f
commit e8e948ce7d
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/webapp/static/global/scripts/ipRegion.js
View File

@@ -71,15 +71,17 @@ var processPattern=function(selector,pattern){
* ip默认选项处理 * ip默认选项处理
*/ */
var initCommIpVal=function(){ var initCommIpVal=function(){
var action,regionCode,serviceType,ipPortShow,ipType, var action,regionCode,ipPortShow,ipType,serviceId,
srcIpPattern,destIpPattern,srcPortPattern,destPortPattern, srcIpPattern,destIpPattern,srcPortPattern,destPortPattern,
direction,protocol,regionType; direction,protocol,regionType;
if($("input[name$='action']:checked").length>0){ if($("input[name$='action']:checked").length>0){
regionCode=$("input[name$='action']:checked").attr("regionCode"); regionCode=$("input[name$='action']:checked").attr("regionCode");
action=$("input[name$='action']:checked").val(); action=$("input[name$='action']:checked").val();
serviceId=$("input[name$='action']:checked").attr("serviceId");
}else{ }else{
regionCode=$("input[name$='action']").attr("regionCode"); regionCode=$("input[name$='action']").attr("regionCode");
action=$("input[name$='action']").val(); action=$("input[name$='action']").val();
serviceId=$("input[name$='action']").attr("serviceId");
} }
if(regionCode){ if(regionCode){
if(regionCode.indexOf(",")==-1){ if(regionCode.indexOf(",")==-1){
@@ -102,6 +104,11 @@ var initCommIpVal=function(){
} }
} }
if(regionCode){//IP域大于1个，根据action获取ip属性 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"), ipPortShow=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipPortShow"),
ipType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipType"), ipType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipType"),
srcIpPattern=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("srcIpPattern"), srcIpPattern=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("srcIpPattern"),
@@ -230,7 +237,7 @@ var changeIPVal=function(obj){
} }
if(regionCode){ if(regionCode){
if(regionCode.indexOf(",")==-1){ if(regionCode.indexOf(",")==-1){
$("#cfgRegionCode"+regionCode).attr("name","cfgRegionCode"); $("#cfgRegionCode"+regionCode).attr("name","cfgRegionCode");
$("#cfgType"+regionCode).attr("name","cfgType"); $("#cfgType"+regionCode).attr("name","cfgType");
}else{ }else{
var _region=''; var _region='';
@@ -327,7 +334,7 @@ var changeIPVal=function(obj){
o.find("select[name$='ipType']").selectpicker("refresh"); o.find("select[name$='ipType']").selectpicker("refresh");
} }
} }
} }
//源ip格式处理 //源ip格式处理
changePattern(o,"srcIpPattern",srcIpPattern); changePattern(o,"srcIpPattern",srcIpPattern);