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

Merge pull request #181 from dataease/pr@dev@panel

Browse Source 
Pr@dev@panel
This commit is contained in:
王嘉豪 2021-07-08 11:18:56 +08:00 committed by GitHub
commit 10f8f52169
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/canvas/components/Editor/ContextMenu.vue
View File

@ -94,6 +94,7 @@ export default {
this.deleteCurCondition() this.deleteCurCondition()
this.$store.commit('deleteComponent') this.$store.commit('deleteComponent')
this.$store.commit('recordSnapshot') this.$store.commit('recordSnapshot')
this.$store.commit('setCurComponent', { component: null, index: null })
}, },
deleteCurCondition() { deleteCurCondition() {

10
frontend/src/components/canvas/components/Editor/index.vue
View File

@ -28,7 +28,7 @@
class-name-active="de-drag-active" class-name-active="de-drag-active"
:class="{'gap_class':canvasStyleData.panel.gap==='yes'}" :class="{'gap_class':canvasStyleData.panel.gap==='yes'}"
:snap="true" :snap="true"
:snap-tolerance="1" :snap-tolerance="2"
:change-style="customStyle" :change-style="customStyle"
@refLineParams="getRefLineParams" @refLineParams="getRefLineParams"
> >
@ -84,6 +84,12 @@
height: item.lineLength, height: item.lineLength,
}" }"
/> />
<span
v-for="(item, index) in hLine"
:key="'h_'+index"
class="ref-line h-line"
:style="{ top: item.position, left: item.origin, width: item.lineLength }"
/>
</div> </div>
</template> </template>
@ -521,7 +527,7 @@ export default {
} }
}, },
getRefLineParams(params) { getRefLineParams(params) {
// console.log(params) // console.log(JSON.stringify(params))
const { vLine, hLine } = params const { vLine, hLine } = params
this.vLine = vLine this.vLine = vLine
this.hLine = hLine this.hLine = hLine