From 3c87e6b917b86b5dc5210a09169134b6125ca67b Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 27 Jun 2022 14:15:10 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/ChartEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index f4107f066d..1d17a7817c 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -714,7 +714,7 @@
                       @onFunctionCfgChange="onFunctionCfgChange"
                     />
                   </el-collapse-item>
-                  <el-collapse-item v-if="false && view.type && (view.type.includes('table'))" name="scroll" :title="$t('chart.scroll_cfg')">
+                  <el-collapse-item v-if="view.type && (view.type.includes('table'))" name="scroll" :title="$t('chart.scroll_cfg')">
                     <scroll-cfg
                       :param="param"
                       class="attr-selector"

From e7774cb241438ebfe78ed4857f97c08c8cbb55f6 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 27 Jun 2022 14:16:58 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=BB=98=E8=AE=A4=E9=80=89=E9=A1=B9=E5=90=8E?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/DeWidget/DeDate.vue       | 3 +++
 .../src/components/widget/DeWidget/DeInputSearch.vue     | 5 ++++-
 .../src/components/widget/DeWidget/DeNumberRange.vue     | 7 +++++--
 frontend/src/components/widget/DeWidget/DeSelect.vue     | 9 ++++++---
 frontend/src/components/widget/DeWidget/DeSelectGrid.vue | 3 +++
 frontend/src/components/widget/DeWidget/DeSelectTree.vue | 7 +++++--
 6 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue
index 568ad3d463..83934b8679 100644
--- a/frontend/src/components/widget/DeWidget/DeDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeDate.vue
@@ -130,6 +130,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    bus.$off('reset-default-value')
+  },
   methods: {
     onBlur() {
       this.onFocus = false
diff --git a/frontend/src/components/widget/DeWidget/DeInputSearch.vue b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
index 56987e306c..da83bef29e 100644
--- a/frontend/src/components/widget/DeWidget/DeInputSearch.vue
+++ b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
@@ -2,12 +2,12 @@
 
   <el-input
     v-if="element.options!== null && element.options.attrs!==null"
+    ref="de-input-search"
     v-model="value"
     resize="vertical"
     :placeholder="$t(element.options.attrs.placeholder)"
     :size="size"
     class="de-range-tag"
-    ref="de-input-search"
     @input="valueChange"
     @keypress.enter.native="search"
     @dblclick="setEdit"
@@ -78,6 +78,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    bus.$off('reset-default-value')
+  },
   methods: {
     search() {
       if (!this.inDraw) {
diff --git a/frontend/src/components/widget/DeWidget/DeNumberRange.vue b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
index fcdde09fb5..6a5a5a34b4 100644
--- a/frontend/src/components/widget/DeWidget/DeNumberRange.vue
+++ b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
@@ -3,11 +3,11 @@
   <el-form v-if="element.options!== null && element.options.attrs!==null" ref="form" :model="form" :rules="rules">
     <div class="de-number-range-container">
       <el-form-item prop="min">
-        <el-input ref='de-number-range-min' v-model="form.min" :placeholder="$t(element.options.attrs.placeholder_min)" :size="size" @input="inputChange" @change="handleMinChange" />
+        <el-input ref="de-number-range-min" v-model="form.min" :placeholder="$t(element.options.attrs.placeholder_min)" :size="size" @input="inputChange" @change="handleMinChange" />
       </el-form-item>
       <span>{{ $t('denumberrange.split_placeholder') }}</span>
       <el-form-item prop="max">
-        <el-input ref='de-number-range-max' v-model="form.max" :placeholder="$t(element.options.attrs.placeholder_max)" :size="size" @input="inputChange" @change="handleMaxChange" />
+        <el-input ref="de-number-range-max" v-model="form.max" :placeholder="$t(element.options.attrs.placeholder_max)" :size="size" @input="inputChange" @change="handleMaxChange" />
       </el-form-item>
     </div>
   </el-form>
@@ -115,6 +115,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    bus.$off('reset-default-value')
+  },
   methods: {
     searchWithKey(index) {
       this.timeMachine = setTimeout(() => {
diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue
index 025bfbe66d..cbbceea3f6 100644
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@@ -37,7 +37,7 @@ import { multFieldValues, linkMultFieldValues } from '@/api/dataset/dataset'
 import bus from '@/utils/bus'
 import { getLinkToken, getToken } from '@/utils/auth'
 import customInput from '@/components/widget/DeWidget/customInput'
-import {  textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
+import { textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
 
 export default {
   components: { ElVisualSelect },
@@ -182,6 +182,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    bus.$off('reset-default-value')
+  },
 
   methods: {
     onBlur() {
@@ -189,7 +192,7 @@ export default {
     },
     handleElTagStyle() {
       setTimeout(() => {
-        textSelectWidget(this.$refs["deSelect"].$el, this.element.style)
+        textSelectWidget(this.$refs['deSelect'].$el, this.element.style)
       }, 50)
     },
     initLoad() {
@@ -240,12 +243,12 @@ export default {
     },
 
     setCondition() {
-      console.log(this.element)
       const param = {
         component: this.element,
         value: this.formatFilterValue(),
         operator: this.operator
       }
+      console.log(param.value)
       this.inDraw && this.$store.commit('addViewFilter', param)
     },
     formatFilterValue() {
diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
index b94c9af63b..5a66ed6150 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
@@ -211,6 +211,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    bus.$off('reset-default-value')
+  },
 
   methods: {
     changeInputStyle() {
diff --git a/frontend/src/components/widget/DeWidget/DeSelectTree.vue b/frontend/src/components/widget/DeWidget/DeSelectTree.vue
index 132277d55f..6907204013 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectTree.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectTree.vue
@@ -27,7 +27,7 @@ import bus from '@/utils/bus'
 import { getLinkToken, getToken } from '@/utils/auth'
 import ElTreeSelect from '@/components/ElTreeSelect'
 import customInput from '@/components/widget/DeWidget/customInput'
-import {  textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
+import { textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
 
 export default {
   components: { ElTreeSelect },
@@ -212,6 +212,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    bus.$off('reset-default-value')
+  },
 
   methods: {
     onFoucs() {
@@ -221,7 +224,7 @@ export default {
     },
     change() {
       setTimeout(() => {
-        console.log(123, this.$refs.deSelectTree.$refs.select.$el);
+        console.log(123, this.$refs.deSelectTree.$refs.select.$el)
         textSelectWidget(this.$refs.deSelectTree.$refs.select.$el, this.element.style)
       }, 50)
     },

From 6deecb4569980c5cd88cf72afae7280f6aa99bef Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 27 Jun 2022 15:39:41 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E4=B8=8B=E6=8B=89=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=99=A8=E6=95=B0=E6=8D=AE=E9=87=8F=E5=A4=A7=E5=8D=A1=E9=A1=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/ElVisualSelect/index.vue       | 10 ++++++++++
 frontend/src/components/widget/DeWidget/DeSelect.vue   |  5 ++++-
 .../views/panel/filter/filterMain/FilterControl.vue    |  2 --
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/ElVisualSelect/index.vue b/frontend/src/components/ElVisualSelect/index.vue
index 5338d70b59..3799166a96 100644
--- a/frontend/src/components/ElVisualSelect/index.vue
+++ b/frontend/src/components/ElVisualSelect/index.vue
@@ -4,8 +4,10 @@
     v-model="selectValue"
     :class="classId"
     popper-class="VisualSelects"
+    no-match-text=" "
     v-bind="$attrs"
     v-on="$listeners"
+    @change="visualChange"
     @visible-change="popChange"
   >
     <el-option v-for="item in options" :key="item.id" :label="item.text" :value="item.id" />
@@ -54,6 +56,9 @@ export default {
     }
   },
   watch: {
+    value(val) {
+      this.selectValue = val
+    },
     selectValue(val) {
       this.$emit('update', val)
       if (!val) {
@@ -102,6 +107,7 @@ export default {
       )
       this.scrollbar = document.querySelector(`.${this.classId} .el-select-dropdown .el-scrollbar`)
       this.slectBoxDom = document.querySelector(`.${this.classId} .el-select-dropdown__wrap`)
+      if (!this.slectBoxDom || !this.slectBoxDom.style) return
       this.slectBoxDom.style.display = 'flex'
       this.slectBoxDom.style.flexDirection = 'row'
       this.domList = selectDom.querySelector(
@@ -117,6 +123,7 @@ export default {
     },
 
     callback() {
+      if (!this.scrollbar) return
       const scrollTop = this.scrollbar.scrollTop
       this.startIndex = parseInt(scrollTop / this.itemHeight)
       this.endIndex = this.startIndex + this.maxLength
@@ -129,6 +136,9 @@ export default {
 
       this.resetList()
       this.reCacularHeight()
+    },
+    visualChange(val) {
+      this.$emit('visual-change', val)
     }
   }
 
diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue
index cbbceea3f6..1cbdf5a8da 100644
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@@ -17,6 +17,7 @@
     @change="changeValue"
     @focus="setOptionWidth"
     @blur="onBlur"
+    @visual-change="visualChange"
   >
     <el-option
       v-for="item in templateDatas || datas"
@@ -214,6 +215,9 @@ export default {
         this.changeValue(this.value)
       }
     },
+    visualChange(value) {
+      this.value = value
+    },
     changeValue(value) {
       if (!this.inDraw) {
         if (value === null) {
@@ -248,7 +252,6 @@ export default {
         value: this.formatFilterValue(),
         operator: this.operator
       }
-      console.log(param.value)
       this.inDraw && this.$store.commit('addViewFilter', param)
     },
     formatFilterValue() {
diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index 89d512f8f0..fc0b68609b 100644
--- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -140,8 +140,6 @@ export default {
 
   created() {
     this.attrs = this.controlAttrs
-    console.log(this.childViews)
-    console.log(this.attrs)
   },
   methods: {
     multipleChange(value) {

From cd4ba8d83002e78e6fd81dfd5841e0dedd804949 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 27 Jun 2022 16:06:42 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/ChartComponentS2.vue  | 2 +-
 frontend/src/views/chart/components/table/TableNormal.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue
index ed34393e31..839e890a96 100644
--- a/frontend/src/views/chart/components/ChartComponentS2.vue
+++ b/frontend/src/views/chart/components/ChartComponentS2.vue
@@ -389,7 +389,7 @@ export default {
       this.myChart.store.set('scrollY', this.scrollTop)
       this.myChart.render()
 
-      if (senior.scrollCfg.open && (this.chart.type === 'table-normal' || (this.chart.type === 'table-info' && !this.showPage))) {
+      if (senior.scroll && senior.scrollCfg.open && (this.chart.type === 'table-normal' || (this.chart.type === 'table-info' && !this.showPage))) {
         const rowHeight = customAttr.size.tableItemHeight
         const headerHeight = customAttr.size.tableTitleHeight
 
diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue
index 730c5e9f8b..a675b1833d 100644
--- a/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/frontend/src/views/chart/components/table/TableNormal.vue
@@ -382,7 +382,7 @@ export default {
         })
       }, 0)
 
-      if (senior.scrollCfg.open && (this.chart.type === 'table-normal' || (this.chart.type === 'table-info' && !this.showPage))) {
+      if (senior.scrollCfg && senior.scrollCfg.open && (this.chart.type === 'table-normal' || (this.chart.type === 'table-info' && !this.showPage))) {
         let rowHeight = customAttr.size.tableItemHeight
         if (rowHeight < 36) {
           rowHeight = 36

From cbf0391780e6ff7d059f2b1f017052ac4bb1a5c4 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 27 Jun 2022 16:34:31 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E5=9B=BE=E8=A1=A8=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/chart/util/ChartDataBuild.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
index 0a41641748..bff4282568 100644
--- a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
+++ b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
@@ -127,6 +127,7 @@ public class ChartDataBuild {
                     }
                 }
                 axisChartDataDTO.setField(a.toString());
+                axisChartDataDTO.setName(a.toString());
                 axisChartDataDTO.setCategory(row[xAxis.size()]);
 
                 List<ChartDimensionDTO> dimensionList = new ArrayList<>();
@@ -177,6 +178,7 @@ public class ChartDataBuild {
                 for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) {
                     AxisChartDataAntVDTO axisChartDataDTO = new AxisChartDataAntVDTO();
                     axisChartDataDTO.setField(a.toString());
+                    axisChartDataDTO.setName(a.toString());
 
                     List<ChartDimensionDTO> dimensionList = new ArrayList<>();
                     List<ChartQuotaDTO> quotaList = new ArrayList<>();
@@ -232,6 +234,7 @@ public class ChartDataBuild {
             for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) {
                 AxisChartDataAntVDTO axisChartDataDTO = new AxisChartDataAntVDTO();
                 axisChartDataDTO.setField(a.toString());
+                axisChartDataDTO.setName(a.toString());
 
                 List<ChartDimensionDTO> dimensionList = new ArrayList<>();
                 List<ChartQuotaDTO> quotaList = new ArrayList<>();

From 03f83d82d5ccd6f89b3469e1681d3c83c26ea910 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 27 Jun 2022 16:49:22 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20antV=E5=9B=BE=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/CanvasOptBar.vue |  2 +
 .../canvas/components/Editor/EditBar.vue      | 18 +------
 .../canvas/custom-component/UserView.vue      |  5 ++
 frontend/src/store/index.js                   |  1 -
 .../src/views/chart/chart/bar/bar_antv.js     |  6 ---
 .../views/chart/chart/funnel/funnel_antv.js   |  6 ---
 .../src/views/chart/chart/line/line_antv.js   |  6 ---
 .../src/views/chart/chart/mix/mix_antv.js     | 12 -----
 .../src/views/chart/chart/pie/pie_antv.js     |  6 ---
 .../src/views/chart/chart/radar/radar_antv.js |  6 ---
 .../views/chart/chart/scatter/scatter_antv.js |  6 ---
 .../views/chart/chart/treemap/treemap_antv.js |  6 ---
 .../views/chart/chart/waterfall/waterfall.js  |  6 ---
 .../views/chart/chart/wordCloud/word_cloud.js |  6 ---
 .../chart/components/ChartComponentG2.vue     | 51 ++++++++++++++++++-
 15 files changed, 58 insertions(+), 85 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/CanvasOptBar.vue b/frontend/src/components/canvas/components/Editor/CanvasOptBar.vue
index 9043554a02..1c95b2c34d 100644
--- a/frontend/src/components/canvas/components/Editor/CanvasOptBar.vue
+++ b/frontend/src/components/canvas/components/Editor/CanvasOptBar.vue
@@ -8,6 +8,7 @@
 
 <script>
 import { mapState } from 'vuex'
+import bus from '@/utils/bus'
 
 export default {
   computed: {
@@ -27,6 +28,7 @@ export default {
   methods: {
     clearAllLinkage() {
       this.$store.commit('clearPanelLinkageInfo')
+      bus.$emit('clear_panel_linkage', { viewId: 'all' })
     }
   }
 }
diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 7194ec93af..9ab79f5995 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -196,23 +196,6 @@ export default {
       // resize
       this.$emit('resizeView')
     },
-    // edit() {
-    //   // 编辑时临时保存 当前修改的画布
-    //   this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData))
-    //   this.$store.dispatch('panel/setCanvasStyleDataTemp', JSON.stringify(this.canvasStyleData))
-    //   if (this.curComponent.type === 'view') {
-    //     this.$store.dispatch('chart/setViewId', null)
-    //     this.$store.dispatch('chart/setViewId', this.curComponent.propValue.viewId)
-    //     bus.$emit('PanelSwitchComponent', { name: 'ChartEdit', param: { 'id': this.curComponent.propValue.viewId, 'optType': 'edit' }})
-    //   }
-    //   if (this.curComponent.type === 'custom') {
-    //     bus.$emit('component-dialog-edit')
-    //   }
-    //   // 编辑样式组件
-    //   if (this.curComponent.type === 'v-text' || this.curComponent.type === 'rect-shape') {
-    //     bus.$emit('component-dialog-style')
-    //   }
-    // },
     edit() {
       if (this.curComponent.type === 'custom') {
         bus.$emit('component-dialog-edit')
@@ -240,6 +223,7 @@ export default {
           }
         }
       })
+      bus.$emit('clear_panel_linkage', { viewId: this.element.propValue.viewId })
     },
     linkJumpSet() {
       this.$emit('linkJumpSet')
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 393dd0f0f5..3075c9402e 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -492,6 +492,11 @@ export default {
       bus.$on('onThemeAttrChange', (param) => {
         this.optFromBatchSingleProp(param)
       })
+      bus.$on('clear_panel_linkage', (param) => {
+        if (param.viewId === 'all' || param.viewId === this.element.propValue.viewId) {
+          this.$refs[this.element.propValue.id].reDrawView()
+        }
+      })
     },
 
     addViewTrackFilter(linkageParam) {
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index af8c7ca9aa..d716637351 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -481,7 +481,6 @@ const data = {
           item.linkageFilters.splice(0, item.linkageFilters.length)
         }
       })
-      // state.styleChangeTimes++
     },
     setDragComponentInfo(state, dragComponentInfo) {
       dragComponentInfo['shadowStyle'] = {
diff --git a/frontend/src/views/chart/chart/bar/bar_antv.js b/frontend/src/views/chart/chart/bar/bar_antv.js
index 96e127edac..66ca26cb34 100644
--- a/frontend/src/views/chart/chart/bar/bar_antv.js
+++ b/frontend/src/views/chart/chart/bar/bar_antv.js
@@ -43,12 +43,6 @@ export function baseBarOptionAntV(plot, container, chart, action, isGroup, isSta
     slider: slider,
     annotations: analyse,
     interactions: [
-      {
-        type: 'element-active', cfg: {
-          start: [{ trigger: 'element:mouseenter', action: ['element-highlight:highlight', 'element-active:reset', 'cursor:pointer'] }],
-          end: [{ trigger: 'element:mouseleave', action: ['element-highlight:reset', 'element-active:reset', 'cursor:default'] }]
-        }
-      },
       {
         type: 'legend-active', cfg: {
           start: [{ trigger: 'legend-item:mouseenter', action: ['element-active:reset'] }],
diff --git a/frontend/src/views/chart/chart/funnel/funnel_antv.js b/frontend/src/views/chart/chart/funnel/funnel_antv.js
index 4e6daf3b9f..6d12901088 100644
--- a/frontend/src/views/chart/chart/funnel/funnel_antv.js
+++ b/frontend/src/views/chart/chart/funnel/funnel_antv.js
@@ -24,12 +24,6 @@ export function baseFunnelOptionAntV(plot, container, chart, action) {
     legend: legend,
     conversionTag: false,
     interactions: [
-      {
-        type: 'element-active', cfg: {
-          start: [{ trigger: 'element:mouseenter', action: ['element-highlight:highlight', 'element-active:reset', 'cursor:pointer'] }],
-          end: [{ trigger: 'element:mouseleave', action: ['element-highlight:reset', 'element-active:reset', 'cursor:default'] }]
-        }
-      },
       {
         type: 'legend-active', cfg: {
           start: [{ trigger: 'legend-item:mouseenter', action: ['element-active:reset'] }],
diff --git a/frontend/src/views/chart/chart/line/line_antv.js b/frontend/src/views/chart/chart/line/line_antv.js
index d4017b2d44..78ec7ca7d3 100644
--- a/frontend/src/views/chart/chart/line/line_antv.js
+++ b/frontend/src/views/chart/chart/line/line_antv.js
@@ -44,12 +44,6 @@ export function baseLineOptionAntV(plot, container, chart, action) {
     slider: slider,
     annotations: analyse,
     interactions: [
-      {
-        type: 'element-active', cfg: {
-          start: [{ trigger: 'element:mouseenter', action: ['element-highlight:highlight', 'element-active:reset', 'cursor:pointer'] }],
-          end: [{ trigger: 'element:mouseleave', action: ['element-highlight:reset', 'element-active:reset', 'cursor:default'] }]
-        }
-      },
       {
         type: 'legend-active', cfg: {
           start: [{ trigger: 'legend-item:mouseenter', action: ['element-active:reset'] }],
diff --git a/frontend/src/views/chart/chart/mix/mix_antv.js b/frontend/src/views/chart/chart/mix/mix_antv.js
index 8298d79b5c..89ae65d244 100644
--- a/frontend/src/views/chart/chart/mix/mix_antv.js
+++ b/frontend/src/views/chart/chart/mix/mix_antv.js
@@ -54,18 +54,6 @@ export function baseMixOptionAntV(plot, container, chart, action) {
         xAxis: i > 0 ? false : xAxis,
         yAxis: (i >= JSON.parse(chart.yaxis).length) ? yAxisExt : yAxis,
         interactions: [
-          {
-            type: 'element-active', cfg: {
-              start: [{
-                trigger: 'element:mouseenter',
-                action: ['element-highlight:highlight', 'element-active:reset', 'cursor:pointer']
-              }],
-              end: [{
-                trigger: 'element:mouseleave',
-                action: ['element-highlight:reset', 'element-active:reset', 'cursor:default']
-              }]
-            }
-          },
           {
             type: 'legend-active', cfg: {
               start: [{ trigger: 'legend-item:mouseenter', action: ['element-active:reset'] }],
diff --git a/frontend/src/views/chart/chart/pie/pie_antv.js b/frontend/src/views/chart/chart/pie/pie_antv.js
index 7eb3c42d40..0ef801f74d 100644
--- a/frontend/src/views/chart/chart/pie/pie_antv.js
+++ b/frontend/src/views/chart/chart/pie/pie_antv.js
@@ -44,12 +44,6 @@ export function basePieOptionAntV(plot, container, chart, action) {
       }
     },
     interactions: [
-      {
-        type: 'element-active', cfg: {
-          start: [{ trigger: 'element:mouseenter', action: ['element-highlight:highlight', 'element-active:reset', 'cursor:pointer'] }],
-          end: [{ trigger: 'element:mouseleave', action: ['element-highlight:reset', 'element-active:reset', 'cursor:default'] }]
-        }
-      },
       {
         type: 'legend-active', cfg: {
           start: [{ trigger: 'legend-item:mouseenter', action: ['element-active:reset'] }],
diff --git a/frontend/src/views/chart/chart/radar/radar_antv.js b/frontend/src/views/chart/chart/radar/radar_antv.js
index 115a336276..1780c1a4b4 100644
--- a/frontend/src/views/chart/chart/radar/radar_antv.js
+++ b/frontend/src/views/chart/chart/radar/radar_antv.js
@@ -41,12 +41,6 @@ export function baseRadarOptionAntV(plot, container, chart, action) {
       }
     },
     interactions: [
-      {
-        type: 'element-active', cfg: {
-          start: [{ trigger: 'element:mouseenter', action: ['element-highlight:highlight', 'element-active:reset', 'cursor:pointer'] }],
-          end: [{ trigger: 'element:mouseleave', action: ['element-highlight:reset', 'element-active:reset', 'cursor:default'] }]
-        }
-      },
       {
         type: 'legend-active', cfg: {
           start: [{ trigger: 'legend-item:mouseenter', action: ['element-active:reset'] }],
diff --git a/frontend/src/views/chart/chart/scatter/scatter_antv.js b/frontend/src/views/chart/chart/scatter/scatter_antv.js
index 6bfc0529a6..d9ca30cc85 100644
--- a/frontend/src/views/chart/chart/scatter/scatter_antv.js
+++ b/frontend/src/views/chart/chart/scatter/scatter_antv.js
@@ -47,12 +47,6 @@ export function baseScatterOptionAntV(plot, container, chart, action) {
       lineWidth: 0
     },
     interactions: [
-      {
-        type: 'element-active', cfg: {
-          start: [{ trigger: 'element:mouseenter', action: ['element-highlight:highlight', 'element-active:reset', 'cursor:pointer'] }],
-          end: [{ trigger: 'element:mouseleave', action: ['element-highlight:reset', 'element-active:reset', 'cursor:default'] }]
-        }
-      },
       {
         type: 'legend-active', cfg: {
           start: [{ trigger: 'legend-item:mouseenter', action: ['element-active:reset'] }],
diff --git a/frontend/src/views/chart/chart/treemap/treemap_antv.js b/frontend/src/views/chart/chart/treemap/treemap_antv.js
index a592a93333..ea695a290c 100644
--- a/frontend/src/views/chart/chart/treemap/treemap_antv.js
+++ b/frontend/src/views/chart/chart/treemap/treemap_antv.js
@@ -24,12 +24,6 @@ export function baseTreemapOptionAntV(plot, container, chart, action) {
     tooltip: tooltip,
     legend: legend,
     interactions: [
-      {
-        type: 'element-active', cfg: {
-          start: [{ trigger: 'element:mouseenter', action: ['element-highlight:highlight', 'element-active:reset', 'cursor:pointer'] }],
-          end: [{ trigger: 'element:mouseleave', action: ['element-highlight:reset', 'element-active:reset', 'cursor:default'] }]
-        }
-      },
       {
         type: 'legend-active', cfg: {
           start: [{ trigger: 'legend-item:mouseenter', action: ['element-active:reset'] }],
diff --git a/frontend/src/views/chart/chart/waterfall/waterfall.js b/frontend/src/views/chart/chart/waterfall/waterfall.js
index 2bb2ff8d03..10849c082a 100644
--- a/frontend/src/views/chart/chart/waterfall/waterfall.js
+++ b/frontend/src/views/chart/chart/waterfall/waterfall.js
@@ -69,12 +69,6 @@ export function baseWaterfallOptionAntV(plot, container, chart, action) {
     fallingFill: theme.styleSheet.paletteQualitative10[1],
     total: total,
     interactions: [
-      {
-        type: 'element-active', cfg: {
-          start: [{ trigger: 'element:mouseenter', action: ['element-highlight:highlight', 'element-active:reset', 'cursor:pointer'] }],
-          end: [{ trigger: 'element:mouseleave', action: ['element-highlight:reset', 'element-active:reset', 'cursor:default'] }]
-        }
-      },
       {
         type: 'tooltip', cfg: {
           start: [{ trigger: 'interval:mousemove', action: 'tooltip:show' }],
diff --git a/frontend/src/views/chart/chart/wordCloud/word_cloud.js b/frontend/src/views/chart/chart/wordCloud/word_cloud.js
index 7e1d29e30e..af7000e998 100644
--- a/frontend/src/views/chart/chart/wordCloud/word_cloud.js
+++ b/frontend/src/views/chart/chart/wordCloud/word_cloud.js
@@ -30,12 +30,6 @@ export function baseWordCloudOptionAntV(plot, container, chart, action) {
     tooltip: tooltip,
     legend: false,
     interactions: [
-      {
-        type: 'element-active', cfg: {
-          start: [{ trigger: 'element:mouseenter', action: ['element-highlight:highlight', 'element-active:reset', 'cursor:pointer'] }],
-          end: [{ trigger: 'element:mouseleave', action: ['element-highlight:reset', 'element-active:reset', 'cursor:default'] }]
-        }
-      }
     ]
   }
 
diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue
index 3fbbac736a..3e20adfe5f 100644
--- a/frontend/src/views/chart/components/ChartComponentG2.vue
+++ b/frontend/src/views/chart/components/ChartComponentG2.vue
@@ -82,7 +82,10 @@ export default {
         background: ''
       },
       title_show: true,
-      antVRenderStatus: false
+      antVRenderStatus: false,
+      linkageActiveParam: null,
+      linkageActiveHistory: false
+
     }
   },
 
@@ -115,6 +118,43 @@ export default {
     this.preDraw()
   },
   methods: {
+    reDrawView() {
+      this.linkageActiveHistory = false
+      this.myChart.render()
+    },
+    linkageActivePre() {
+      if (this.linkageActiveHistory) {
+        this.reDrawView()
+      }
+      this.$nextTick(() => {
+        this.linkageActive()
+      })
+    },
+    linkageActive() {
+      this.linkageActiveHistory = true
+      this.myChart.setState('selected', (param) => {
+        if (Array.isArray(param)) {
+          return false
+        } else {
+          if (this.checkSelected(param)) {
+            return true
+          }
+        }
+      })
+      this.myChart.setState('inactive', (param) => {
+        if (Array.isArray(param)) {
+          return false
+        } else {
+          if (!this.checkSelected(param)) {
+            return true
+          }
+        }
+      })
+    },
+    checkSelected(param) {
+      return (this.linkageActiveParam.name.indexOf(param.name) > -1) &&
+        (this.linkageActiveParam.category === param.category)
+    },
     preDraw() {
       this.initTitle()
       this.calcHeightDelay()
@@ -186,6 +226,9 @@ export default {
 
       if (this.antVRenderStatus) {
         this.myChart.render()
+        if (this.linkageActiveHistory) {
+          this.linkageActive()
+        }
       }
       this.setBackGroundBorder()
     },
@@ -196,6 +239,10 @@ export default {
       } else {
         this.pointParam = param.data
       }
+      this.linkageActiveParam = {
+        category: this.pointParam.data.category ? this.pointParam.data.category : 'NO_DATA',
+        name: this.pointParam.data.name ? this.pointParam.data.name : 'NO_DATA'
+      }
       if (this.trackMenu.length < 2) { // 只有一个事件直接调用
         this.trackClick(this.trackMenu[0])
       } else { // 视图关联多个事件
@@ -236,11 +283,13 @@ export default {
         dimensionList: this.pointParam.data.dimensionList,
         quotaList: this.pointParam.data.quotaList
       }
+
       switch (trackAction) {
         case 'drill':
           this.$emit('onChartClick', this.pointParam)
           break
         case 'linkage':
+          this.linkageActivePre()
           this.$store.commit('addViewTrackFilter', linkageParam)
           break
         case 'jump':

From 2af5895a311a58fba2585d075deed38e21d6200c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 27 Jun 2022 17:07:40 +0800
Subject: [PATCH 7/7] =?UTF-8?q?refactor:=20antv=E7=8E=AB=E7=91=B0=E5=9B=BE?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=81=94=E5=8A=A8=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/pie/pie_antv.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/frontend/src/views/chart/chart/pie/pie_antv.js b/frontend/src/views/chart/chart/pie/pie_antv.js
index 0ef801f74d..81a7812067 100644
--- a/frontend/src/views/chart/chart/pie/pie_antv.js
+++ b/frontend/src/views/chart/chart/pie/pie_antv.js
@@ -127,12 +127,6 @@ export function basePieRoseOptionAntV(plot, container, chart, action) {
       }
     },
     interactions: [
-      {
-        type: 'element-active', cfg: {
-          start: [{ trigger: 'element:mouseenter', action: ['element-highlight:highlight', 'element-active:reset', 'cursor:pointer'] }],
-          end: [{ trigger: 'element:mouseleave', action: ['element-highlight:reset', 'element-active:reset', 'cursor:default'] }]
-        }
-      },
       {
         type: 'legend-active', cfg: {
           start: [{ trigger: 'legend-item:mouseenter', action: ['element-active:reset'] }],