From 4ce7ebef05447f67ae1095dba1de7a9e883d8af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Tue, 9 Apr 2019 09:30:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=B9=B6=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/static/global/scripts/common.js    | 68 +++++++++++--------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index cbf14de7a..6149e49d7 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -438,43 +438,48 @@ $(function(){
    	   'delimiter':'***and***',//特殊字符串分隔与表达式的多关键词
    	   maxCount:4,
    	   onAddTag:function(tag,size){
-	   		var reg = new RegExp(/\t|\r|\n/);
+			var reg = new RegExp(/\t|\r|\n/);
 			if (tag.match(reg)) {
 				$(this).parent(".col-md-6").next("div").html("<label class='error'>"+$.validator.messages.hasInvisibleChar.replace("{0}","'"+tag+"'")+"</label>");
 			}else{
 				$(this).parent(".col-md-6").next("div").html("");
 			}
 			//var keywordValue = "";
-   		   	var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
-				/*$("span[class='tag']").each(function(){
-					keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim();
-				});
-				$(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/
-   		   exprTypeChecked(objNamePrefix,size,options);
-   		     
-   		   var tagObj = $(this);
-   		   for(var key in protectionData){
-   			   if(tagObj.hasClass(key)){
-   				   protectedListWarn(tagObj,key);
-   			   }
-   		   }
-   	   },
-   	   onRemoveTag:function(tag,size){
-   		   $(this).parent(".col-md-6").next("div").html("");
-   		   //var keywordValue = "";
-   		   var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
-	   		/*$("span[class='tag']").each(function(){
+			var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
+			/*$("span[class='tag']").each(function(){
 				keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim();
 			});
 			$(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/
-   		    exprTypeChecked(objNamePrefix,size,options);
+			exprTypeChecked(objNamePrefix,size,options);
+   		   
+			if(size == 1){
+				var tagObj = $(this);
+				for(var key in protectionData){
+					if(tagObj.hasClass(key)){
+						protectedListWarn(tagObj,key);
+					}
+				}
+			}
+   		   
+   	   },
+   	   onRemoveTag:function(tag,size){
+			$(this).parent(".col-md-6").next("div").html("");
+			//var keywordValue = "";
+			var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
+			/*$("span[class='tag']").each(function(){
+				keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim();
+			});
+			$(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/
+			exprTypeChecked(objNamePrefix,size,options);
    		    
-	   	   var tagObj = $(this);
-	 	   for(var key in protectionData){
-	 		   if(tagObj.hasClass(key)){
-	 			   protectedListWarn(tagObj,key);
-	 		   }
- 		   }
+			if(size == 1){
+				var tagObj = $(this);
+				for(var key in protectionData){
+					if(tagObj.hasClass(key)){
+						protectedListWarn(tagObj,key);
+					}
+				}
+			}
    	   }
    });
    $(".tagsinput").popover({
@@ -587,6 +592,15 @@ $(function(){
 		window.history.back();
 		return false;
    });
+   $("#cancel").on("click",function(){
+	   window.history.back();
+	   return false;
+   });
+   $("button[id='audit']").on("click",function(){
+	   $("input[name='isValid']").val(1);
+	   $("input[name='isAudit']").val(1);
+   });
+   
    //去掉首尾空格
    $("input,textarea").on("blur",function(){
 	   if($(this).attr("type")!="file"){