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

refactor: 组件间隙在有背景颜色时也保持一致

Browse Source
This commit is contained in:
wangjiahao 2022-01-14 10:57:36 +08:00
parent 6cfd2a9a13
commit c287b41afb
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/DeDrag/index.vue
View File

@ -535,7 +535,7 @@ export default {
return this.$store.state.curComponent return this.$store.state.curComponent
}, },
curGap() { curGap() {
return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix && this.element.type !== 'custom') ? this.componentGap : 0 return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix) ? this.componentGap : 0
}, },
...mapState([ ...mapState([
'editor', 'editor',

12
frontend/src/components/dataease/DeOutWidget.vue
View File

@ -161,12 +161,13 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.my-container { .my-container {
position: absolute; position: relative;
overflow: auto; overflow: auto;
top: 0px; top: 0px;
right: 0px; right: 0px;
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
border-radius: 5px;
} }
.ccondition-main { .ccondition-main {
@ -241,11 +242,12 @@ export default {
} }
.first-element-contaner { .first-element-contaner {
width: calc(100% - 10px); /*width: calc(100% - 10px);*/
width: 100%;
background: initial; background: initial;
position: absolute; position: absolute;
bottom: 5px; bottom: 0px;
margin: 0 4px; /*margin: 0 4px;*/
div { div {
width: 100%; width: 100%;
@ -258,7 +260,7 @@ export default {
.first-element-grid-contaner { .first-element-grid-contaner {
background: #fff; background: #fff;
border: 1px solid #d7dae2; border: 1px solid #d7dae2;
top: 5px; top: 0px;
} }
.condition-main-line { .condition-main-line {