From 6eecad82aa6adc4530a6f4f15bdda1057431fef6 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Fri, 26 Apr 2019 17:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=E4=B9=B1=E7=A0=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/tags/sys/delRow.tag   | 20 ++++++++++++++++++-
 .../webapp/static/pages/scripts/pageLogs.js   | 18 +++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index 5a586010f..25cf35e10 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -614,7 +614,8 @@ function exportXmlRequest(url){
     xmlResquest.responseType = "blob";
     xmlResquest.onload = function (oEvent) {
     	var contDisp = xmlResquest.getResponseHeader("content-disposition");		    
-    	var fileName = contDisp.substring(contDisp.indexOf("=")+1,contDisp.length).replace(/\"/g,"");    	
+    	var fileName = contDisp.substring(contDisp.indexOf("=")+1,contDisp.length).replace(/\"/g,"");
+    	fileName = decodeURIComponent(EncodeUtf8(fileName));
         var content = xmlResquest.response;
         var elink = document.createElement('a');       
         elink.download = fileName;
@@ -632,4 +633,21 @@ function exportXmlRequest(url){
     }    
     xmlResquest.send($('#searchForm').serialize());
 }
+function EncodeUtf8(s1){
+    var s = escape(s1);
+    var sa = s.split("%");
+    var retV ="";
+    if(sa[0] != ""){
+       retV = sa[0];
+    }
+    for(var i = 1; i < sa.length; i ++){
+         if(sa[i].substring(0,1) == "u")
+         {
+             retV += Hex2Utf8(Str2Hex(sa[i].substring(1,5)));
+
+         }
+         else retV += "%" + sa[i];
+    }
+    return retV;
+}
 </script>
diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js
index bc5829184..a6e22ae4d 100644
--- a/src/main/webapp/static/pages/scripts/pageLogs.js
+++ b/src/main/webapp/static/pages/scripts/pageLogs.js
@@ -139,6 +139,7 @@ function aJaxImportPost(url, params) {
     xmlResquest.onload = function (oEvent) {    	
     	var contDisp = xmlResquest.getResponseHeader("content-disposition")    	
     	var fileName = contDisp.substring(contDisp.indexOf("=")+1,contDisp.length).replace(/\"/g,"")
+    	fileName = decodeURIComponent(EncodeUtf8(fileName));
         var content = xmlResquest.response;
         var elink = document.createElement('a');
         elink.download = fileName;
@@ -156,3 +157,20 @@ function aJaxImportPost(url, params) {
     };
     xmlResquest.send($("#temp_form").serialize());
 } 
+function EncodeUtf8(s1){
+    var s = escape(s1);
+    var sa = s.split("%");
+    var retV ="";
+    if(sa[0] != ""){
+       retV = sa[0];
+    }
+    for(var i = 1; i < sa.length; i ++){
+         if(sa[i].substring(0,1) == "u")
+         {
+             retV += Hex2Utf8(Str2Hex(sa[i].substring(1,5)));
+
+         }
+         else retV += "%" + sa[i];
+    }
+    return retV;
+}
\ No newline at end of file