From a2637e3cfd979cac10f923b5bedb5098fbfb079a Mon Sep 17 00:00:00 2001 From: Wangjiahao <1522128093@qq.com> Date: Wed, 21 Jun 2023 08:05:09 +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=E8=AE=BE=E7=BD=AE=E6=97=B6=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=A9=BA=E7=99=BD=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E4=BF=9D=E6=8C=81=E5=8E=9F=E9=80=89=E4=B8=AD=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/DeCanvas.vue | 3 ++- frontend/src/components/canvas/components/editor/EditBar.vue | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/DeCanvas.vue b/frontend/src/components/canvas/DeCanvas.vue index 5b0ed2085a..3ea8fbaa34 100644 --- a/frontend/src/components/canvas/DeCanvas.vue +++ b/frontend/src/components/canvas/DeCanvas.vue @@ -223,6 +223,7 @@ export default { 'curComponent', 'componentGap', 'isClickComponent', + 'linkageSettingStatus', 'pcMatrixCount', 'pcTabMatrixCount', 'dragComponentInfo', @@ -282,7 +283,7 @@ export default { }, deselectCurComponent(e) { - if (!this.isClickComponent) { + if (!this.isClickComponent && !this.linkageSettingStatus) { this.$store.commit('setCurComponent', { component: null, index: null }) } diff --git a/frontend/src/components/canvas/components/editor/EditBar.vue b/frontend/src/components/canvas/components/editor/EditBar.vue index e8cb8a3cb3..d8cddc65ee 100644 --- a/frontend/src/components/canvas/components/editor/EditBar.vue +++ b/frontend/src/components/canvas/components/editor/EditBar.vue @@ -374,7 +374,6 @@ export default { watch: { linkageAreaShow: { handler(val) { - console.log("linkageAreaShow、、、、") // 1.当前正在进行联动设置(val) 2.当前视图联动未启用!this.linkageInfo.linkageActive // 3.当前视图没有设置过当前目标联动!this.linkageInfo.sourceViewId // 4.数据集相同 this.linkageInfo.tableId === this.targetLinkageInfo[this.curLinkageView.propValue.viewId].tableId)