From 55c7a9bfbe10c016e085edbdb0b3f0074d7a3d54 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 9 Nov 2022 14:36:35 +0800
Subject: [PATCH 1/4] =?UTF-8?q?perf(=E8=A7=86=E5=9B=BE):=20=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E8=A7=86=E5=9B=BE=E6=A0=B7=E5=BC=8F=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/ChartStyle.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/chart/view/ChartStyle.vue b/frontend/src/views/chart/view/ChartStyle.vue
index d56bac3856..e29ff2cdda 100644
--- a/frontend/src/views/chart/view/ChartStyle.vue
+++ b/frontend/src/views/chart/view/ChartStyle.vue
@@ -1,7 +1,7 @@
 <template>
   <el-row class="view-panel">
     <div
-      v-if="properties.length===0"
+      v-if="!pluginShow && properties.length===0"
       class="no-properties"
     >
       {{ $t('chart.chart_no_properties') }}
@@ -376,7 +376,10 @@ export default {
     },
     properties: {
       type: Array,
-      required: true
+      required: true,
+      default: () => {
+        return []
+      }
     },
     dimensionData: {
       type: Array,

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 2/4] =?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 3/4] =?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)
     }
   }

From cc3f9a86b858ad9fa9b974f907d4bf35155ceb6a Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Wed, 9 Nov 2022 17:06:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E4=B8=AD=E8=BF=87=E6=BB=A4=E5=A2=9E=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/dragItem/utils.js  | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/chart/components/dragItem/utils.js b/frontend/src/views/chart/components/dragItem/utils.js
index b2ab4bb007..2fb419f6f8 100644
--- a/frontend/src/views/chart/components/dragItem/utils.js
+++ b/frontend/src/views/chart/components/dragItem/utils.js
@@ -10,18 +10,32 @@ export function getItemType(dimensionData, quotaData, item) {
   if (status === 'd') {
     for (let i = 0; i < dimensionData.length; i++) {
       const ele = dimensionData[i]
-      if (((item.chartId && item.extField === 2 && item.tableId === ele.tableId) || ele.id === item.id) && ele.deType === item.deType && ele.groupType === item.groupType) {
-        checked = true
-        break
+      if (item.chartId) {
+        if (ele.dataeaseName === item.dataeaseName && ele.deType === item.deType && ele.groupType === item.groupType) {
+          checked = true
+          break
+        }
+      } else {
+        if (ele.id === item.id && ele.deType === item.deType && ele.groupType === item.groupType) {
+          checked = true
+          break
+        }
       }
     }
   }
   if (status === 'q') {
     for (let i = 0; i < quotaData.length; i++) {
       const ele = quotaData[i]
-      if (((item.chartId && item.extField === 2 && item.tableId === ele.tableId) || ele.id === item.id) && ele.deType === item.deType && ele.groupType === item.groupType) {
-        checked = true
-        break
+      if (item.chartId) {
+        if (ele.dataeaseName === item.dataeaseName && ele.deType === item.deType && ele.groupType === item.groupType) {
+          checked = true
+          break
+        }
+      } else {
+        if (ele.id === item.id && ele.deType === item.deType && ele.groupType === item.groupType) {
+          checked = true
+          break
+        }
       }
     }
   }