Merge branch 'dev' into pr@dev_memory_component

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,39 @@ export default {
     clearAllLinkage() {
       this.$store.commit('clearPanelLinkageInfo')
       bus.$emit('clear_panel_linkage', { viewId: 'all' })
+    },
+    back2Last() {
+      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>

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
+        }
       }
     }
   }

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,