更改资源文件存储目录，完善图表功能

7 年前 · ffb21aa650
--- a/ureport2-console/src/main/java/com/bstek/ureport/console/html/HtmlPreviewServletAction.java
+++ b/ureport2-console/src/main/java/com/bstek/ureport/console/html/HtmlPreviewServletAction.java
@ -17,6 +17,7 @@ package com.bstek.ureport.console.html;

 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@ -84,6 +85,8 @@ public class HtmlPreviewServletAction extends RenderPageServletAction {
 				context.put("pageIndex", htmlReport.getPageIndex()); 
 				context.put("error", false);
 				context.put("file", req.getParameter("_u"));
+				String customParameters=buildCustomParameters(req);
+				context.put("customParameters", customParameters);
 				Tools tools=null;
 				String toolsInfo=req.getParameter("_t");
 				if(StringUtils.isNotBlank(toolsInfo)){
@ -108,7 +111,7 @@ public class HtmlPreviewServletAction extends RenderPageServletAction {
 			writer.close();
 		}
 	}
-	
+
 	public void loadPrintPages(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 		String file=req.getParameter("_u");
 		if(StringUtils.isBlank(file)){
@ -224,6 +227,30 @@ public class HtmlPreviewServletAction extends RenderPageServletAction {
 		}
 		return htmlReport;
 	}
+	
+	
+	private String buildCustomParameters(HttpServletRequest req){
+		StringBuilder sb=new StringBuilder();
+		Enumeration<?> enumeration=req.getParameterNames();
+		while(enumeration.hasMoreElements()){
+			Object obj=enumeration.nextElement();
+			if(obj==null){
+				continue;
+			}
+			String name=obj.toString();
+			String value=req.getParameter(name);
+			if(name==null || value==null || name.startsWith("_")){
+				continue;
+			}
+			if(sb.length()>0){
+				sb.append("&");
+			}
+			sb.append(name);
+			sb.append("=");
+			sb.append(value);
+		}
+		return sb.toString();
+	}

 	public void setExportManager(ExportManager exportManager) {
 		this.exportManager = exportManager;
--- a/ureport2-console/src/main/resources/asserts/js/designer.bundle.js
+++ b/ureport2-console/src/main/resources/asserts/js/designer.bundle.js
--- a/ureport2-console/src/main/resources/asserts/js/preview.bundle.js
+++ b/ureport2-console/src/main/resources/asserts/js/preview.bundle.js
--- a/ureport2-console/src/main/resources/html/designer.html
+++ b/ureport2-console/src/main/resources/html/designer.html
@ -3,11 +3,11 @@
 <head>
 <meta charset="UTF-8">
 <title>UReport2报表设计器</title>
- <script type="text/javascript" src="${contextPath}/ureport/res/asserts/venderjs/jquery.min.js"></script>
- <script type="text/javascript" src="${contextPath}/ureport/res/asserts/venderjs/jquery.contextMenu.min.js"></script>
- <script type="text/javascript" src="${contextPath}/ureport/res/asserts/venderjs/completer.min.js"></script>
- <script type="text/javascript" src="${contextPath}/ureport/res/asserts/venderjs/bootstrap.min.js"></script>
- <script type="text/javascript" src="${contextPath}/ureport/res/asserts/venderjs/bootstrap-colorpicker.min.js"></script>
+ <script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/venderjs/jquery.min.js"></script>
+ <script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/venderjs/jquery.contextMenu.min.js"></script>
+ <script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/venderjs/completer.min.js"></script>
+ <script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/venderjs/bootstrap.min.js"></script>
+ <script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/venderjs/bootstrap-colorpicker.min.js"></script>
 </head>
 <body style="margin:0px">
 <div id='container'></div>
@ -15,6 +15,6 @@
 	window._server="${contextPath}/ureport";
 	window._contextPath="${contextPath}";
 </script>
-<script type="text/javascript" src="${contextPath}/ureport/res/asserts/js/designer.bundle.js"></script>
+<script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/js/designer.bundle.js"></script>
 </body>
 </html>
--- a/ureport2-console/src/main/resources/html/html-preview.html
+++ b/ureport2-console/src/main/resources/html/html-preview.html
@ -6,50 +6,50 @@
 <style type="text/css" id="_ureport_table_style">
 	${style}
 </style>
- 	<script type="text/javascript" src="${contextPath}/ureport/res/asserts/venderjs/jquery.min.js"></script>
- 	<script type="text/javascript" src="${contextPath}/ureport/res/asserts/venderjs/bootstrap.min.js"></script>
- 	<script type="text/javascript" src="${contextPath}/ureport/res/asserts/js/preview.bundle.js"></script>
+ 	<script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/venderjs/jquery.min.js"></script>
+ 	<script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/venderjs/bootstrap.min.js"></script>
+ 	<script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/js/preview.bundle.js"></script>
 </head>
 <body style="margin:5px">
 <div style="border:solid 1px #ddd;border-radius:5px;height:35px;width:100%;margin-bottom:5px;background:#f8f8f8">
 	#if($tools.print)
 	<button type="button" class="btn btn-default ureport-print" style="display:inline-block;padding:0;background:#f8f8f8;border:none;margin:3px" title="在线打印">
-		<img src='${contextPath}/ureport/res/asserts/icons/print.svg' width="20px">
+		<img src='${contextPath}/ureport/res/ureport-asserts/icons/print.svg' width="20px">
 	</button>
 	#end
 	#if($tools.pdfPrint)
 	<button type="button" class="btn btn-default ureport-pdf-direct-print" style="display:inline-block;padding:0;background:#f8f8f8;border:none;margin:3px" title="PDF在线打印">
-		<img src='${contextPath}/ureport/res/asserts/icons/pdf-direct-print.svg' width="20px">
+		<img src='${contextPath}/ureport/res/ureport-asserts/icons/pdf-direct-print.svg' width="20px">
 	</button>
 	#end
 	#if($tools.pdfPreviewPrint)
 	<button type="button" class="btn btn-default ureport-pdf-print" style="display:inline-block;padding:0;background:#f8f8f8;border:none;margin:3px" title="PDF在线预览打印">
-		<img src='${contextPath}/ureport/res/asserts/icons/pdf-print.svg' width="20px">
+		<img src='${contextPath}/ureport/res/ureport-asserts/icons/pdf-print.svg' width="20px">
 	</button>
 	#end
 	#if($tools.pdf)
 	<button type="button" class="btn btn-default ureport-export-pdf" style="display:inline-block;padding:0;background:#f8f8f8;border:none;margin:3px" title="导出PDF">
-		<img src='${contextPath}/ureport/res/asserts/icons/pdf.svg' width="20px">
+		<img src='${contextPath}/ureport/res/ureport-asserts/icons/pdf.svg' width="20px">
 	</button>
 	#end
 	#if($tools.word)
 	<button type="button" class="btn btn-default ureport-export-word" style="display:inline-block;padding:0;background:#f8f8f8;border:none;margin:3px" title="导出WORD">
-		<img src='${contextPath}/ureport/res/asserts/icons/word.svg' width="20px">
+		<img src='${contextPath}/ureport/res/ureport-asserts/icons/word.svg' width="20px">
 	</button>
 	#end
 	#if($tools.excel)
 	<button type="button" class="btn btn-default ureport-export-excel" style="display:inline-block;padding:0;background:#f8f8f8;border:none;margin:3px" title="导出EXCEL">
-		<img src='${contextPath}/ureport/res/asserts/icons/excel.svg' width="20px">
+		<img src='${contextPath}/ureport/res/ureport-asserts/icons/excel.svg' width="20px">
 	</button>
 	#end
 	#if($tools.pagingExcel)
 	<button type="button" class="btn btn-default ureport-export-excel-paging" style="display:inline-block;padding:0;background:#f8f8f8;border:none;margin:3px" title="分页导出EXCEL">
-		<img src='${contextPath}/ureport/res/asserts/icons/excel-paging.svg' width="20px">
+		<img src='${contextPath}/ureport/res/ureport-asserts/icons/excel-paging.svg' width="20px">
 	</button>
 	#end
 	#if($tools.sheetPagingExcel)
 	<button type="button" class="btn btn-default ureport-export-excel-paging-sheet" style="display:inline-block;padding:0;background:#f8f8f8;border:none;margin:3px" title="分页分Sheet导出EXCEL">
-		<img src='${contextPath}/ureport/res/asserts/icons/excel-with-paging-sheet.svg' width="20px">
+		<img src='${contextPath}/ureport/res/ureport-asserts/icons/excel-with-paging-sheet.svg' width="20px">
 	</button>
 	#end
 	#if($tools.paging)
@ -64,14 +64,14 @@
 		</button>
 		<ul class="dropdown-menu" role="menu">
 			#if($hasTools)
-			<li><a href="${contextPath}/ureport/preview?_u=${file}&_t=${_t}" style="color:#337ab7">预览</a></li>
+			<li><a href="${contextPath}/ureport/preview?_u=${file}&_t=${_t}&${customParameters}" style="color:#337ab7">预览</a></li>
 			#else
-			<li><a href="${contextPath}/ureport/preview?_u=${file}" style="color:#337ab7">预览</a></li>
+			<li><a href="${contextPath}/ureport/preview?_u=${file}&${customParameters}" style="color:#337ab7">预览</a></li>
 			#end
 			#if($hasTools)
-			<li><a href="${contextPath}/ureport/preview?_u=${file}&_i=1&_t=${_t}" style="color:#337ab7">分页预览</a></li>
+			<li><a href="${contextPath}/ureport/preview?_u=${file}&_i=1&_t=${_t}&${customParameters}" style="color:#337ab7">分页预览</a></li>
 			#else
-			<li><a href="${contextPath}/ureport/preview?_u=${file}&_i=1" style="color:#337ab7">分页预览</a></li>
+			<li><a href="${contextPath}/ureport/preview?_u=${file}&_i=1&${customParameters}" style="color:#337ab7">分页预览</a></li>
 			#end
 		</ul>
 	</div>
@ -97,9 +97,9 @@
 	$(document).ready(function(){
 		$('#pageSelector').change(function(){
 			#if($hasTools)
-				window.open('${contextPath}/ureport/preview?_u=${file}&_i='+$(this).val()+'&_t=${_t}','_self');
+				window.open('${contextPath}/ureport/preview?_u=${file}&_i='+$(this).val()+'&_t=${_t}&${customParameters}','_self');
 			#else
-				window.open('${contextPath}/ureport/preview?_u=${file}&_i='+$(this).val(),'_self');
+				window.open('${contextPath}/ureport/preview?_u=${file}&_i='+$(this).val()+'&${customParameters}','_self');
 			#end
 		});
 		$('#pageSelector').val('${pageIndex}');
--- a/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap-theme.css
+++ b/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap-theme.css
--- a/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap-theme.css.map
+++ b/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap-theme.css.map
--- a/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap-theme.min.css
+++ b/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap-theme.min.css
--- a/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap-theme.min.css.map
+++ b/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap-theme.min.css.map
--- a/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap.css
+++ b/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap.css
--- a/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap.css.map
+++ b/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap.css.map
--- a/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap.min.css
+++ b/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap.min.css
--- a/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap.min.css.map
+++ b/ureport2-console/src/main/resources/ureport-asserts/css/bootstrap.min.css.map
--- a/ureport2-console/src/main/resources/ureport-asserts/fonts/glyphicons-halflings-regular.eot
+++ b/ureport2-console/src/main/resources/ureport-asserts/fonts/glyphicons-halflings-regular.eot
--- a/ureport2-console/src/main/resources/ureport-asserts/fonts/glyphicons-halflings-regular.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/fonts/glyphicons-halflings-regular.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/fonts/glyphicons-halflings-regular.ttf
+++ b/ureport2-console/src/main/resources/ureport-asserts/fonts/glyphicons-halflings-regular.ttf
--- a/ureport2-console/src/main/resources/ureport-asserts/fonts/glyphicons-halflings-regular.woff
+++ b/ureport2-console/src/main/resources/ureport-asserts/fonts/glyphicons-halflings-regular.woff
--- a/ureport2-console/src/main/resources/ureport-asserts/fonts/glyphicons-halflings-regular.woff2
+++ b/ureport2-console/src/main/resources/ureport-asserts/fonts/glyphicons-halflings-regular.woff2
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/barcode.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/barcode.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/end.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/end.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/excel-paging.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/excel-paging.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/excel-with-paging-sheet.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/excel-with-paging-sheet.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/excel.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/excel.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/expand-down.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/expand-down.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/expand-right.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/expand-right.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/expr-expand-down.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/expr-expand-down.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/expr-expand-right.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/expr-expand-right.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/expression
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/expression
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/expression.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/expression.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/first.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/first.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/image.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/image.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/loading.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/loading.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/next.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/next.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/pdf-direct-print.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/pdf-direct-print.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/pdf-print.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/pdf-print.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/pdf.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/pdf.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/prev.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/prev.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/print.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/print.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/property.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/property.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/qrcode.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/qrcode.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/icons/word.svg
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/word.svg
--- a/ureport2-console/src/main/resources/ureport-asserts/js/designer.bundle.js
+++ b/ureport2-console/src/main/resources/ureport-asserts/js/designer.bundle.js
--- a/ureport2-console/src/main/resources/ureport-asserts/js/preview.bundle.js
+++ b/ureport2-console/src/main/resources/ureport-asserts/js/preview.bundle.js
--- a/ureport2-console/src/main/resources/ureport-asserts/venderjs/bootstrap-colorpicker.min.js
+++ b/ureport2-console/src/main/resources/ureport-asserts/venderjs/bootstrap-colorpicker.min.js
--- a/ureport2-console/src/main/resources/ureport-asserts/venderjs/bootstrap.min.js
+++ b/ureport2-console/src/main/resources/ureport-asserts/venderjs/bootstrap.min.js
--- a/ureport2-console/src/main/resources/ureport-asserts/venderjs/completer.min.js
+++ b/ureport2-console/src/main/resources/ureport-asserts/venderjs/completer.min.js
--- a/ureport2-console/src/main/resources/ureport-asserts/venderjs/jquery.contextMenu.min.js
+++ b/ureport2-console/src/main/resources/ureport-asserts/venderjs/jquery.contextMenu.min.js
--- a/ureport2-console/src/main/resources/ureport-asserts/venderjs/jquery.min.js
+++ b/ureport2-console/src/main/resources/ureport-asserts/venderjs/jquery.min.js