From 0e05cedf6745f0bd5f86c6e45089f334be7fbb88 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 14 Jun 2022 12:27:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=84=E4=BB=B6=E7=9F=A9?=
=?UTF-8?q?=E9=98=B5=E6=A8=A1=E5=BC=8F=E9=9A=90=E8=97=8F=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=AD=E7=9A=84=E5=B1=82=E7=BA=A7=E8=AE=BE?=
=?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../canvas/components/Editor/ComponentWrapper.vue | 2 +-
.../components/canvas/components/Editor/SettingMenu.vue | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index db4c425878..057699fe77 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -149,7 +149,7 @@ export default {
return style
},
componentActiveFlag() {
- return (this.curComponent && this.config === this.curComponent) && !this.previewVisible
+ return (this.curComponent && this.config === this.curComponent) && !this.previewVisible && !this.showPosition.includes('multiplexing')
},
curGap() {
return (this.canvasStyleData.panel.gap === 'yes' && this.config.auxiliaryMatrix) ? this.componentGap : 0
diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue
index 22d3beb727..0fd838efa4 100644
--- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue
+++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue
@@ -7,7 +7,7 @@
{{ $t('panel.edit') }}
{{ $t('panel.copy') }}
{{ $t('panel.delete') }}
-
+
{{ $t('panel.level') }}
@@ -65,12 +65,8 @@ export default {
}
},
computed: mapState([
- 'menuTop',
- 'menuLeft',
- 'menuShow',
'curComponent',
- 'componentData',
- 'canvasStyleData'
+ 'componentData'
]),
methods: {
edit() {