修复报表模版中含有诸如+之类特殊字符保存后被过滤的BUG

ureport2-console/src/main/java/com/bstek/ureport/console/BaseServletAction.java

@@ -52,6 +52,17 @@ public abstract class BaseServletAction implements ServletAction {
 			return value;
 		}
 	}
+	protected String decodeContent(String content){
+		if(content==null){
+			return content;
+		}
+		try{
+			content=URLDecoder.decode(content, "utf-8");
+			return content;
+		}catch(Exception ex){
+			return content;
+		}
+	}
 	
 	protected Map<String, Object> buildParameters(HttpServletRequest req) {
 		Map<String,Object> parameters=new HashMap<String,Object>();

ureport2-console/src/main/java/com/bstek/ureport/console/designer/DesignerServletAction.java

@@ -118,7 +118,7 @@ public class DesignerServletAction extends RenderPageServletAction {
 	}
 	public void savePreviewData(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 		String content=req.getParameter("content");
-		content=decode(content);
+		content=decodeContent(content);
 		InputStream inputStream=IOUtils.toInputStream(content,"utf-8");
 		ReportDefinition reportDef=reportParser.parse(inputStream,"p");
 		reportRender.rebuildReportDefinition(reportDef);
@@ -166,7 +166,7 @@ public class DesignerServletAction extends RenderPageServletAction {
 		String file=req.getParameter("file");
 		file=ReportUtils.decodeFileName(file);
 		String content=req.getParameter("content");
-		content=decode(content);
+		content=decodeContent(content);
 		ReportProvider targetReportProvider=null;
 		for(ReportProvider provider:reportProviders){
 			if(file.startsWith(provider.getPrefix())){

ureport2-js/src/Utils.js

@@ -518,7 +518,7 @@ export function tableToXml(context){
         xml+=context.reportDef.searchFormXml;
     }
     xml+=`</ureport>`;
-    xml=encodeURI(xml);
+    xml=encodeURIComponent(xml);
     return xml;
 };