From 0374fbc2dc73282a2ccf4dae2ac3ce4d521884d3 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 9 Nov 2022 16:42:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5):?=
 =?UTF-8?q?=20=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/CanvasOptBar.vue | 52 +++++++++++++++----
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/CanvasOptBar.vue b/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
index 87a831ab32..c62bae7ed4 100644
--- a/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
+++ b/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
@@ -3,7 +3,16 @@
     v-show="existLinkage"
     class="bar-main"
   >
-    <div>
+    <div
+      v-show="isPublicLink && !isNewBlank"
+      class="bar-main-left"
+    >
+      <el-button
+        size="mini"
+        @click="back2Last"
+      ><i class="icon iconfont el-icon-back" />{{ $t('chart.back') }}</el-button>
+    </div>
+    <div class="bar-main-right">
       <el-button
         size="mini"
         type="warning"
@@ -28,6 +37,12 @@ export default {
       })
       return linkageFiltersCount
     },
+    isPublicLink() {
+      return this.$router.currentRoute.path === '/delink'
+    },
+    isNewBlank() {
+      return window.history.length === 1
+    },
     ...mapState([
       'componentData'
     ])
@@ -36,23 +51,40 @@ export default {
     clearAllLinkage() {
       this.$store.commit('clearPanelLinkageInfo')
       bus.$emit('clear_panel_linkage', { viewId: 'all' })
+    },
+    back2Last() {
+      debugger
+      this.$router.back(-1)
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  .bar-main{
-    position: absolute;
+  .bar-main {
+    display: flex;
+    div {
+      position: absolute;
+      z-index: 10;
+      height: 20px;
+      border-radius:2px;
+      padding-left: 3px;
+      padding-right: 0px;
+      cursor:pointer!important;
+    }
+  }
+  .bar-main-right{
     right: 0px;
-    z-index: 10;
-    height: 20px;
-    border-radius:2px;
-    padding-left: 3px;
-    padding-right: 0px;
-    cursor:pointer!important;
     opacity: 0.8;
-    /*background-color: #0a7be0;*/
+  }
+
+  .bar-main-left {
+    left: 0px;
+    opacity: 0;
+    height: fit-content;
+    &:hover {
+      opacity: 0.8;
+    }
   }
 
 </style>

From fa84f0e37a6423a5bffa3d32f607bcea5825c7a9 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 9 Nov 2022 16:49:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?perf(=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5):?=
 =?UTF-8?q?=20=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BB=A3=E7=A0=81=E5=88=A0=E9=99=A4debugger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/editor/CanvasOptBar.vue     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/editor/CanvasOptBar.vue b/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
index c62bae7ed4..d5643e5c3f 100644
--- a/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
+++ b/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
@@ -53,7 +53,6 @@ export default {
       bus.$emit('clear_panel_linkage', { viewId: 'all' })
     },
     back2Last() {
-      debugger
       this.$router.back(-1)
     }
   }