From 0625fe4954ae399b72ac7d822eff8e8ba2825973 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 5 Jul 2022 16:12:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=BC=96=E8=BE=91=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E5=90=8E=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=9A=E4=BD=BF=E7=94=A8=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/components/Editor/EditBar.vue    |  2 +-
 .../canvas/components/Editor/SettingMenu.vue           |  2 +-
 frontend/src/views/panel/edit/index.vue                | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 9ab79f5995..099dcb5491 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -198,7 +198,7 @@ export default {
     },
     edit() {
       if (this.curComponent.type === 'custom') {
-        bus.$emit('component-dialog-edit')
+        bus.$emit('component-dialog-edit', 'update')
       } else if (this.curComponent.type === 'v-text' || this.curComponent.type === 'de-rich-text' || this.curComponent.type === 'rect-shape') {
         bus.$emit('component-dialog-style')
       } else { bus.$emit('change_panel_right_draw', true) }
diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue
index 0fd838efa4..2fb4132f52 100644
--- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue
+++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue
@@ -71,7 +71,7 @@ export default {
   methods: {
     edit() {
       if (this.curComponent.type === 'custom') {
-        bus.$emit('component-dialog-edit')
+        bus.$emit('component-dialog-edit', 'update')
       } else if (this.curComponent.type === 'v-text' || this.curComponent.type === 'de-rich-text' || this.curComponent.type === 'rect-shape') {
         bus.$emit('component-dialog-style')
       } else { bus.$emit('change_panel_right_draw', true) }
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index ee74110983..26640757b6 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -450,7 +450,8 @@ export default {
       enableSureButton: false,
       filterFromDrag: false,
       activeToolsName: 'view',
-      rightDrawOpen: false
+      rightDrawOpen: false,
+      editType: null
     }
   },
 
@@ -891,7 +892,9 @@ export default {
     },
     sureFilter() {
       this.currentFilterCom = this.$refs['filter-setting-' + this.currentFilterCom.id].getElementInfo()
-      adaptCurThemeCommonStyle(this.currentFilterCom)
+      if (this.editType !== 'update') {
+        adaptCurThemeCommonStyle(this.currentFilterCom)
+      }
       this.$store.commit('setComponentWithId', this.currentFilterCom)
       this.$store.commit('recordSnapshot', 'sureFilter')
       this.$store.commit('setCurComponent', { component: this.currentFilterCom, index: this.curComponentIndex })
@@ -902,7 +905,8 @@ export default {
       this.currentFilterCom = component
       this.$forceUpdate()
     },
-    editDialog() {
+    editDialog(editType) {
+      this.editType = editType
       if (this.curComponent && this.curComponent.serviceName) {
         const serviceName = this.curComponent.serviceName
         this.currentWidget = ApplicationContext.getService(serviceName)