Home Explore Help
Register Sign In
usoft
/
report-parent
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

预览页面隐藏不可用选项

sunyj 9 years ago
parent
d3558396bb
commit
78088ffb31
4 changed files with 9 additions and 19 deletions
Split View Show Diff Stats
  1. 4 4
      src/main/java/com/uas/report/controller/PrintController.java
  2. 1 1
      src/main/java/com/uas/report/service/impl/PrintServiceImpl.java
  3. 0 10
      src/main/webapp/WEB-INF/views/error.jsp
  4. 4 4
      src/main/webapp/WEB-INF/views/preview.html

+ 4 - 4
src/main/java/com/uas/report/controller/PrintController.java
View File 

@@ -68,14 +68,14 @@ public class PrintController {
 
 			throw new SystemError(message);

 		}

 

-		logger.info("开始导出报表： " + reportName);

+		logger.info("开始导出报表：" + reportName);

 		if (StringUtils.isEmpty(exportFileType)) {

 			exportFileType = "pdf";

 		}

 

 		byte[] data = printService.export(userName, reportName, whereCondition, otherParameters, exportFileType);

 		if (ArrayUtils.isEmpty(data)) {

-			message = "报表导出失败： " + reportName;

+			message = "报表导出失败：" + reportName;

 			logger.error(message);

 			throw new SystemError(message);

 		}

@@ -89,7 +89,7 @@ public class PrintController {
 
 		} catch (IOException e) {

 			logger.error("浏览器重复请求！");

 		}

-		logger.info("报表导出完成：  " + reportName);

+		logger.info("报表导出完成：" + reportName);

 	}

 

 	/**

@@ -123,7 +123,7 @@ public class PrintController {
 
 			throw new SystemError(message);

 		}

 

-		logger.info("开始预览报表： " + reportName);

+		logger.info("开始预览报表：" + reportName);

 		Map<String, Object> result = printService.preview(userName, reportName, whereCondition, otherParameters,

 				pageIndex);

 		byte[] data = null;

+ 1 - 1
src/main/java/com/uas/report/service/impl/PrintServiceImpl.java
View File 

@@ -97,7 +97,7 @@ public class PrintServiceImpl implements PrintService {
 
 		File jrxmlFile = new File(jrxmlFilePath);

 		// 报表模板不存在

 		if (!jrxmlFile.exists()) {

-			message = "未发现模板文件： " + jrxmlFile.getPath();

+			message = "未发现模板文件：" + jrxmlFile.getPath();

 			logger.error(message);

 			throw new SystemError(message);

 		}

+ 0 - 10
src/main/webapp/WEB-INF/views/error.jsp
View File 

@@ -1,10 +0,0 @@
 
-<%@ page language="java" contentType="text/html; UTF-8"

-	pageEncoding="UTF-8"%>

-<html>

-<body>

-	<%

-		String message = (String) request.getAttribute("message");

-	%>

-	<p><%=message%></p>

-</body>

-</html>

+ 4 - 4
src/main/webapp/WEB-INF/views/preview.html
View File 

@@ -184,11 +184,11 @@ See https://github.com/adobe-type-tools/cmap-resources
 
 					<div id="toolbarViewer">

 						<div id="toolbarViewerLeft">

 							<button id="sidebarToggle" class="toolbarButton"

-								title="Toggle Sidebar" tabindex="11" disabled="disabled"

+								title="Toggle Sidebar" tabindex="11" hidden='true'

 								data-l10n-id="toggle_sidebar">

 								<span data-l10n-id="toggle_sidebar_label">Toggle Sidebar</span>

 							</button>

-							<div class="toolbarButtonSpacer"></div>

+							<div class="toolbarButtonSpacer" hidden='true'></div>

 							<button id="viewFind" class="toolbarButton group hiddenSmallView"

 								title="Find in Document" tabindex="12" data-l10n-id="findbar">

 								<span data-l10n-id="findbar_label">Find</span>

@@ -219,7 +219,7 @@ See https://github.com/adobe-type-tools/cmap-resources
 
 									Mode</span>

 							</button>

 

-							<button id="openFile"

+							<button id="openFile" hidden='true'

 								class="toolbarButton openFile hiddenLargeView" title="Open File"

 								tabindex="32" data-l10n-id="open_file">

 								<span data-l10n-id="open_file_label">Open</span>

@@ -230,7 +230,7 @@ See https://github.com/adobe-type-tools/cmap-resources
 
 								<span data-l10n-id="print_label">Print</span>

 							</button>

 

-							<button id="download" disabled="disabled"

+							<button id="download" hidden='true'

 								class="toolbarButton download hiddenMediumView" title="Download"

 								tabindex="34" data-l10n-id="download">

 								<span data-l10n-id="download_label">Download</span>