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)