From f183aad56b66196dbfe95772d3a501cc3a472b90 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 7 Sep 2023 15:02:55 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E9=85=8D=E7=BD=AE=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E6=97=B6=E5=8F=AA=E4=BF=9D=E7=95=99=E6=9C=89=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8D=A1=E9=A1=BF=E7=8E=B0=E8=B1=A1=20#5926?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/LinkageField.vue | 98 ++++++++++---------
 1 file changed, 54 insertions(+), 44 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/editor/LinkageField.vue b/core/frontend/src/components/canvas/components/editor/LinkageField.vue
index 50f3ff391f..fde3888639 100644
--- a/core/frontend/src/components/canvas/components/editor/LinkageField.vue
+++ b/core/frontend/src/components/canvas/components/editor/LinkageField.vue
@@ -120,7 +120,8 @@
         icon="el-icon-plus"
         round
         @click="addLinkageField(null,null)"
-      >追加联动依赖字段</el-button>
+      >追加联动依赖字段
+      </el-button>
     </el-row>
 
     <!--    <el-button slot="reference">T</el-button>-->
@@ -132,8 +133,9 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
-import { checkSameDataSet } from '@/api/chart/chart'
+import {mapState} from 'vuex'
+import {checkSameDataSet} from '@/api/chart/chart'
+
 export default {
 
   props: {
@@ -172,18 +174,24 @@ export default {
     },
     ...mapState([
       'targetLinkageInfo',
-      'curLinkageView'
+      'curLinkageView',
+      'panelViewDetailsInfo'
     ])
   },
   mounted() {
     const _this = this
     // 初始化映射关系 如果当前是相同的数据集且没有关联关系，则自动补充映射关系
     checkSameDataSet(this.curLinkageView.propValue.viewId, this.element.propValue.viewId).then(res => {
+      const chartDetails = JSON.parse(this.panelViewDetailsInfo[this.curLinkageView.propValue.viewId])
+      const curCheckAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt
+      const targetChartDetails = JSON.parse(this.panelViewDetailsInfo[this.element.propValue.viewId])
+      const targetCheckAllAxisStr = targetChartDetails.xaxis + targetChartDetails.xaxisExt + targetChartDetails.yaxis + targetChartDetails.yaxisExt
+
       if (res.data === 'YES' && this.linkageInfo.linkageFields.length === 0) {
         this.sourceLinkageInfo.targetViewFields.forEach(item => {
-          _this.$nextTick(() => {
+          if (curCheckAllAxisStr.includes(item.id)&&targetCheckAllAxisStr.includes(item.id)) {
             this.addLinkageField(item.id, item.id)
-          })
+          }
         })
       }
     })
@@ -213,46 +221,48 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .slot-class{
-    color: white;
-  }
+.slot-class {
+  color: white;
+}
 
-  .bottom {
-    margin-top: 20px;
-    text-align: center;
+.bottom {
+  margin-top: 20px;
+  text-align: center;
 
-  }
-  .ellip{
-    /*width: 100%;*/
-    margin-left: 10px;
-    margin-right: 10px;
-    overflow: hidden;/*超出部分隐藏*/
-    white-space: nowrap;/*不换行*/
-    text-overflow:ellipsis;/*超出部分文字以...显示*/
-    background-color: #f7f8fa;
-    color: #3d4d66;
-    font-size: 12px;
-    line-height: 24px;
-    height: 24px;
-    border-radius: 3px;
-  }
+}
 
-  .select-filed{
-    /*width: 100%;*/
-    margin-left: 10px;
-    margin-right: 10px;
-    overflow: hidden;/*超出部分隐藏*/
-    white-space: nowrap;/*不换行*/
-    text-overflow:ellipsis;/*超出部分文字以...显示*/
-    color: #3d4d66;
-    font-size: 12px;
-    line-height: 35px;
-    height: 35px;
-    border-radius: 3px;
-  }
-  ::v-deep .el-popover{
-    height: 200px;
-    overflow: auto;
-  }
+.ellip {
+  /*width: 100%;*/
+  margin-left: 10px;
+  margin-right: 10px;
+  overflow: hidden; /*超出部分隐藏*/
+  white-space: nowrap; /*不换行*/
+  text-overflow: ellipsis; /*超出部分文字以...显示*/
+  background-color: #f7f8fa;
+  color: #3d4d66;
+  font-size: 12px;
+  line-height: 24px;
+  height: 24px;
+  border-radius: 3px;
+}
+
+.select-filed {
+  /*width: 100%;*/
+  margin-left: 10px;
+  margin-right: 10px;
+  overflow: hidden; /*超出部分隐藏*/
+  white-space: nowrap; /*不换行*/
+  text-overflow: ellipsis; /*超出部分文字以...显示*/
+  color: #3d4d66;
+  font-size: 12px;
+  line-height: 35px;
+  height: 35px;
+  border-radius: 3px;
+}
+
+::v-deep .el-popover {
+  height: 200px;
+  overflow: auto;
+}
 
 </style>