From 7c85d78ad7c3afcc2971ac0b0c72d33945557b24 Mon Sep 17 00:00:00 2001 From: intraUser Date: Fri, 4 Jan 2019 20:26:56 +0600 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dapp=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E5=AD=97=E9=85=8D=E7=BD=AE=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?= =?UTF-8?q?bug=EF=BC=9B=20lastPage=E5=A2=9E=E5=8A=A0set=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E5=A4=8D=E4=B8=8D=E5=8F=AF=E8=A7=81?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E6=8F=90=E7=A4=BABUG=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/Page.java | 3 + .../views/cfg/app/appHeaderCfgForm.jsp | 6 ++ .../WEB-INF/views/cfg/app/appHttpCfgForm.jsp | 5 ++ .../views/cfg/app/appMultiFeatureCfgForm.jsp | 6 ++ .../views/cfg/app/appPolicyCfgForm.jsp | 6 ++ .../WEB-INF/views/cfg/app/appSslCfgForm.jsp | 6 ++ .../webapp/static/global/scripts/common.js | 56 ++++++++++--------- 7 files changed, 63 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/nis/domain/Page.java b/src/main/java/com/nis/domain/Page.java index 671f650b9..db3437a06 100644 --- a/src/main/java/com/nis/domain/Page.java +++ b/src/main/java/com/nis/domain/Page.java @@ -614,6 +614,9 @@ public class Page { public boolean isLastPage() { return lastPage; } + public void setLastPage(boolean lastPage) { + this.lastPage = lastPage; + } /** diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp index 486e096b6..c26c39196 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp @@ -42,6 +42,12 @@ $(function(){ } } }); + + //不可见字符校验[内含字符大小校验] + if(flag){ + flag=validateInvisibleCharTag(); + } + if(flag){ $("input[name$='exprType']").attr("disabled",false); $("#appCode").val($("#specServiceIdId").val()); diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp index 1fa106d41..e59e5a297 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp @@ -42,6 +42,11 @@ $(function(){ } } }); + //不可见字符校验[内含字符大小校验] + if(flag){ + flag=validateInvisibleCharTag(); + } + if(flag){ $("input[name$='exprType']").attr("disabled",false); $("#appCode").val($("#specServiceIdId").val()); diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp index a56283583..7f6f8e129 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp @@ -128,6 +128,12 @@ $(function(){ $("div[for=upBoundary]").html(""); flag=false; } + + //不可见字符校验[内含字符大小校验] + if(flag){ + flag=validateInvisibleCharTag(); + } + if(flag){ //将disable属性的元素删除 $(".disabled").each(function(){ diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp index 32208ee70..2939d2381 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp @@ -80,6 +80,12 @@ $(function(){ } } }); + + //不可见字符校验[内含字符大小校验] + if(flag){ + flag=validateInvisibleCharTag(); + } + if(flag){ //将disable属性的元素删除 $(".disabled").each(function(){ diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp index c2075e789..eac7569bc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp @@ -42,6 +42,12 @@ $(function(){ } } }); + + //不可见字符校验[内含字符大小校验] + if(flag){ + flag=validateInvisibleCharTag(); + } + if(flag){ $("input[name$='exprType']").attr("disabled",false); $("#appCode").val($("#specServiceIdId").val()); diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 8e6f52956..3530888d2 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -1521,18 +1521,15 @@ var validateTagInputKeyword=function(){ } 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(""); - if(flag){ - flag=false; - } + $(".tagsinput:visible").each(function(){ + var text=''; + $(this).find(".tag").each(function(){ + text+=$(this).children("span").text().trim(); + }); + if(text.length < 4 || text.length > 1024){ + $(this).parents(".col-md-6").next("div").html(""); + if(flag){ + flag=false; } } }); @@ -1540,23 +1537,32 @@ var validCharLength=function(){ } var validateInvisibleCharTag=function(){ - var hasInvisibleCharTags=[]; + var flag=true; 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()+"'"); + $(".tagsinput:visible").each(function(){ + var hasInvisibleCharTags=[]; + $(this).find(".tag").each(function(){ + var text=$(this).children("span").text().trim(); + if (text.match(reg)) { + hasInvisibleCharTags.push("'"+text+"'"); + } + }); + if(hasInvisibleCharTags.length==1){ + $(this).parents(".col-md-6").next("div").html(""); + if(flag){ + flag= false; + } + }else if(hasInvisibleCharTags.length>=1){ + $(this).parents(".col-md-6").next("div").html(""); + if(flag){ + flag= false; + } } }); - if(hasInvisibleCharTags.length==1){ - $(".tagsinput").parents(".col-md-6").next("div").html(""); - return false; - }else if(hasInvisibleCharTags.length>=1){ - $(".tagsinput").parents(".col-md-6").next("div").html(""); - return false; + if(flag){ + flag=validCharLength(); } - var charLengthValid=validCharLength(); - return charLengthValid; + return flag; } var setHexCaseSenstive=function(){ $("input[name$='configHex']").each(function(){