From cc5617034659e7cf4361f1292d92b002579e835e Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 17 Aug 2018 15:28:15 +0800
Subject: [PATCH] =?UTF-8?q?tagsInput=E7=9A=84=E9=9D=9E=E5=8F=AF=E8=A7=81?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E9=AA=8C=E8=AF=81=E6=8F=90=E5=8F=96=E5=88=B0?=
 =?UTF-8?q?common.js=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/website/httpForm.jsp    | 18 +++--------------
 .../webapp/static/global/scripts/common.js    | 20 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 16 deletions(-)

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 83c7f4dba..2688174e7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
@@ -115,20 +115,9 @@
 												}					
 											}
 										});
-										var hasInvisibleCharTags=[];
-										var reg = new RegExp(/\t|\r|\n/);
-										console.log($(".tagsinput").find(".tag").length);
-										$(".tagsinput").find(".tag").each(function(){
-											var text=$(this).children("span").text();
-											if (text.match(reg)) {
-												hasInvisibleCharTags.push("'"+text+"'");
-												flag = false;
-											}
-										});
-										if(hasInvisibleCharTags.length==1){
-											$(".tagsinput").parents(".col-md-6").next("div").html("<label class='error'>"+$.validator.messages.hasInvisibleChar.replace("{0}",hasInvisibleCharTags.join(","))+"</label>");
-										}else if(hasInvisibleCharTags.length>=1){
-											$(".tagsinput").parents(".col-md-6").next("div").html("<label class='error'>"+$.validator.messages.haveInvisibleChar.replace("{0}",hasInvisibleCharTags.join(","))+"</label>");
+										var flag1=validateInvisibleCharTag();
+										if(flag){
+											flag=flag1;
 										}
 										if(flag){
 											//将disable属性的元素删除
@@ -136,7 +125,6 @@
 												$(this).remove();
 											});
 											$("input[name$='exprType']").attr("disabled",false);
-											console.log(7777);
 											loading('onloading...');
 											form.submit();
 										}else{
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 86837b7ad..0d1078abf 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1101,4 +1101,22 @@ var importCfg=function(){
  	}
  	$("#import_modal").modal('hide');//导入文件隐藏
 	$("#importForm1").submit();
-} 
\ No newline at end of file
+}
+var validateInvisibleCharTag=function(){
+	var hasInvisibleCharTags=[];
+	var reg = new RegExp(/\t|\r|\n/);
+	$(".tagsinput").find(".tag").each(function(){
+		var text=$(this).children("span").text();
+		if (text.match(reg)) {
+			hasInvisibleCharTags.push("'"+text.trim()+"'");
+		}
+	});
+	if(hasInvisibleCharTags.length==1){
+		$(".tagsinput").parents(".col-md-6").next("div").html("<label class='error'>"+$.validator.messages.hasInvisibleChar.replace("{0}",hasInvisibleCharTags.join(","))+"</label>");
+		return false;
+	}else if(hasInvisibleCharTags.length>=1){
+		$(".tagsinput").parents(".col-md-6").next("div").html("<label class='error'>"+$.validator.messages.haveInvisibleChar.replace("{0}",hasInvisibleCharTags.join(","))+"</label>");
+		return false;
+	}
+	return true;
+}
\ No newline at end of file