From 5fb45346b4d7e60b27ae8d584e03247d64a7ba00 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 22 Aug 2018 18:25:33 +0800
Subject: [PATCH] =?UTF-8?q?(1)common.js=E4=B8=ADaction=20change=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=A7=BB=E9=99=A4=20(2)initCommIpVal?=
 =?UTF-8?q?=E7=9A=84=E8=B0=83=E7=94=A8=E6=94=B9=E5=88=B0common.js=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/app/appIpCfgForm.jsp    |   5 +-
 .../views/cfg/app/appPolicyCfgForm.jsp        |   2 +-
 .../views/cfg/av/contIp/contIpForm.jsp        |   5 +-
 .../WEB-INF/views/cfg/av/picIp/picIpForm.jsp  |   6 +-
 .../WEB-INF/views/cfg/av/voip/voipForm.jsp    |   5 +-
 .../WEB-INF/views/cfg/common/ipForm.jsp       | 240 +++++++++++++++-
 .../WEB-INF/views/cfg/ddosIpCfgForm.jsp       |   6 +-
 .../views/cfg/fileTransfer/ftpForm.jsp        |   6 +-
 .../WEB-INF/views/cfg/mail/mailForm.jsp       |   6 +-
 .../cfg/proxy/control/httpRedirectForm.jsp    |   6 +-
 .../WEB-INF/views/cfg/website/dnsForm.jsp     |   2 +
 .../WEB-INF/views/cfg/website/httpForm.jsp    |  10 +-
 .../WEB-INF/views/cfg/website/sslForm.jsp     |   8 +-
 .../WEB-INF/views/cfg/whitelist/ipForm.jsp    |   4 +-
 .../webapp/static/global/scripts/common.js    | 267 +-----------------
 15 files changed, 289 insertions(+), 289 deletions(-)

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 04bb7406c..c3b62f4f6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
@@ -5,7 +5,10 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	initCommIpVal();
+	//initCommIpVal();
+	$(".action").on("change", function() {
+		$("#serviceId").val($(this).attr("serviceId"));
+	});
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
 	$("#cfgFrom").validate({
 		errorPlacement: function(error,element){
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index 99b918ecb..f6ced9f99 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -199,7 +199,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
 										            <div class="col-md-6">
 												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
-														 labelName="parent.specServiceName" 
+														 labelName="parent.specServiceName" notAllowSelectParent="true"
 														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
 														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
 														notAllowSelectRoot="true" cssClass="form-control required"/>
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 c0db3e52e..322735472 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
@@ -5,7 +5,10 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	initCommIpVal();
+	$(".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({
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 25d6eaefe..dc9b2122a 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
@@ -5,7 +5,11 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	initCommIpVal();
+	//initCommIpVal();
+	$(".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({
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
index 6582ddbc7..629e3777b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
@@ -13,14 +13,13 @@
 	$(document)
 			.ready(
 					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(
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 03ca6c4bd..f3ec43b48 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
@@ -9,7 +9,245 @@ $(function(){
 		$("#serviceId").val($(".action:checked").attr("serviceId"));
 		$("#protocolId").val($(".action:checked").attr("protocolId"));
 	}
-	initCommIpVal();
+	//initCommIpVal();
+	var serviceType=$("input[name='cfgRegionCode']").attr("serviceType");
+	if(serviceType){
+		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");
+		}
+		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");
+		}
+		if(serviceType.indexOf("ipmulitiplex")>-1){
+			$(".ipmulitiplex").removeClass("hidden");
+			$("input[name$='isAreaEffective']").each(function(){
+				if($(this).val()==0){
+					$(this).click();
+				}
+			})
+			$(".areaInfo").addClass("hidden");
+		}else{
+			$(".areaInfo").removeClass("hidden");
+			$(".ipmulitiplex").addClass("hidden");
+		}
+		if(serviceType.indexOf("ratelimit")>-1){
+			if($("input[name$='action']").val()==64||$("input[name$='action']:checked").val()==64){
+				$(".ratelimit").removeClass("hidden");
+			}else{
+				$(".ratelimit").addClass("hidden");
+			}
+		}else{
+			$(".ratelimit").addClass("hidden");
+		}
+	}
+	$(".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){
+			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;
+				}
+			}
+			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");
+					}else{
+						$("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");
+					}else{
+						$("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(){
+						var has=false;
+						for(var type in arr){
+							if($(this).val()==arr[type]){
+								has=true;
+								if($(this).attr("disabled")){
+									$(this).removeAttr("disabled")
+								}
+								break;
+							}
+						}
+						if(!has){
+							$(this).attr("disabled",true);
+						}
+					});
+					$("select[name$='ipType']").selectpicker("refresh");
+				}
+				if(ipPattern){
+					arr=ipPattern.split(',');
+					$("select[name$='ipPattern'] option").each(function(){
+						var has=false;
+						for(var type in arr){
+							if($(this).val()==arr[type]){
+								has=true;
+								if($(this).attr("disabled")){
+									$(this).removeAttr("disabled")
+								}
+								break;
+							}
+						}
+						if(!has){
+							$(this).attr("disabled",true);
+						}
+					});
+					$("select[name$='ipPattern']").selectpicker("refresh");
+				}
+				if(portPattern){
+					arr=portPattern.split(',');
+					$("select[name$='portPattern'] option").each(function(){
+						var has=false;
+						for(var type in arr){
+							if($(this).val()==arr[type]){
+								has=true;
+								if($(this).attr("disabled")){
+									$(this).removeAttr("disabled")
+								}
+								break;
+							}
+						}
+						if(!has){
+							$(this).attr("disabled",true);
+						}
+					});
+					$("select[name$='portPattern']").selectpicker("refresh");
+				}
+				if(direction){
+					arr=direction.split(',');
+					$("select[name$='direction'] option").each(function(){
+						var has=false;
+						for(var type in arr){
+							if($(this).val()==arr[type]){
+								has=true;
+								if($(this).attr("disabled")){
+									$(this).removeAttr("disabled")
+								}
+								break;
+							}
+						}
+						if(!has){
+							$(this).attr("disabled",true);
+						}
+					});
+					$("select[name$='direction']").selectpicker("refresh");
+				}
+				
+				if(protocol){
+					arr=protocol.split(',');
+					$("select[name$='protocol'] option").each(function(){
+						var has=false;
+						for(var type in arr){
+							if($(this).val()==arr[type]){
+								has=true;
+								if($(this).attr("disabled")){
+									$(this).removeAttr("disabled")
+								}
+								break;
+							}
+						}
+						if(!has){
+							$(this).attr("disabled",true);
+						}
+					});
+					$("select[name$='protocol']").selectpicker("refresh");
+				}
+				
+			//处理自定义字段
+			var serviceType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("serviceType");
+			if(serviceType){
+				if(serviceType.indexOf("ipaddr")>-1){
+					if($(this).val()==32){
+						$("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");
+				}else{
+					$(".ipmulitiplex").addClass("hidden");
+				} 
+				if(serviceType.indexOf("ratelimit")>-1){
+					if($(this).val()==64){
+						$(".ratelimit").removeClass("hidden");
+					}else{
+						$(".ratelimit").addClass("hidden");
+					}
+				}else{
+					$(".ratelimit").addClass("hidden");
+				}
+				if($(this).val()==0x20||$(this).val()==0x60){
+					$("input[name$='isAreaEffective']").each(function(){
+						if($(this).val()==0){
+							$(this).click();
+						}
+					})
+				}
+			}
+		}
+	});
 	$("#ipCfgFrom").validate({
 		errorPlacement: function(error,element){
 			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
index ff60ed13f..f79fcfe8b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
@@ -5,14 +5,14 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	initCommIpVal();
+	//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({
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
index b9a35ae8b..5e92eef9d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
@@ -13,14 +13,14 @@
 	$(document)
 			.ready(
 					function() {
-						initCommIpVal();
+						//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(
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 43095eaad..c53cea182 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
@@ -13,14 +13,14 @@
 	$(document)
 			.ready(
 					function() {
-						initCommIpVal();
+						/*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");
 						});
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
index cb8639163..09ab8c2cc 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
@@ -13,14 +13,14 @@
 	$(document)
 			.ready(
 					function() {
-						initCommIpVal();
+						//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"));
 						
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
index ff05be189..db501dce3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -19,6 +19,8 @@
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
+							var action=$("input[name='action']:checked").val();
+						 	switchAction(action);
 						});
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
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 54f48f657..3efbc062f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
@@ -13,14 +13,14 @@
 	$(document)
 			.ready(
 					function() {
-						initCommIpVal();
+						//initCommIpVal();
 						//$("#cancel").on("click", function() {
 						//	window.history.back();
 						//});
-						//$(".action").on("change", function() {
-						//	$("#serviceId").val($(this).attr("serviceId"));
-						//	$("#protocolId").val($(this).attr("protocolId"));
-						//});
+						$(".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()!=""){
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 53754f797..ab215d0b6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
@@ -13,14 +13,14 @@
 	$(document)
 			.ready(
 					function() {
-						initCommIpVal();
-						/* $("#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(
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 85e4826df..89b9651af 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
@@ -6,7 +6,9 @@
 <script type="text/javascript">
 $(function(){
 	switchIpInfo($("select[name$='ipType']"),"ipType");
-	initCommIpVal();
+	$(".action").on("change",function(){
+		$("#serviceId").val($(this).attr("serviceId"));
+	});
 	$("#ipCfgFrom").validate({
 		errorPlacement: function(error,element){
 			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 85e3a7179..f0ae2afa2 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -358,219 +358,8 @@ $(function(){
 	   	}
 	});
    $(".action").on("change", function() {
-	    //DNS REJECT 时选择dnsStrategyId
-	   	var action=$("input[name='action']:checked").val();
-	   	switchAction(action);
-		
-	   	//拦截根据action切换动作部分
-	   	setInterceptDefaultInfo("");
-	   	
-	   	//dolog 白名单默认不显示，不记录日志
-	   	if(action == 128 || action == 32){
-	   		$(".doLog").addClass("hidden");
-	   		$("input[name='doLog'][value=0]").prop("checked",true);
-	   	}else{
-	   		$(".doLog").removeClass("hidden");
-	   		$("input[name='doLog'][value=2]").prop("checked",true);
-	   		
-	   	}
-	   	
 		$("#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){
-			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;
-				}
-			}
-			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");
-					}else{
-						$("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");
-					}else{
-						$("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(){
-						var has=false;
-						for(var type in arr){
-							if($(this).val()==arr[type]){
-								has=true;
-								if($(this).attr("disabled")){
-									$(this).removeAttr("disabled")
-								}
-								break;
-							}
-						}
-						if(!has){
-							$(this).attr("disabled",true);
-						}
-					});
-					$("select[name$='ipType']").selectpicker("refresh");
-				}
-				if(ipPattern){
-					arr=ipPattern.split(',');
-					$("select[name$='ipPattern'] option").each(function(){
-						var has=false;
-						for(var type in arr){
-							if($(this).val()==arr[type]){
-								has=true;
-								if($(this).attr("disabled")){
-									$(this).removeAttr("disabled")
-								}
-								break;
-							}
-						}
-						if(!has){
-							$(this).attr("disabled",true);
-						}
-					});
-					$("select[name$='ipPattern']").selectpicker("refresh");
-				}
-				if(portPattern){
-					arr=portPattern.split(',');
-					$("select[name$='portPattern'] option").each(function(){
-						var has=false;
-						for(var type in arr){
-							if($(this).val()==arr[type]){
-								has=true;
-								if($(this).attr("disabled")){
-									$(this).removeAttr("disabled")
-								}
-								break;
-							}
-						}
-						if(!has){
-							$(this).attr("disabled",true);
-						}
-					});
-					$("select[name$='portPattern']").selectpicker("refresh");
-				}
-				if(direction){
-					arr=direction.split(',');
-					$("select[name$='direction'] option").each(function(){
-						var has=false;
-						for(var type in arr){
-							if($(this).val()==arr[type]){
-								has=true;
-								if($(this).attr("disabled")){
-									$(this).removeAttr("disabled")
-								}
-								break;
-							}
-						}
-						if(!has){
-							$(this).attr("disabled",true);
-						}
-					});
-					$("select[name$='direction']").selectpicker("refresh");
-				}
-				
-				if(protocol){
-					arr=protocol.split(',');
-					$("select[name$='protocol'] option").each(function(){
-						var has=false;
-						for(var type in arr){
-							if($(this).val()==arr[type]){
-								has=true;
-								if($(this).attr("disabled")){
-									$(this).removeAttr("disabled")
-								}
-								break;
-							}
-						}
-						if(!has){
-							$(this).attr("disabled",true);
-						}
-					});
-					$("select[name$='protocol']").selectpicker("refresh");
-				}
-				
-			//处理自定义字段
-			var serviceType=$("input[name$='cfgRegionCode'][value='"+regionCode+"']").attr("serviceType");
-			if(serviceType){
-				if(serviceType.indexOf("ipaddr")>-1){
-					if($(this).val()==32){
-						$("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");
-				}else{
-					$(".ipmulitiplex").addClass("hidden");
-				} 
-				if(serviceType.indexOf("ratelimit")>-1){
-					if($(this).val()==64){
-						$(".ratelimit").removeClass("hidden");
-					}else{
-						$(".ratelimit").addClass("hidden");
-					}
-				}else{
-					$(".ratelimit").addClass("hidden");
-				}
-				if($(this).val()==0x20||$(this).val()==0x60){
-					$("input[name$='isAreaEffective']").each(function(){
-						if($(this).val()==0){
-							$(this).click();
-						}
-					})
-				}
-			}
-		}
   });
    //选择hex cfgkeywords需校验十六进制
    $("select[name$='isHexbin']").each(function(){
@@ -642,6 +431,7 @@ $(function(){
 		window.history.back();
 		return false;
    });
+   initCommIpVal();
 });
 window.onload=function(){
 	//日志查询IP类型增加格式提示
@@ -1486,14 +1276,12 @@ var initCommIpVal=function(){
 		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;
 					}
@@ -1504,52 +1292,13 @@ var initCommIpVal=function(){
 			}
 		}
 	}
-	if(serviceType){
-		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");
-		}
-		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");
-		}
-		if(serviceType.indexOf("ipmulitiplex")>-1){
-			$(".ipmulitiplex").removeClass("hidden");
-			$("input[name$='isAreaEffective']").each(function(){
-				if($(this).val()==0){
-					$(this).click();
-				}
-			})
-			$(".areaInfo").addClass("hidden");
-		}else{
-			$(".areaInfo").removeClass("hidden");
-			$(".ipmulitiplex").addClass("hidden");
-		}
-		if(serviceType.indexOf("ratelimit")>-1){
-			if($("input[name$='action']").val()==64||$("input[name$='action']:checked").val()==64){
-				$(".ratelimit").removeClass("hidden");
-			}else{
-				$(".ratelimit").addClass("hidden");
-			}
-		}else{
-			$(".ratelimit").addClass("hidden");
-		}
-	}
-		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");
+	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,端口