From a49ee9d72678e033b489b6b878f0a9848eb16213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com>
Date: Fri, 26 Apr 2019 14:10:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88=E5=8F=AF?=
 =?UTF-8?q?=E5=9C=A8viewjs=E4=B8=AD=E5=A4=A7=E5=9B=BE=E9=A2=84=E8=A7=88&?=
 =?UTF-8?q?=E7=BF=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/keking/service/impl/OfficeFilePreviewImpl.java  |  9 +++++++--
 .../src/main/resources/web/officePicture.ftl           | 10 +++++-----
 jodconverter-web/src/main/resources/web/pdf.ftl        |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java b/jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java
index 9825b287..540c8c3f 100644
--- a/jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java
+++ b/jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java
@@ -41,6 +41,7 @@ public class OfficeFilePreviewImpl implements FilePreview {
 
     public static final String OFFICE_PREVIEW_TYPE_PDF = "pdf";
     public static final String OFFICE_PREVIEW_TYPE_IMAGE = "image";
+    public static final String OFFICE_PREVIEW_TYPE_ALLIMAGES = "allImages";
 
     @Override
     public String filePreviewHandle(String url, Model model) {
@@ -78,7 +79,7 @@ public class OfficeFilePreviewImpl implements FilePreview {
                 fileUtils.addConvertedFile(pdfName, fileUtils.getRelativePath(outFilePath));
             }
         }
-        if (OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType)) {
+        if (OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OFFICE_PREVIEW_TYPE_ALLIMAGES.equals(officePreviewType)) {
             List<String> imageUrls = pdfUtils.pdf2jpg(outFilePath, pdfName, url);
             if (imageUrls == null || imageUrls.size() < 1) {
                 model.addAttribute("msg", "office转图片异常，请联系管理员");
@@ -87,7 +88,11 @@ public class OfficeFilePreviewImpl implements FilePreview {
             }
             model.addAttribute("imgurls", imageUrls);
             model.addAttribute("currentUrl", imageUrls.get(0));
-            return "officePicture";
+            if (OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType)) {
+                return "officePicture";
+            } else {
+                return "picture";
+            }
         }
         model.addAttribute("pdfUrl", pdfName);
         return isHtml ? "html" : "pdf";
diff --git a/jodconverter-web/src/main/resources/web/officePicture.ftl b/jodconverter-web/src/main/resources/web/officePicture.ftl
index 0f8d238a..b553c971 100644
--- a/jodconverter-web/src/main/resources/web/officePicture.ftl
+++ b/jodconverter-web/src/main/resources/web/officePicture.ftl
@@ -18,20 +18,20 @@
 <div class="container">
     <#list imgurls as img>
         <div class="img-area">
-            <img class="my-photo" alt="loading" data-src="${img}" src="images/loading.gif">
+            <img class="my-photo" alt="loading" title="查看大图" style="cursor: pointer;" data-src="${img}" src="images/loading.gif" onclick="changePreviewType('allImages')">
         </div>
     </#list>
 </div>
-<img src="images/left.png" style="position: fixed; cursor: pointer; top: 40%; left: 50px; z-index: 999;" alt="PDF预览" onclick="goForPdf()"/>
+<img src="images/right.png" style="position: fixed; cursor: pointer; top: 40%; right: 70px; z-index: 999;" alt="使用PDF预览" title="使用PDF预览" onclick="changePreviewType('pdf')"/>
 <script>
     window.onload=checkImgs;
     window.onscroll = throttle(checkImgs);
-    function goForPdf() {
+    function changePreviewType(previewType) {
         var url = window.location.href;
         if (url.indexOf("officePreviewType=image") != -1) {
-            url = url.replace("officePreviewType=image", "officePreviewType=pdf");
+            url = url.replace("officePreviewType=image", "officePreviewType="+previewType);
         } else {
-            url = url + "&officePreviewType=pdf";
+            url = url + "&officePreviewType="+previewType;
         }
         window.location.href=url;
     }
diff --git a/jodconverter-web/src/main/resources/web/pdf.ftl b/jodconverter-web/src/main/resources/web/pdf.ftl
index 27ef95e8..0391b19f 100644
--- a/jodconverter-web/src/main/resources/web/pdf.ftl
+++ b/jodconverter-web/src/main/resources/web/pdf.ftl
@@ -18,7 +18,7 @@
     </#if>
     <iframe src="/pdfjs/web/viewer.html?file=${finalUrl}" width="100%" frameborder="0"></iframe>
 
-    <img src="images/right.png" style="position: fixed; cursor: pointer; top: 40%; right: 50px; z-index: 999;" alt="图片预览" onclick="goForImage()"/>
+    <img src="images/left.png" style="position: fixed; cursor: pointer; top: 40%; right: 70px; z-index: 999;" alt="使用图片预览" title="使用图片预览" onclick="goForImage()"/>
 
 </body>
 <script type="text/javascript">