From 4cfc07a10b18b5f2c5293625657d265762136eae Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 26 Oct 2022 17:20:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=82=B9=E5=87=BB=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E6=B2=A1=E5=8F=8D=E5=BA=94=20=E6=8A=A5=E9=94=99=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/components/DeDrag/index.vue | 1 -
frontend/src/components/canvas/components/Editor/EditBar.vue | 3 ++-
frontend/src/views/panel/edit/index.vue | 4 ++--
frontend/src/views/panel/list/PanelList.vue | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index ba4a5e3c35..2d38230a34 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -44,7 +44,6 @@
@resizeView="resizeView"
@linkJumpSet="linkJumpSet"
@boardSet="boardSet"
- @fieldSelect="fieldSelect"
/>
<mobile-check-bar
v-if="mobileCheckBarShow"
diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 1340650372..266f3175f3 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -200,7 +200,7 @@ export default {
},
sourceElement: {
type: Object,
- required: true
+ default: () => {}
},
element: {
type: Object,
@@ -433,6 +433,7 @@ export default {
this.$emit('resizeView')
},
edit() {
+ console.log('this.curComponent.type', this.curComponent.type)
if (this.curComponent.type === 'custom') {
bus.$emit('component-dialog-edit', 'update')
} else if (this.curComponent.type === 'custom-button') {
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 2bd4789f7f..3e59bb4386 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -811,8 +811,8 @@ export default {
},
initEvents() {
bus.$on('component-on-drag', this.componentOnDrag)
- // bus.$on('component-dialog-edit', this.editDialog)
- // bus.$on('button-dialog-edit', this.editButtonDialog)
+ bus.$on('component-dialog-edit', this.editDialog)
+ bus.$on('button-dialog-edit', this.editButtonDialog)
bus.$on('component-dialog-style', this.componentDialogStyle)
bus.$on('previewFullScreenClose', this.previewFullScreenClose)
bus.$on('change_panel_right_draw', this.changeRightDrawOpen)
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index a3b9b0d2e9..671f996f94 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -199,7 +199,7 @@
:command="beforeClickEdit('folder', 'new', data, node)"
>
<svg-icon icon-class="scene" />
- <span>{{ $t('panel.groupAdd') }}</span>
+ <span style="margin-left: 5px">{{ $t('panel.groupAdd') }}</span>
</el-dropdown-item>
<el-dropdown-item
:command="beforeClickEdit('panel', 'new', data, node)"
From d0ea11158fb9639af7b504ccab63df6f4e72aa2d Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 26 Oct 2022 17:23:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E6=89=93=E5=8D=B0?=
=?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/components/canvas/components/Editor/EditBar.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 266f3175f3..e969bf1bfc 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -433,7 +433,6 @@ export default {
this.$emit('resizeView')
},
edit() {
- console.log('this.curComponent.type', this.curComponent.type)
if (this.curComponent.type === 'custom') {
bus.$emit('component-dialog-edit', 'update')
} else if (this.curComponent.type === 'custom-button') {