From 2910544c2652373a148e2eb1a6447841d4f07dea Mon Sep 17 00:00:00 2001
From: chenkailing <632104866@qq.com>
Date: Sun, 27 Dec 2020 12:35:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8E=8B=E7=BC=A9=E5=8C=85?=
 =?UTF-8?q?=E9=87=8C=E6=96=87=E4=BB=B6=E5=86=8D=E6=AC=A1=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/src/main/config/freemarker_implicit.ftl | 1 +
 server/src/main/resources/web/compress.ftl     | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/server/src/main/config/freemarker_implicit.ftl b/server/src/main/config/freemarker_implicit.ftl
index ace6f553..5de6e4a4 100644
--- a/server/src/main/config/freemarker_implicit.ftl
+++ b/server/src/main/config/freemarker_implicit.ftl
@@ -1,5 +1,6 @@
 [#ftl]
 [#-- @implicitly included --]
+[#-- @ftlvariable name="fileTree" type="java.lang.String" --]
 [#-- @ftlvariable name="baseUrl" type="java.lang.String" --]
 [#-- @ftlvariable name="imgUrls" type="String" --]
 [#-- @ftlvariable name="textData" type="java.lang.String" --]
diff --git a/server/src/main/resources/web/compress.ftl b/server/src/main/resources/web/compress.ftl
index d94ff9a0..9161ed84 100644
--- a/server/src/main/resources/web/compress.ftl
+++ b/server/src/main/resources/web/compress.ftl
@@ -23,9 +23,6 @@
         h6 {font-weight: normal;font-size: 12px;letter-spacing: 1px;line-height: 24px;text-align: center;}
         a {color:#3C6E31;text-decoration: underline;}
         a:hover {background-color:#3C6E31;color:white;}
-        input.radio {margin: 0 2px 0 8px;}
-        input.radio.first {margin-left:0;}
-        input.empty {color: lightgray;}
         code {color: #2f332a;}
         div.zTreeDemoBackground {width:600px;text-align:center;margin: 0 auto;background-color: #ffffff;}
     </style>
@@ -41,7 +38,7 @@
 <script type="text/javascript" src="js/base64.min.js" ></script>
 
 <script type="text/javascript">
-    var data = JSON.parse('${fileTree}');
+    const data = JSON.parse('${fileTree}');
     var baseUrl = "${baseUrl}";
     var setting = {
         view: {
@@ -74,7 +71,7 @@
                     } else {
                         fulls += ",resizable"; // 对于不支持screen属性的浏览器，可以手工进行最大化。 manually
                     }
-                    var previewUrl = baseUrl + treeNode.fileName +"&fileKey="+ treeNode.fileKey;
+                    var previewUrl = baseUrl + treeNode.fileName +"?fileKey="+ treeNode.fileKey;
                     window.open("onlinePreview?url=" + encodeURIComponent(Base64.encode(previewUrl)), "_blank",fulls);
                 }
             }