From ac204b7fb17dfdbd69aa6b7fb03b5e34dfddb199 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Tue, 3 Jul 2018 14:01:03 +0800
Subject: [PATCH] =?UTF-8?q?IP=E6=8E=A9=E7=A0=81=E5=92=8C=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E6=8E=A9=E7=A0=81=E7=BC=BA=E7=9C=81=E4=B8=BA32=EF=BC=88255.255?=
 =?UTF-8?q?.255.255=EF=BC=89=E5=92=8C65535=20=E5=A2=9E=E5=8A=A04over6?=
 =?UTF-8?q?=E5=92=8C6over4ip=E7=B1=BB=E5=9E=8B=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/static/global/scripts/common.js    | 87 ++++++++++++++++++-
 1 file changed, 85 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 82597c5e8..059eb9632 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1,4 +1,7 @@
 $(function(){
+/*	var tree2 = $("#test-select-2").treeMultiselect({
+        searchable: true
+      });*/
 	//全选及取消
 	$("#checkAll").change(function(){
 		if($("#checkAll").prop("checked")){
@@ -405,7 +408,7 @@ var switchIpInfo=function(obj){
 	var destPort=row.find("input[name$='destPort']");
 	
 	var ipV4Default=new Array();
-	ipV4Default[0]="0.0.0.0/8"; //subnet
+	ipV4Default[0]="0.0.0.0/32"; //subnet
 	ipV4Default[1]="0.0.0.0-1.1.1.1";//ip_range
 	ipV4Default[2]="0.0.0.0"; //ip
 	
@@ -416,7 +419,7 @@ var switchIpInfo=function(obj){
 	
 	var portDefault=new Array();
 	portDefault[0]="0";//port
-	portDefault[1]="0/0";//port_mask
+	portDefault[1]="0/65535";//port_mask
 	
 	//IPv4设置默认值
 	if(4==ipType){
@@ -499,6 +502,86 @@ var switchIpInfo=function(obj){
 			}
 		}
 	}
+	if(46==ipType){
+		if(!$(srcIp).val()){
+			if(ipPattern==1){
+				$(srcIp).val(ipV4Default[0]);
+			}else if(ipPattern==2){
+				$(srcIp).val(ipV4Default[1]);
+			}else if(ipPattern==3){
+				$(srcIp).val(ipV4Default[2]);
+			}
+		}else{
+			if($.inArray($(srcIp).val(),ipV4Default) > -1 || $.inArray($(srcIp).val(),ipV6Default) > -1){ //是ipV6的默认值其中一个
+				if(ipPattern==1){
+					$(srcIp).val(ipV4Default[0]);
+				}else if(ipPattern==2){
+					$(srcIp).val(ipV4Default[1]);
+				}else if(ipPattern==3){
+					$(srcIp).val(ipV4Default[2]);
+				}
+			}
+		}
+		if(!$(destIp).val()){
+			if(ipPattern==1){
+				$(destIp).val(ipV6Default[0]);
+			}else if(ipPattern==2){
+				$(destIp).val(ipV6Default[1]);
+			}else if(ipPattern==3){
+				$(destIp).val(ipV6Default[2]);
+			}
+		}else{
+			if($.inArray($(destIp).val(),ipV4Default) > -1 || $.inArray($(destIp).val(),ipV6Default) > -1){ //是ipV6的默认值其中一个
+				if(ipPattern==1){
+					$(destIp).val(ipV6Default[0]);
+				}else if(ipPattern==2){
+					$(destIp).val(ipV6Default[1]);
+				}else if(ipPattern==3){
+					$(destIp).val(ipV6Default[2]);
+				}
+			}
+		}
+	}
+	if(64==ipType){
+		if(!$(srcIp).val()){
+			if(ipPattern==1){
+				$(srcIp).val(ipV6Default[0]);
+			}else if(ipPattern==2){
+				$(srcIp).val(ipV6Default[1]);
+			}else if(ipPattern==3){
+				$(srcIp).val(ipV6Default[2]);
+			}
+		}else{
+			if($.inArray($(srcIp).val(),ipV4Default) > -1 || $.inArray($(srcIp).val(),ipV6Default) > -1){ //是ipV6的默认值其中一个
+				if(ipPattern==1){
+					$(srcIp).val(ipV6Default[0]);
+				}else if(ipPattern==2){
+					$(srcIp).val(ipV6Default[1]);
+				}else if(ipPattern==3){
+					$(srcIp).val(ipV6Default[2]);
+				}
+			}
+		}
+		if(!$(destIp).val()){
+			if(ipPattern==1){
+				$(destIp).val(ipV4Default[0]);
+			}else if(ipPattern==2){
+				$(destIp).val(ipV4Default[1]);
+			}else if(ipPattern==3){
+				$(destIp).val(ipV4Default[2]);
+			}
+		}else{
+			if($.inArray($(destIp).val(),ipV4Default) > -1 || $.inArray($(destIp).val(),ipV6Default) > -1){ //是ipV6的默认值其中一个
+				if(ipPattern==1){
+					$(destIp).val(ipV4Default[0]);
+				}else if(ipPattern==2){
+					$(destIp).val(ipV4Default[1]);
+				}else if(ipPattern==3){
+					$(destIp).val(ipV4Default[2]);
+				}
+			}
+		}
+	}
 	//设置源端口默认值
 	if(!$(srcPort).val()){
 		if(portPattern==1){