From 153e1d43e1e2de68cd75a1891aab200ca07bc8d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Sun, 16 Dec 2018 18:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index cee623201..8c14a80c3 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -31,7 +31,9 @@ $(function(){
 	//增加描述新增时的文字长度限制
 	$("form input[name='cfgDesc']").attr("maxlength","128");
 	$("form  input[name$='cfgKeywords']").attr("maxlength","1024");
+	$("form  input[name$='cfgKeywords']").attr("minlength","4");
 	$("form  input[class~='domainCheck']").attr("maxlength","1024");
+	$("form  input[class~='domainCheck']").attr("minlength","4");
 	//截取过长的文字 使用id选择器;例如:tab对象->tr->td对象. 排除日志table .logTb  
 	$("#contentTable").find("td").not(":has(a)").each(function(i,element){
 	     //获取td当前对象的文本,如果长度大于25;
@@ -404,8 +406,6 @@ $(function(){
    	   defaultText:'please input keywords',
    	   'delimiter':'***and***',//特殊字符串分隔与表达式的多关键词
    	   maxCount:4,
-   	   'minChars' : 4, //每个标签的小最字符
-   	   'maxChars' : 1024, //每个标签的最大字符，如果不设置或者为0，就是无限大
    	   onAddTag:function(tag,size){
 	   		var reg = new RegExp(/\t|\r|\n/);
 			if (tag.match(reg)) {
@@ -1517,6 +1517,26 @@ var validateTagInputKeyword=function(){
 	}
 	return flag;
 }
+var validCharLength=function(){
+	var flag=true;
+	$(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
+		var value=$(this).val()
+		if(value!=''){
+			value=value.replace("***and***","");
+			if(value.length < 4  || value.length > 1024){
+				$(this).parents(".form-group").find(
+						"div[for='"
+								+ $(this).attr("name")
+								+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.keywordLength+"</label>");
+				if(flag){
+					flag=false;
+				}
+			}
+		}
+	});
+	return flag;
+	
+}
 var validateInvisibleCharTag=function(){
 	var hasInvisibleCharTags=[];
 	var reg = new RegExp(/\t|\r|\n/);
@@ -1533,7 +1553,8 @@ var validateInvisibleCharTag=function(){
 		$(".tagsinput").parents(".col-md-6").next("div").html("<label class='error'>"+$.validator.messages.haveInvisibleChar.replace("{0}",hasInvisibleCharTags.join(","))+"</label>");
 		return false;
 	}
-	return true;
+	var charLengthValid=validCharLength();
+	return charLengthValid;
 }
 var setHexCaseSenstive=function(){
 	$("input[name$='configHex']").each(function(){