From 029046afe00cbc84a1a3ebfbb76ab380212a2faf Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Wed, 15 Aug 2018 09:16:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?xmpp=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0loa?=
 =?UTF-8?q?ding('onloading...');=20picUrlForm=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=81=AE=E7=BD=A9=E5=B1=82=E4=BD=8D=E7=BD=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp | 1 -
 src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp       | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
index 7b76b3dca..24cdcba08 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
@@ -21,7 +21,6 @@ $(function(){
 			}
 		},
 		submitHandler: function(form){
-			loading('onloading...');
 			var flag = true;
 			$("input[name$='cfgKeywords']").each(function(){
 				if($(this).val()==''){
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
index 0cf3a381b..2f6acf5b4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
@@ -76,6 +76,7 @@
 												$(this).remove();
 											});
 											$("input[name$='exprType']").attr("disabled",false);
+											loading('onloading...');
 											form.submit();
 										}else{
 											return;

From 00ff603663e72b38c1aada6632d8f56c9b143a4c Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Wed, 15 Aug 2018 09:17:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89return?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
index 24cdcba08..95809f90b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
@@ -29,7 +29,6 @@ $(function(){
 									+ $(this).attr("name")
 									+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
 					flag = false;
-					return;
 				}
 			})
 			$("select[name$='isHexbin']").each(function(){