From 788b583c6f78b67c4b0055cd5d03e1abc25796b8 Mon Sep 17 00:00:00 2001
From: Wangjiahao <1522128093@qq.com>
Date: Tue, 11 Jul 2023 08:06:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=81=94=E5=8A=A8=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E8=81=94=E5=8A=A8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8D=A1=E9=A1=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/ext/ExtPanelViewLinkageMapper.xml    |  2 +-
 .../canvas/components/editor/LinkageField.vue        | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelViewLinkageMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelViewLinkageMapper.xml
index 8fcc5c4476..88629926ca 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelViewLinkageMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelViewLinkageMapper.xml
@@ -61,7 +61,7 @@
        dataset_table_field.origin_name,
        dataset_table_field.`name`,
        dataset_table_field.de_type
-    from dataset_table_field where table_id = #{table_id}
+    from dataset_table_field where dataset_table_field.group_type = 'd' and table_id = #{table_id}
     </select>
 
     <select id="queryTableFieldWithViewId" resultMap="TableFieldMap">
diff --git a/frontend/src/components/canvas/components/editor/LinkageField.vue b/frontend/src/components/canvas/components/editor/LinkageField.vue
index ae39d47366..50f3ff391f 100644
--- a/frontend/src/components/canvas/components/editor/LinkageField.vue
+++ b/frontend/src/components/canvas/components/editor/LinkageField.vue
@@ -171,23 +171,19 @@ export default {
       return this.targetLinkageInfo[this.curLinkageView.propValue.viewId]
     },
     ...mapState([
-      'menuTop',
-      'menuLeft',
-      'menuShow',
-      'curComponent',
-      'componentData',
-      'canvasStyleData',
-      'linkageSettingStatus',
       'targetLinkageInfo',
       'curLinkageView'
     ])
   },
   mounted() {
+    const _this = this
     // 初始化映射关系 如果当前是相同的数据集且没有关联关系，则自动补充映射关系
     checkSameDataSet(this.curLinkageView.propValue.viewId, this.element.propValue.viewId).then(res => {
       if (res.data === 'YES' && this.linkageInfo.linkageFields.length === 0) {
         this.sourceLinkageInfo.targetViewFields.forEach(item => {
-          this.addLinkageField(item.id, item.id)
+          _this.$nextTick(() => {
+            this.addLinkageField(item.id, item.id)
+          })
         })
       }
     })