From 90f52b54da9f2f5e251ee0983c3df811cb485f0e Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 6 Jan 2023 12:33:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=85=AC=E5=85=B1=E8=BF=9E=E6=8E=A5):=20?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=97=A0=E6=B3=95=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=80=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/CanvasOptBar.vue       | 13 ++++++++++++-
 .../components/canvas/customComponent/UserView.vue  |  2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/editor/CanvasOptBar.vue b/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
index 82bcb35e63..6f305174fb 100644
--- a/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
+++ b/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
@@ -14,6 +14,7 @@
         <el-button
           v-if="!isNewBlank"
           size="mini"
+          type="button"
           @click="back2Last"
         ><span><svg-icon
           style="width: 12px;height: 12px"
@@ -53,6 +54,7 @@
 
 <script>
 import { mapState } from 'vuex'
+import { isMobile } from '@/utils'
 import bus from '@/utils/bus'
 
 export default {
@@ -103,7 +105,16 @@ export default {
       bus.$emit('clear_panel_linkage', { viewId: 'all' })
     },
     back2Last() {
-      this.$router.back(-1)
+      if (isMobile()) {
+        let parentUrl = window.location.href
+        parentUrl = localStorage.getItem('beforeJumpUrl')
+        localStorage.removeItem('beforeJumpUrl')
+        window.location.href = parentUrl
+        window.location.reload()
+        return false
+      } else {
+        this.$router.back(-1)
+      }
     },
     exportPDF() {
       this.$refs['widget-div'].style.display = ''
diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue
index 6a4cf3700e..477e9f87ff 100644
--- a/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/frontend/src/components/canvas/customComponent/UserView.vue
@@ -974,6 +974,8 @@ export default {
               // 判断是否有公共链接ID
               if (jumpInfo.publicJumpId) {
                 const url = '/link/' + jumpInfo.publicJumpId
+                const currentUrl = window.location.href
+                localStorage.setItem('beforeJumpUrl', currentUrl)
                 this.windowsJump(url, jumpInfo.jumpType)
               } else {
                 this.$message({