修改文件导出改为post传参;修复拦截修复策略必选属性为空不提示问题

3 files changed, 20 insertions, 27 deletions

diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index 8fcfb4c06..cebd58702 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -464,7 +464,6 @@ function doAll(checkboxes,url){
 					},{buttonsFocus:1});

 					top.$('.jbox-body .jbox-icon').css('top','55px');	

 				}

-		 	 alert("333");

 			//除取消审核之外的业务

 		  }else{

 			  

@@ -477,6 +476,7 @@ function doAll(checkboxes,url){
 					exportXmlRequest(url);					

 				}else{

 					window.location = url+"?ids="+ids+"&compileIds="+compileIds;

+					exportXmlRequest(url);

 				}

 				if(url.indexOf("?isAudit") > 1){

 					loading('<spring:message code="onloading"/>');

@@ -564,14 +564,12 @@ function exportData(url,maxRow,searchUrl,exType){
 	}

 	if(column.toString()!="" && column.toString() =="<spring:message code='log'/>"){

 		top.$.jBox.tip("<spring:message code='all_columns_hidden'/>", "<spring:message code='info'/>");

-		alert("第一个return");

 		return;

 	}

 	if(column.toString()!=""){

 		url+="&columns="+column.toString();

 	}else{

 		top.$.jBox.tip("<spring:message code='all_columns_hidden'/>", "<spring:message code='info'/>");

-		alert("第二个return");

 		return;

 	}

 	if(hColumn.toString()!=""){

@@ -608,10 +606,9 @@ function exportData(url,maxRow,searchUrl,exType){
 }

 function exportXmlRequest(url){

 	loading('onloading');

-	url+="&"+$('#searchForm').serialize();

     var xmlResquest = new XMLHttpRequest();

     xmlResquest.open("POST", url, true);	    

-    xmlResquest.setRequestHeader("Content-type", "application/json");

+    xmlResquest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");

     xmlResquest.responseType = "blob";

     xmlResquest.onload = function (oEvent) {

     	var contDisp = xmlResquest.getResponseHeader("content-disposition");		    

@@ -630,7 +627,7 @@ function exportXmlRequest(url){
 		if (xmlResquest.readyState==4) {

 			top.$.jBox.closeTip();

 		}

-    }

-    xmlResquest.send();

+    }    

+    xmlResquest.send($('#searchForm').serialize());

 }

-</script>
\ No newline at end of file
+</script>

diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
index 82e0f8752..0124d844c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
@@ -274,9 +274,9 @@ function privateFileValidate(){
 													</c:forEach>

 													</select>

 								            </div>

-								        </div>

-								         <div for="keyringType"></div>

-								    </div>

+								            <div for="keyringType"></div>

+								        </div>								         

+								 </div>

 								   

 								</div>

 								<div class="row">

@@ -302,9 +302,9 @@ function privateFileValidate(){
 													<input id="publicKeyFile" name="publicKeyFile" type="hidden" value="${_cfg.publicKeyFile }"/>

 												</div>

 											</div>

-											<div id="publicInfo"></div>

+											<div id="publicInfo"></div>										

+											<div for="publicKeyFileInfo"></div>

 										</div>

-										<div for="publicKeyFileInfo"></div>

 									</div>

 									<div class="col-md-6">

 										<div class="form-group">

@@ -329,9 +329,9 @@ function privateFileValidate(){
 												</div>

 											</div>

 											&nbsp;&nbsp;<label ><i class='fa fa-info-circle'></i>&nbsp;<spring:message code='private_certificate'/></label>

-											<div for="privateInfo"></div>

+											<div for="privateInfo"></div>										

+										    <div for="privateKeyFileInfo"></div>

 										</div>

-										<div for="privateKeyFileInfo"></div>

 									</div>

 								</div>

 								<div class="row ">

diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js
index d146d4e49..bc5829184 100644
--- a/src/main/webapp/static/pages/scripts/pageLogs.js
+++ b/src/main/webapp/static/pages/scripts/pageLogs.js
@@ -117,27 +117,24 @@ Date.prototype.Format = function (fmt) {
 function aJaxImportPost(url, params) {	

 	top.$.jBox.tip("onloading",'loading',{opacity:0.5,persistent:true});

     // 创建form元素

-    var temp_form = document.createElement("form");

-    temp_form.id = "temp_form";  

+    var temp_form = document.createElement("form");        

     // 设置form属性

+    temp_form .id = 'temp_form';

     temp_form .action = url;      

     temp_form .target = "_self";

     temp_form .method = "post";

-    temp_form .style.display = "none";

+    temp_form .style.display = "none";    

     // 处理需要传递的参数 

     for (var x in params) { 

         var opt = document.createElement("textarea");      

         opt.name = x;      

         opt.value = params[x];      

         temp_form .appendChild(opt);      

-    }      

-    document.body.appendChild(temp_form);     

-	url=url+"?";

-	url+="&"+$('#temp_form').serialize();

+    }    

+    document.body.appendChild(temp_form);

     var xmlResquest = new XMLHttpRequest();   

     xmlResquest.open("POST", url, true);

-    xmlResquest.setRequestHeader("Content-type", "application/json");

-    xmlResquest.setRequestHeader("Content-Disposition","attachment");

+    xmlResquest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");

     xmlResquest.responseType = "blob";

     xmlResquest.onload = function (oEvent) {    	

     	var contDisp = xmlResquest.getResponseHeader("content-disposition")    	

@@ -150,13 +147,12 @@ function aJaxImportPost(url, params) {
         elink.href = URL.createObjectURL(blob);

         document.body.appendChild(elink);

         elink.click();

-        document.body.removeChild(elink);					      

-       

+        document.body.removeChild(elink);					             

     };

     xmlResquest.onreadystatechange = function() {    			

 		if (xmlResquest.readyState==4) {			

 			top.$.jBox.closeTip();

 		}

     };

-    xmlResquest.send();

+    xmlResquest.send($("#temp_form").serialize());

 }