From 84f68f1e4a8af29865b9c732026411ff3458ff7a Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 23 Apr 2021 12:12:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(frontend):=E5=89=8D=E7=AB=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/group/Group.vue    |  6 +++---
 frontend/src/views/chart/view/ChartEdit.vue | 24 +++++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index e15470f6fd..97c62da98d 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -516,9 +516,9 @@ export default {
     },
 
     sceneClick(data, node) {
-      this.$store.dispatch('chart/setViewId', null)
-      this.$store.dispatch('chart/setViewId', data.id)
-      this.$emit('switchComponent', { name: 'ChartEdit' })
+      // this.$store.dispatch('chart/setViewId', null)
+      // this.$store.dispatch('chart/setViewId', data.id)
+      this.$emit('switchComponent', { name: 'ChartEdit', param: { 'id': data.id }})
     },
 
     selectTable() {
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index e1b3817c0e..9f490e1a4e 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row style="height: 100%;overflow-y: hidden;width: 100%;">
-    <span v-show="false">{{ vId }}</span>
+<!--    <span v-show="false">{{ vId }}</span>-->
     <el-row style="height: 40px;background-color: white" class="padding-lr">
       <el-popover
         placement="right-start"
@@ -266,6 +266,12 @@ import QuotaFilterEditor from '../components/filter/QuotaFilterEditor'
 export default {
   name: 'ChartEdit',
   components: { DatasetChartDetail, QuotaFilterEditor, BackgroundColorSelector, FilterItem, XAxisSelector, YAxisSelector, TooltipSelector, LabelSelector, LegendSelector, TitleSelector, SizeSelector, ColorSelector, ChartComponent, QuotaItem, DimensionItem, draggable },
+  props: {
+    param: {
+      type: Object,
+      required: true
+    }
+  },
   data() {
     return {
       table: {},
@@ -311,21 +317,25 @@ export default {
     }
   },
   computed: {
-    vId() {
-      // console.log(this.$store.state.chart.viewId);
-      this.getData(this.$store.state.chart.viewId)
-      return this.$store.state.chart.viewId
-    }
+    // vId() {
+    //   // console.log(this.$store.state.chart.viewId);
+    //   this.getData(this.$store.state.chart.viewId)
+    //   return this.$store.state.chart.viewId
+    // }
 
   },
   watch: {
+    'param': function() {
+      console.log(this.param)
+      this.getData(this.param.id)
+    }
   },
   created() {
     // this.get(this.$store.state.chart.viewId);
   },
   mounted() {
     // this.get(this.$store.state.chart.viewId);
-    this.getData(this.$store.state.chart.viewId)
+    this.getData(this.param.id)
     // this.myEcharts();
   },
   activated() {