Browse Source

预览页面修改

sunyj 9 years ago
parent
commit
dcc70f7d69

+ 5 - 0
src/main/webapp/WEB-INF/views/index.html

@@ -0,0 +1,5 @@
+<html>
+<body>
+	<h2>你好Hello World!</h2>
+</body>
+</html>

+ 0 - 7
src/main/webapp/WEB-INF/views/index.jsp

@@ -1,7 +0,0 @@
-<%@ page language="java" contentType="text/html; UTF-8"
-	pageEncoding="UTF-8"%>
-<html>
-<body>
-	<h2>你好Hello World!</h2>
-</body>
-</html>

+ 63 - 0
src/main/webapp/WEB-INF/views/preview.html

@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<script>
+	function getUrl() {
+		var userName = getParameter("userName");
+		var reportName = getParameter("reportName");
+		var whereCondition = getParameter("whereCondition");
+		var otherParameters = getParameter("otherParameters");
+		var pageIndex = getParameter("pageIndex");
+		console.log(userName + " -- ");
+		console.log(reportName);
+		console.log(whereCondition);
+		console.log(otherParameters);
+		console.log(pageIndex);
+
+		var previewUrl = "print/getData?";
+		if (userName != null && userName != "") {
+			previewUrl += "userName=" + userName;
+		}
+		if (reportName != null && reportName != "") {
+			previewUrl += "&reportName=" + reportName;
+		}
+		if (whereCondition != null && whereCondition != "") {
+			previewUrl += "&whereCondition=" + whereCondition;
+		}
+		if (otherParameters != null && otherParameters != "") {
+			previewUrl += "&otherParameters=" + otherParameters;
+		}
+		if (pageIndex != null && pageIndex != "") {
+			previewUrl += "&pageIndex=" + pageIndex;
+		}
+		return previewUrl;
+	}
+
+	function getParameter(key) {
+		var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+		var r = window.location.search.substr(1).match(reg);
+		if (r != null)
+			return unescape(r[2]);
+		return null;
+	}
+	var previewUrl = getUrl();
+	console.log("previewUrl: " + previewUrl);
+
+	function loadBody() {
+		var previewIframe = document.getElementById("previewIframe");
+		previewIframe.src = previewUrl;
+		previewIframe.hidden = false;
+	}
+</script>
+<title>Report Preview</title>
+</head>
+<body>
+	<button>export as pdf</button>
+	<iframe id="previewIframe" frameBorder="0"
+		style="height: 620px; width: 100%" hidden=true></iframe>
+	<script>
+		loadBody();
+	</script>
+</body>
+</html>

+ 0 - 119
src/main/webapp/WEB-INF/views/preview.jsp

@@ -1,119 +0,0 @@
-<%@ page language="java" contentType="text/html; UTF-8"
-	pageEncoding="UTF-8"%>
-<%@ page language="java" import="java.io.IOException"%>
-<%@ page language="java" import="org.springframework.util.StringUtils"%>
-<%@ page language="java" import="java.util.Map"%>
-<%@ page language="java" import="java.net.URLEncoder"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-<title>Preview</title>
-<%
-	Map map = request.getParameterMap();
-
-	String userName = request.getParameter("userName");
-	String reportName = request.getParameter("reportName");
-	String whereCondition = request.getParameter("whereCondition");
-	String otherParameters = request.getParameter("otherParameters");
-	Integer pageIndex = Integer.valueOf(request.getParameter("pageIndex"));
-
-	Integer pageSize = (Integer) request.getAttribute("pageSize");
-	System.out.println(pageIndex + "/" + pageSize);
-
-	//byte[] data = (byte[]) request.getAttribute("data");
-%>
-</head>
-<body>
-
-	<%
-		StringBuilder urlStringBuilder = new StringBuilder("print/getData");
-		//参数前是否需要添加&
-		boolean needAnd = false;
-		if (!StringUtils.isEmpty(userName)) {
-			urlStringBuilder.append("?userName=").append(userName);
-			needAnd = true;
-		}
-		if (!StringUtils.isEmpty(reportName)) {
-			if (needAnd) {
-				urlStringBuilder.append("&");
-			} else {
-				urlStringBuilder.append("?");
-			}
-			urlStringBuilder.append("reportName=").append(reportName);
-		}
-		if (!StringUtils.isEmpty(whereCondition)) {
-			if (needAnd) {
-				urlStringBuilder.append("&");
-			} else {
-				urlStringBuilder.append("?");
-			}
-			urlStringBuilder.append("whereCondition=").append(whereCondition);
-		}
-		if (!StringUtils.isEmpty(otherParameters)) {
-			if (needAnd) {
-				urlStringBuilder.append("&");
-			} else {
-				urlStringBuilder.append("?");
-			}
-			urlStringBuilder.append("otherParameters=").append(otherParameters);
-		}
-		if (!StringUtils.isEmpty(pageIndex)) {
-			if (needAnd) {
-				urlStringBuilder.append("&");
-			} else {
-				urlStringBuilder.append("?");
-			}
-			urlStringBuilder.append("pageIndex=").append(pageIndex);
-		}
-	%>
-
-	<form
-		action="<%=urlStringBuilder.toString().replace("getData", "export")%>&exportFileType=pdf"
-		method="post">
-		<input stype="cursor:pointer" type="submit" value="export as pdf">
-	</form>
-
-	<form
-		action="<%=urlStringBuilder.toString().replace("getData", "export")%>&exportFileType=xls"
-		method="post">
-		<input stype="cursor:pointer" type="submit" value="export as xls">
-	</form>
-
-	<%
-		if (pageIndex != 0) {
-	%>
-
-	<form
-		action="<%=urlStringBuilder.toString().replace("print/getData", "preview")
-						.replace("pageIndex=" + pageIndex, "pageIndex=" + (pageIndex - 1))%>"
-		method="post">
-		<input stype="cursor:pointer" type="submit" value="prev">
-	</form>
-	<%
-		}
-		if (pageSize == null || pageIndex < pageSize - 1) {
-	%>
-	<form
-		action="<%=urlStringBuilder.toString().replace("print/getData", "preview")
-						.replace("pageIndex=" + pageIndex, "pageIndex=" + (pageIndex + 1))%>"
-		method="post">
-		<input stype="cursor:pointer" type="submit" value="next">
-	</form>
-	<%
-		}
-	%>
-	<%-- 		<%
-			if (pageSize != null && pageSize > 0 && pageIndex != null && pageIndex >= 0 && pageIndex < pageSize) {
-		%> --%>
-	<p><%=pageIndex + 1 + "/" + pageSize%></p>
-	<%-- 		<%
-			}
-		%> --%>
-
-	<iframe id="pdf_frame" name="pdf_frame"
-		src="<%=urlStringBuilder.toString()%>" scrolling="no" frameBorder="0"
-		style="height: 620px; width: 100%"> </iframe>
-</body>
-</html>

+ 4 - 2
src/main/webapp/WEB-INF/webmvc.xml

@@ -23,10 +23,12 @@
 	<bean
 		class="org.springframework.web.servlet.view.InternalResourceViewResolver">
 		<property name="prefix" value="/WEB-INF/views/" />
+		<property name="suffix" value=".html" />
 		<property name="contentType" value="text/html;charset=UTF-8" />
 	</bean>
 
-	<mvc:view-controller path="/" view-name="index.jsp" />
-	<mvc:view-controller path="/preview" view-name="preview.jsp" />
+	<mvc:view-controller path="/" view-name="index" />
+	<mvc:view-controller path="/jQueryDemo" view-name="jQueryDemo" />
+	<mvc:view-controller path="/preview" view-name="preview" />
 
 </beans>