diff --git a/src/main/java/com/nis/domain/FunctionServiceDict.java b/src/main/java/com/nis/domain/FunctionServiceDict.java index 42215de2b..912676a1a 100644 --- a/src/main/java/com/nis/domain/FunctionServiceDict.java +++ b/src/main/java/com/nis/domain/FunctionServiceDict.java @@ -16,12 +16,12 @@ public class FunctionServiceDict extends BaseCfg { private String serviceName; private String serviceDesc; private String actionCode; - private Integer regionCode; + private String regionCode; - public Integer getRegionCode() { + public String getRegionCode() { return regionCode; } - public void setRegionCode(Integer regionCode) { + public void setRegionCode(String regionCode) { this.regionCode = regionCode; } public Integer getDictId() { diff --git a/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml b/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml index 69547cd73..851614a6e 100644 --- a/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml +++ b/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml @@ -11,7 +11,7 @@ - + diff --git a/src/main/resources/sql/add_function_region_dict_columns.sql b/src/main/resources/sql/add_function_region_dict_columns.sql index 10bca3fa5..1e4a5ee75 100644 --- a/src/main/resources/sql/add_function_region_dict_columns.sql +++ b/src/main/resources/sql/add_function_region_dict_columns.sql @@ -3,5 +3,5 @@ ALTER TABLE function_region_dict ADD config_ip_type VARCHAR(20) NULL COMMENT 'ip ALTER TABLE function_region_dict ADD config_ip_pattern VARCHAR(10) NULL COMMENT 'ip的格式 1:ip掩码;2:IP范围;3:IP;使用逗号分隔'; ALTER TABLE function_region_dict ADD config_port_pattern VARCHAR(10) NULL COMMENT '端口的格式,1:port;2:port_mask;使用逗号分隔'; ALTER TABLE function_region_dict ADD config_direction VARCHAR(10) NULL COMMENT 'IP方向0,双向;1,单向.使用逗号分隔'; -ALTER TABLE function_service_dict ADD region_code INT(11) NULL COMMENT 'function_region_dict 表中的config_region_code字段值'; +ALTER TABLE function_service_dict ADD region_code VARCHAR(20) NULL COMMENT 'function_region_dict 表中的config_region_code字段值'; ALTER TABLE function_region_dict ADD config_protocol VARCHAR(20) NULL COMMENT '协议 0:任意;6:TCP;17:UDP;1:ICMP;50:ESP;51:AH'; diff --git a/src/main/resources/sql/update_function_region_dict_data.sql b/src/main/resources/sql/update_function_region_dict_data.sql index b160a3ff3..84e59ed68 100644 --- a/src/main/resources/sql/update_function_region_dict_data.sql +++ b/src/main/resources/sql/update_function_region_dict_data.sql @@ -11,7 +11,7 @@ UPDATE function_service_dict SET region_code=1 WHERE function_id=300 AND ACTION UPDATE function_region_dict SET config_service_type='ipmulitiplex',config_ip_port_show='1' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=68; #IP拦截 UPDATE function_service_dict SET region_code=1 WHERE function_id=200 AND ACTION IN(1,128,64,80); -UPDATE function_region_dict SET config_service_type='ratelimit',config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=53; +UPDATE function_region_dict SET config_service_type='ratelimit',config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0' WHERE dict_id=53; #音视频IP UPDATE function_service_dict SET region_code=2 WHERE function_id=20 AND ACTION IN(1,16); UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=17; @@ -23,4 +23,14 @@ UPDATE function_service_dict SET region_code=1 WHERE function_id=405 AND ACTION UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0,6,17' WHERE dict_id=62; #IP白名单 UPDATE function_service_dict SET region_code=1 WHERE function_id=3 AND ACTION IN(128); -UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0,6,17' WHERE dict_id=7; \ No newline at end of file +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0,6,17' WHERE dict_id=7; +#http ip +UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=8 AND ACTION IN(16,1); +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=14; +#ssl ip +UPDATE function_service_dict SET region_code='1,2,3,4' WHERE function_id=34 AND ACTION IN(16,1); +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=23; +# mail ip +UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=35 AND ACTION IN(16,1); +UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=33; + diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp index 5338c35b9..468f23232 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp @@ -62,6 +62,7 @@ $(function(){ portPattern="${region.configPortPattern}" direction="${region.configDirection}" protocol="${region.configProtocol}" + regionType="${region.regionType}" value="${region.configRegionCode}"> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp index ff04ddeed..c0db3e52e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp @@ -61,6 +61,7 @@ $(function(){ portPattern="${region.configPortPattern}" direction="${region.configDirection}" protocol="${region.configProtocol}" + regionType="${region.regionType}" value="${region.configRegionCode}"> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp index 50a64b0fa..d8d983023 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp @@ -61,6 +61,7 @@ $(function(){ portPattern="${region.configPortPattern}" direction="${region.configDirection}" protocol="${region.configProtocol}" + regionType="${region.regionType}" value="${region.configRegionCode}"> diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp index c6fd625a0..03ca6c4bd 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp @@ -82,6 +82,7 @@ $(function(){ portPattern="${region.configPortPattern}" direction="${region.configDirection}" protocol="${region.configProtocol}" + regionType="${region.regionType}" value="${region.configRegionCode}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp index 923690421..67e0931da 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp @@ -4,7 +4,6 @@ <%-- @@ -12,7 +11,17 @@ test="${ipPort.functionId eq regionDistrict.functionId and regionDistrict.regionType eq 1}"> --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp index cde6ebb7f..3e3a4077e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp @@ -13,13 +13,14 @@ $(document) .ready( function() { - $("#cancel").on("click", function() { + initCommIpVal(); + /* $("#cancel").on("click", function() { window.history.back(); }); $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); - }); + }); */ $("#fileInfo").on('click',function(){ $("#file").trigger("click"); }); @@ -180,6 +181,7 @@ checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp index 75400e84b..198c88e2b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp @@ -13,13 +13,14 @@ $(document) .ready( function() { - $("#cancel").on("click", function() { - window.history.back(); - }); - $(".action").on("change", function() { - $("#serviceId").val($(this).attr("serviceId")); - $("#protocolId").val($(this).attr("protocolId")); - }); + initCommIpVal(); + //$("#cancel").on("click", function() { + // window.history.back(); + //}); + //$(".action").on("change", function() { + // $("#serviceId").val($(this).attr("serviceId")); + // $("#protocolId").val($(this).attr("protocolId")); + //}); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); if($("#cfgId").val()!=""){ @@ -241,6 +242,7 @@ checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp index 187c5374c..8122884a6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp @@ -13,13 +13,14 @@ $(document) .ready( function() { - $("#cancel").on("click", function() { + initCommIpVal(); + /* $("#cancel").on("click", function() { window.history.back(); }); $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); - }); + }); */ $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); $("#cfgFrom").validate( @@ -174,6 +175,7 @@ checked> diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp index 19bcf95b9..85e4826df 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp @@ -69,6 +69,7 @@ $(function(){ portPattern="${region.configPortPattern}" direction="${region.configDirection}" protocol="${region.configProtocol}" + regionType="${region.regionType}" value="${region.configRegionCode}"> diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 3dfca5fc4..d3d739052 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -362,52 +362,72 @@ $(function(){ $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); - + var actionCode=$(this).val(); var regionCode=$(this).attr("regionCode"); if(!regionCode){ regionCode=$("input[name='action']").attr("regionCode"); } if(regionCode){ - $("[id^='cfgRegionCode']").each(function(){ - if($(this).attr("id")==("cfgRegionCode"+regionCode)){ - $(this).attr("name","cfgRegionCode"); - }else{ - $(this).removeAttr("name"); + if(regionCode.indexOf(",")==-1){ + $("#cfgRegionCode"+regionCode).attr("name","cfgRegionCode"); + $("#cfgType"+regionCode).attr("name","cfgType"); + $("[id^='cfgRegionCode']").each(function(){ + if($(this).attr("id")==("cfgRegionCode"+regionCode)){ + $(this).attr("name","cfgRegionCode"); + }else{ + $(this).removeAttr("name"); + } + }); + $("[id^='cfgType']").each(function(){ + if($(this).attr("id")==("cfgType"+regionCode)){ + $(this).attr("name","cfgType"); + }else{ + $(this).removeAttr("name"); + } + }); + }else{ + var _region=''; + var regionArr=regionCode.split(','); + $("input[name$='cfgRegionCode'][regionType='1']").each(function(){ + for(var re in regionArr){ + if($(this).val()==regionArr[re]){ + serviceType=$(this).attr("serviceType"); + _region=regionArr[re]; + break; + } + } + }); + if(_region!=''){ + regionCode=_region; } - }); - $("[id^='cfgType']").each(function(){ - if($(this).attr("id")==("cfgType"+regionCode)){ - $(this).attr("name","cfgType"); - }else{ - $(this).removeAttr("name"); - } - }); - var ipPortShow=$("input[name='cfgRegionCode']").attr("ipPortShow"), - ipType=$("input[name='cfgRegionCode']").attr("ipType"), - ipPattern=$("input[name='cfgRegionCode']").attr("ipPattern"), - portPattern=$("input[name='cfgRegionCode']").attr("portPattern"), - direction=$("input[name='cfgRegionCode']").attr("direction"), - protocol=$("input[name='cfgRegionCode']").attr("protocol"); + } + var ipPortShow=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipPortShow"), + ipType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipType"), + ipPattern=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipPattern"), + portPattern=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("portPattern"), + direction=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("direction"), + protocol=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("protocol"), + regionType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("regionType"); //ip,端口处理 if(ipPortShow){ if(ipPortShow.indexOf('1')>-1){//展示源IP,端口 - $("input[name='srcIpAddress']").parents(".form-group").removeClass("hidden"); - $("input[name='srcPort']").parents(".form-group").removeClass("hidden"); + $("input[name$='srcIpAddress']").parents(".form-group").removeClass("hidden"); + $("input[name$='srcPort']").parents(".form-group").removeClass("hidden"); }else{ - $("input[name='srcIpAddress']").parents(".form-group").addClass("hidden"); - $("input[name='srcPort']").parents(".form-group").addClass("hidden"); + $("input[name$='srcIpAddress']").parents(".form-group").addClass("hidden"); + $("input[name$='srcPort']").parents(".form-group").addClass("hidden"); } if(ipPortShow.indexOf('2')>-1){//展示目的IP,端口 - $("input[name='destIpAddress']").parents(".form-group").removeClass("hidden"); - $("input[name='destPort']").parents(".form-group").removeClass("hidden"); + $("input[name$='destIpAddress']").parents(".form-group").removeClass("hidden"); + $("input[name$='destPort']").parents(".form-group").removeClass("hidden"); }else{ - $("input[name='destIpAddress']").parents(".form-group").addClass("hidden"); - $("input[name='destPort']").parents(".form-group").addClass("hidden"); + $("input[name$='destIpAddress']").parents(".form-group").addClass("hidden"); + $("input[name$='destPort']").parents(".form-group").addClass("hidden"); } } if(ipType){ var arr=ipType.split(','); - $("select[name='ipType'] option").each(function(){ + $("select[name$='ipType'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -422,10 +442,11 @@ $(function(){ $(this).attr("disabled",true); } }); + $("select[name$='ipType']").selectpicker("refresh"); } if(ipPattern){ arr=ipPattern.split(','); - $("select[name='ipPattern'] option").each(function(){ + $("select[name$='ipPattern'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -440,10 +461,11 @@ $(function(){ $(this).attr("disabled",true); } }); + $("select[name$='ipPattern']").selectpicker("refresh"); } if(portPattern){ arr=portPattern.split(','); - $("select[name='portPattern'] option").each(function(){ + $("select[name$='portPattern'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -458,10 +480,11 @@ $(function(){ $(this).attr("disabled",true); } }); + $("select[name$='portPattern']").selectpicker("refresh"); } if(direction){ arr=direction.split(','); - $("select[name='direction'] option").each(function(){ + $("select[name$='direction'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -476,11 +499,12 @@ $(function(){ $(this).attr("disabled",true); } }); + $("select[name$='direction']").selectpicker("refresh"); } if(protocol){ arr=protocol.split(','); - $("select[name='protocol'] option").each(function(){ + $("select[name$='protocol'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -495,21 +519,19 @@ $(function(){ $(this).attr("disabled",true); } }); + $("select[name$='protocol']").selectpicker("refresh"); } //处理自定义字段 - var serviceType=$("#cfgRegionCode"+regionCode).attr("serviceType"); + var serviceType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("serviceType"); if(serviceType){ if(serviceType.indexOf("ipaddr")>-1){ if($(this).val()==32){ - $("select[name='protocol'] option").each(function(){ - if($(this).attr("value")==1){ - $(this).removeAttr("disabled"); - } - }); - $("select[name='protocol']").selectpicker("refresh"); + $("select[name$='protocol'] option[value='1']").removeAttr("disabled") + }else{ + $("select[name$='protocol'] option[value='1']").attr("disabled",true); } - + $("select[name$='protocol']").selectpicker("refresh"); } if(serviceType.indexOf("ipmulitiplex")>-1){ $(".ipmulitiplex").removeClass("hidden"); @@ -526,7 +548,7 @@ $(function(){ $(".ratelimit").addClass("hidden"); } if($(this).val()==0x20||$(this).val()==0x60){ - $("input[name='isAreaEffective']").each(function(){ + $("input[name$='isAreaEffective']").each(function(){ if($(this).val()==0){ $(this).click(); } @@ -1362,35 +1384,55 @@ var validateInvisibleCharTag=function(){ return true; } var initCommIpVal=function(){ - var regionCode,serviceType; - if($("input[name='action']:checked").length>0){ - regionCode=$("input[name='action']:checked").attr("regionCode"); - serviceType=$("#cfgRegionCode"+regionCode).attr("serviceType"); - + var regionCode,serviceType,ipPortShow,ipType, + ipPattern,portPattern,direction,protocol,regionType; + if($("input[name$='action']:checked").length>0){ + regionCode=$("input[name$='action']:checked").attr("regionCode"); }else{ - regionCode=$("input[name='action']").attr("regionCode"); - serviceType=$("#cfgRegionCode"+regionCode).attr("serviceType"); + regionCode=$("input[name$='action']").attr("regionCode"); + } + if(regionCode){ + if(regionCode.indexOf(",")==-1){ + $("#cfgRegionCode"+regionCode).attr("name","cfgRegionCode"); + $("#cfgType"+regionCode).attr("name","cfgType"); + serviceType=$("input[name$='cfgRegionCode'][regionType='1'][value='"+regionCode+"']").attr("serviceType"); + }else{ + var _region=''; + var regionArr=regionCode.split(','); + $("input[name$='cfgRegionCode'][regionType='1']").each(function(){ + for(var re in regionArr){ + if($(this).val()==regionArr[re]){ + serviceType=$(this).attr("serviceType"); + _region=regionArr[re]; + break; + } + } + }); + if(_region!=''){ + regionCode=_region; + } + } } if(serviceType){ - if(serviceType.indexOf("ipaddr")>-1&&$("input[name='action']:checked").val()==32){ - $("select[name='protocol'] option").each(function(){ + if(serviceType.indexOf("ipaddr")>-1&&$("input[name$='action']:checked").val()==32){ + $("select[name$='protocol'] option").each(function(){ if($(this).attr("value")==1){ $(this).removeAttr("disabled"); } }); - $("select[name='protocol']").selectpicker("refresh"); + $("select[name$='protocol']").selectpicker("refresh"); } - if(serviceType&&serviceType.indexOf("ipaddr")>-1&&$("input[name='action']").val()==32){ - $("select[name='protocol'] option").each(function(){ + if(serviceType&&serviceType.indexOf("ipaddr")>-1&&$("input[name$='action']").val()==32){ + $("select[name$='protocol'] option").each(function(){ if($(this).attr("value")==1){ $(this).removeAttr("disabled"); } }); - $("select[name='protocol']").selectpicker("refresh"); + $("select[name$='protocol']").selectpicker("refresh"); } if(serviceType.indexOf("ipmulitiplex")>-1){ $(".ipmulitiplex").removeClass("hidden"); - $("input[name='isAreaEffective']").each(function(){ + $("input[name$='isAreaEffective']").each(function(){ if($(this).val()==0){ $(this).click(); } @@ -1401,7 +1443,7 @@ var initCommIpVal=function(){ $(".ipmulitiplex").addClass("hidden"); } if(serviceType.indexOf("ratelimit")>-1){ - if($("input[name='action']").val()==64||$("input[name='action']:checked").val()==64){ + if($("input[name$='action']").val()==64||$("input[name$='action']:checked").val()==64){ $(".ratelimit").removeClass("hidden"); }else{ $(".ratelimit").addClass("hidden"); @@ -1410,41 +1452,33 @@ var initCommIpVal=function(){ $(".ratelimit").addClass("hidden"); } } - $("#cfgRegionCode"+regionCode).attr("name","cfgRegionCode"); - $("#cfgType"+regionCode).attr("name","cfgType"); - $("div[class^='region']").each(function(){ - if(!$(this).hasClass("region"+regionCode)){ - $(this).addClass("hidden"); - $(this).find("input").removeAttr("name"); - $(this).find("select").removeAttr("name"); - } - }) - var ipPortShow=$("input[name='cfgRegionCode']").attr("ipPortShow"), - ipType=$("input[name='cfgRegionCode']").attr("ipType"), - ipPattern=$("input[name='cfgRegionCode']").attr("ipPattern"), - portPattern=$("input[name='cfgRegionCode']").attr("portPattern"), - direction=$("input[name='cfgRegionCode']").attr("direction"), - protocol=$("input[name='cfgRegionCode']").attr("protocol"); + ipPortShow=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipPortShow"), + ipType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipType"), + ipPattern=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("ipPattern"), + portPattern=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("portPattern"), + direction=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("direction"), + protocol=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("protocol"), + regionType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("regionType"); //ip,端口处理 if(ipPortShow){ if(ipPortShow.indexOf('1')>-1){//展示源IP,端口 - $("input[name='srcIpAddress']").parents(".form-group").removeClass("hidden"); - $("input[name='srcPort']").parents(".form-group").removeClass("hidden"); + $("input[name$='srcIpAddress']").parents(".form-group").removeClass("hidden"); + $("input[name$='srcPort']").parents(".form-group").removeClass("hidden"); }else{ - $("input[name='srcIpAddress']").parents(".form-group").addClass("hidden"); - $("input[name='srcPort']").parents(".form-group").addClass("hidden"); + $("input[name$='srcIpAddress']").parents(".form-group").addClass("hidden"); + $("input[name$='srcPort']").parents(".form-group").addClass("hidden"); } if(ipPortShow.indexOf('2')>-1){//展示目的IP,端口 - $("input[name='destIpAddress']").parents(".form-group").removeClass("hidden"); - $("input[name='destPort']").parents(".form-group").removeClass("hidden"); + $("input[name$='destIpAddress']").parents(".form-group").removeClass("hidden"); + $("input[name$='destPort']").parents(".form-group").removeClass("hidden"); }else{ - $("input[name='destIpAddress']").parents(".form-group").addClass("hidden"); - $("input[name='destPort']").parents(".form-group").addClass("hidden"); + $("input[name$='destIpAddress']").parents(".form-group").addClass("hidden"); + $("input[name$='destPort']").parents(".form-group").addClass("hidden"); } } if(ipType){ var arr=ipType.split(','); - $("select[name='ipType'] option").each(function(){ + $("select[name$='ipType'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -1462,7 +1496,7 @@ var initCommIpVal=function(){ } if(ipPattern){ arr=ipPattern.split(','); - $("select[name='ipPattern'] option").each(function(){ + $("select[name$='ipPattern'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -1480,7 +1514,7 @@ var initCommIpVal=function(){ } if(portPattern){ arr=portPattern.split(','); - $("select[name='portPattern'] option").each(function(){ + $("select[name$='portPattern'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -1498,7 +1532,7 @@ var initCommIpVal=function(){ } if(direction){ arr=direction.split(','); - $("select[name='direction'] option").each(function(){ + $("select[name$='direction'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){ @@ -1516,7 +1550,7 @@ var initCommIpVal=function(){ } if(protocol){ arr=protocol.split(','); - $("select[name='protocol'] option").each(function(){ + $("select[name$='protocol'] option").each(function(){ var has=false; for(var type in arr){ if($(this).val()==arr[type]){