center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #1996 from dataease/pr@dev@fix_panel-style

Browse Source 
fix: 过滤组件编辑弹框不正确
This commit is contained in:
王嘉豪 2022-03-29 17:13:25 +08:00 committed by GitHub
commit 872dde2fde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
View File

@ -5,7 +5,7 @@
@click="handleClick"
@mousedown="elementMouseDown"
>
<div :style="commonStyle">
<div :style="commonStyle" class="main_view">
<edit-bar v-if="componentActiveFlag" :element="config" @showViewDetails="showViewDetails" />
<close-bar v-if="previewVisible" @closePreview="closePreview" />
<de-out-widget
@ -107,7 +107,6 @@ export default {
style['background-color'] = hexColorToRGBA(this.config.commonBackground.color, this.config.commonBackground.alpha)
}
}
style['background-size'] = `100% 100%`
style['overflow'] = 'hidden'
}
return style
@ -228,4 +227,7 @@ export default {
width: 100% !important;
height: 100%;
}
.main_view{
background-size: 100% 100%!important;
}
</style>

23
frontend/src/components/canvas/components/Editor/SettingMenu.vue
View File

@ -46,24 +46,11 @@ export default {
]),
methods: {
edit() {
bus.$emit('change_panel_right_draw', true)
// // 编辑时临时保存 当前修改的画布
// this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData))
// this.$store.dispatch('panel/setCanvasStyleDataTemp', JSON.stringify(this.canvasStyleData))
// if (this.curComponent.type === 'view') {
// this.$store.dispatch('chart/setViewId', null)
// this.$store.dispatch('chart/setViewId', this.curComponent.propValue.viewId)
// bus.$emit('PanelSwitchComponent', { name: 'ChartEdit', param: { 'id': this.curComponent.propValue.viewId, 'optType': 'edit' }})
// }
// if (this.curComponent.type === 'custom') {
// bus.$emit('component-dialog-edit')
// }
//
// // 编辑样式组件
//
// if (this.curComponent.type === 'v-text' || this.curComponent.type === 'rect-shape') {
// bus.$emit('component-dialog-style')
// }
if (this.curComponent.type === 'custom') {
bus.$emit('component-dialog-edit')
} else if (this.curComponent.type === 'v-text' || this.curComponent.type === 'rect-shape') {
bus.$emit('component-dialog-style')
} else { bus.$emit('change_panel_right_draw', true) }
},
lock() {
this.$store.commit('lock')

2
frontend/src/store/modules/chart.js
View File

@ -3,7 +3,7 @@ const getDefaultState = () => {
sceneData: {},
table: {},
sceneId: {},
viewId: {},
viewId: null,
tableId: {},
chartSceneData: {}
}