From 9fe48a6722b05e646a51ab2296984ee95e07b72e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=87=95=E9=B9=8F?= <mail_yanpeng@163.com>
Date: Wed, 7 Jul 2021 14:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/ureport-asserts/icons/back.svg        | 1 +
 .../src/main/resources/ureport-html/html-preview.html        | 3 +++
 ureport2-js/src/preview.js                                   | 5 +++++
 3 files changed, 9 insertions(+)
 create mode 100644 ureport2-console/src/main/resources/ureport-asserts/icons/back.svg

diff --git a/ureport2-console/src/main/resources/ureport-asserts/icons/back.svg b/ureport2-console/src/main/resources/ureport-asserts/icons/back.svg
new file mode 100644
index 0000000..23de3c0
--- /dev/null
+++ b/ureport2-console/src/main/resources/ureport-asserts/icons/back.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1625628000370" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1190" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M510.9 60.7c-245.6 0-446.7 199.8-446.7 446.7C64.2 753 263.9 954 510.8 954s446.6-199.7 446.6-446.6c0.1-245.6-199.6-446.7-446.5-446.7zM760.5 694c-0.1 6.3-5.3 11.4-11.7 11.4-5.6 0-10.3-3.9-11.4-9.3-0.2-0.7-7.8-35.2-40.4-69.1-41.5-43.2-105.8-66.9-186.4-69v93.8c0 4.4-2.5 8.3-6.4 10.3-3.9 2-8.6 1.6-12.2-0.9L268.2 500.7c-1-0.7-1.9-1.6-2.6-2.6-3.7-5.2-2.5-12.3 2.6-16L492 321c3.6-2.6 8.3-2.9 12.2-1 3.9 2 6.3 5.9 6.4 10.3v99.6c23.2 0.9 46.3 4.4 68.7 10.3 46.4 12.2 85 33.4 114.6 63.2 45.6 45.6 68 109.8 66.6 190.6z" p-id="1191" fill="#1296db"></path></svg>
\ No newline at end of file
diff --git a/ureport2-console/src/main/resources/ureport-html/html-preview.html b/ureport2-console/src/main/resources/ureport-html/html-preview.html
index 7d8de46..7d786a4 100644
--- a/ureport2-console/src/main/resources/ureport-html/html-preview.html
+++ b/ureport2-console/src/main/resources/ureport-html/html-preview.html
@@ -123,6 +123,9 @@ ${upSearchFormHtml}
 			<span id='pageLinkContainer'></span>
 		</span>
 		#end
+		<button type="button" class="btn btn-default ureport-back-btn" style="display:inline-block;padding:0;background:#f8f8f8;border:none;margin:3px;float: right" title="返回">
+			<img src='${contextPath}/ureport/res/ureport-asserts/icons/back.svg' width="22px" height="22px">
+		</button>
 	</div>
 </div>
 #end
diff --git a/ureport2-js/src/preview.js b/ureport2-js/src/preview.js
index d469ba0..d7dfbe9 100644
--- a/ureport2-js/src/preview.js
+++ b/ureport2-js/src/preview.js
@@ -103,6 +103,11 @@ $(document).ready(function(){
         const url=window._server+'/excel'+urlParameters;
         window.open(url,'_blank');
     });
+    $(`.ureport-back-btn`).click(function(){
+        console.log("nelson")
+        window.top.history.back()
+       debugger
+    });
     // $(`.ureport-export-excel-paging`).click(function(){
     //     const urlParameters=buildLocationSearchParameters();
     //     const url=window._server+'/excel/paging'+urlParameters;