From 3106b50e6b5276e6902259d886ca99ae2392fc0f Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 4 Jun 2018 17:54:02 +0800
Subject: [PATCH] =?UTF-8?q?action=E5=88=87=E6=8D=A2=E6=97=B6=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98cfgType=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/iplist/form.jsp  | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp b/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp
index d4c945d7a..cb22e6e69 100644
--- a/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp
@@ -5,12 +5,27 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
+	if($("input[name='action']:checked").val()==0x20||$("input[name='action']:checked").val()==0x60){
+		$("#cfgRegionCode").val($("#cfgRegionCodeCallback").val());	
+		$("#cfgType").val($("#cfgTypeCallback").val());	
+	}else{
+		$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());	
+		$("#cfgType").val($("#cfgTypeMaat").val());	
+	}
 	$("#cancel").on("click",function(){
 		window.history.back();
 	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
+		if($(this).val()==0x20||$(this).val()==0x60){
+			$("#cfgRegionCode").val($("#cfgRegionCodeCallback").val());	
+			$("#cfgType").val($("#cfgTypeCallback").val());	
+		}else{
+			$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());	
+			$("#cfgType").val($("#cfgTypeMaat").val());	
+		}
+		
 	});
 	$("#serviceId").val($(".action:checked").attr("serviceId"));
 	$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -19,6 +34,7 @@ $(function(){
 			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
 		},
 		submitHandler: function(form){
+			
 			//loading('onloading...');
 			form.submit();
 		},
@@ -50,11 +66,19 @@ $(function(){
                             <input type="hidden" name="compileId" value="${_cfg.compileId}">
                             <input type="hidden" name="functionId" value="${_cfg.functionId}">
                             <input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+                            <input type="hidden" id="cfgType" name="cfgType" value="${_cfg.cfgType}">
+	                   		<input type="hidden" id="cfgRegionCode" name="cfgRegionCode" value="${_cfg.cfgRegionCode}">
                             <!-- 配置域类型 -->
                    			<c:forEach items="${regionList}" var="region">
 	                   			<c:if test="${_cfg.functionId eq region.functionId}">
-	                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-	                   				<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
+	                   				<c:if test="${region.isMaat==1}"><!-- is maat -->
+	                   				<input type="hidden" id="cfgTypeMaat" value="${region.configRegionValue}">
+	                   				<input type="hidden" id="cfgRegionCodeMaat" value="${region.configRegionCode}">
+	                   				</c:if>
+	                   				<c:if test="${region.isMaat==0}">
+	                   				<input type="hidden" id="cfgTypeCallback" value="${region.configRegionValue}">
+	                   				<input type="hidden" id="cfgRegionCodeCallback" value="${region.configRegionCode}">
+	                   				</c:if>
 	                   			</c:if>
                    			</c:forEach>
                    			 <div class="form-body">