From 03f78fc535352a9cbe13a29e62100ca3b2d751f7 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 22 Aug 2018 19:38:23 +0800
Subject: [PATCH] =?UTF-8?q?initCommIpVal=E5=8A=A0=E5=85=A5=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=EF=BC=8C=E5=8E=BB=E6=8E=89=E8=BF=94=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/static/global/scripts/common.js    | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index f0ae2afa2..701bf2f8b 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1264,6 +1264,9 @@ var validateInvisibleCharTag=function(){
 	}
 	return true;
 }
+/**
+ * ip默认选项处理
+ */
 var initCommIpVal=function(){
 	var regionCode,serviceType,ipPortShow,ipType,
 	ipPattern,portPattern,direction,protocol,regionType;
@@ -1292,13 +1295,23 @@ var initCommIpVal=function(){
 			}
 		}
 	}
-	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");
+	if(regionCode){//IP域大于1个，根据action获取ip属性
+		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");
+	}else{//IP域只有一个，获取regionType为1的
+		ipPortShow=$("input[name$='cfgRegionCode'][regionType='1']").attr("ipPortShow"),
+		ipType=$("input[name$='cfgRegionCode'][regionType='1']").attr("ipType"),
+		ipPattern=$("input[name$='cfgRegionCode'][regionType='1']").attr("ipPattern"),
+		portPattern=$("input[name$='cfgRegionCode'][regionType='1']").attr("portPattern"),
+		direction=$("input[name$='cfgRegionCode'][regionType='1']").attr("direction"),
+		protocol=$("input[name$='cfgRegionCode'][regionType='1']").attr("protocol"),
+		regionType=$("input[name$='cfgRegionCode'][regionType='1']").attr("regionType");
+	}
 	//ip，端口处理
 	if(ipPortShow){
 		if(ipPortShow.indexOf('1')>-1){//展示源IP,端口
@@ -1316,6 +1329,7 @@ var initCommIpVal=function(){
 			$("input[name$='destPort']").parents(".form-group").addClass("hidden");
 		}
 	}
+	//ip类型处理
 	if(ipType){
 		var arr=ipType.split(',');
 		$("select[name$='ipType'] option").each(function(){
@@ -1334,6 +1348,7 @@ var initCommIpVal=function(){
 			}
 		});
 	}
+	//ip格式处理
 	if(ipPattern){
 		arr=ipPattern.split(',');
 		$("select[name$='ipPattern'] option").each(function(){
@@ -1352,6 +1367,7 @@ var initCommIpVal=function(){
 			}
 		});
 	}
+	//端口格式处理
 	if(portPattern){
 		arr=portPattern.split(',');
 		$("select[name$='portPattern'] option").each(function(){
@@ -1370,6 +1386,7 @@ var initCommIpVal=function(){
 			}
 		});
 	}
+	//方向处理
 	if(direction){
 		arr=direction.split(',');
 		$("select[name$='direction'] option").each(function(){
@@ -1388,6 +1405,7 @@ var initCommIpVal=function(){
 			}
 		});
 	}
+	//协议处理
 	if(protocol){
 		arr=protocol.split(',');
 		$("select[name$='protocol'] option").each(function(){
@@ -1406,5 +1424,4 @@ var initCommIpVal=function(){
 			}
 		});
 	}
-	return regionCode;
 }
\ No newline at end of file