NEZ-2649 feat: 添加方式修改 以及编辑全屏

This commit is contained in:
zhangyu
2023-03-07 17:44:38 +08:00
parent 4fd3b76f7f
commit ced635e609
6 changed files with 27 additions and 10 deletions

View File

@@ -63,6 +63,7 @@ export default {
meta2d.beforeAddPens = (pens) => { // 添加画笔前 meta2d.beforeAddPens = (pens) => { // 添加画笔前
bus.$emit('changeDrawState') bus.$emit('changeDrawState')
const name = 'elements - ' + meta2d.store.data.pens.length const name = 'elements - ' + meta2d.store.data.pens.length
console.log('123123123123')
if (pens.length === 1) { if (pens.length === 1) {
if (!pens[0].type) { if (!pens[0].type) {
this.nodeInit(pens[0], name) this.nodeInit(pens[0], name)

View File

@@ -18,8 +18,8 @@ export default {
this.calcNode(item) this.calcNode(item)
}) })
} }
getTopology(id).render()
getTopology(id).centerView() getTopology(id).centerView()
getTopology(id).render()
}, },
calcNode (node) { // 处理节点数据 calcNode (node) { // 处理节点数据
node = { id: node.id, ...node.data.params } node = { id: node.id, ...node.data.params }

View File

@@ -1213,8 +1213,8 @@ export default {
this.elements[key] = !this.elements[key] this.elements[key] = !this.elements[key]
}, },
inputFocus (e) { inputFocus (e) {
e.path[2].children[0].setAttribute('tabindex', '0') e.path[2].children[0].setAttribute('tabindex', '-10')
e.path[2].children[1].setAttribute('tabindex', '1') e.path[2].children[1].setAttribute('tabindex', '-11')
}, },
inputBlur (e) { inputBlur (e) {
}, },

View File

@@ -159,6 +159,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
getTopology(this.meta2dId).resize() getTopology(this.meta2dId).resize()
getTopology(this.meta2dId).centerView() getTopology(this.meta2dId).centerView()
getTopology(this.meta2dId).translate(0, 0)
}) })
}, },
previewTopology () { previewTopology () {
@@ -188,6 +189,10 @@ export default {
getTopology(this.meta2dId).centerView() getTopology(this.meta2dId).centerView()
}, },
cancelTopology () { cancelTopology () {
this.$store.commit('setShowTopoScreen', this.topoScreenState)
if (this.$refs.topTool.option.map) {
getTopology(this.meta2dId).hideMap()
}
this.$emit('exitEdit', true) this.$emit('exitEdit', true)
} }
} }

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="meta2d-box list-page" v-my-loading="meta2dLoading" ref="meta2dBox"> <div class="meta2d-box list-page" :class="editFlag ? 'topology-dialog' : ''" v-my-loading="meta2dLoading" ref="meta2dBox">
<meta2dHeader <meta2dHeader
ref="header" ref="header"
:meta2dId="meta2dId" :meta2dId="meta2dId"
@@ -14,7 +14,7 @@
<div :id="meta2dId" style="height: 100%;width: 100%"></div> <div :id="meta2dId" style="height: 100%;width: 100%"></div>
</div> </div>
<meta2dProps <meta2dProps
v-if="editFlag" v-if="editFlag && !isPreview"
ref="meta2dProps" ref="meta2dProps"
:selectPens.sync="selectPens" :selectPens.sync="selectPens"
:querysArray="querysArray" :querysArray="querysArray"

View File

@@ -1,12 +1,9 @@
<template> <template>
<div class="tool-top" id="tool-top" @mouseup="changeDrawLineFlag(false)"> <div class="tool-top" id="tool-top" @mouseup="changeDrawLineFlag(false)">
<div id="tools-left-drag" <div id="tools-left-drag"
class="top-tool-item" class="top-tool-item top-tool-item-delete"
:title="$t('project.topology.addNode')" :title="$t('project.topology.addNode')"
:class="dragstartFlag ? 'is-active-meta2d' : ''" @click="addNode">
draggable="true"
@mousedown="changeState('dragstartFlag')"
@dragstart.stop="onDragstart($event)">
<div <div
> >
<i class="nz-icon nz-icon-juxing" /> <i class="nz-icon nz-icon-juxing" />
@@ -185,6 +182,20 @@ export default {
} }
getTopology(this.meta2dId).canvas.addCaches = deepClone([pen]) getTopology(this.meta2dId).canvas.addCaches = deepClone([pen])
}, },
addNode () {
const data = getTopology(this.meta2dId).data()
const offestX = data.x
const offestY = data.y
const pen = {
name: 'rectangle',
text: 'rectangle',
width: 100,
height: 100,
x: 100 - offestX,
y: 100 - offestY
}
getTopology(this.meta2dId).addPen(pen , true)
},
changeDrawLineFlag () { changeDrawLineFlag () {
if (this.dragstartFlag) { if (this.dragstartFlag) {
this.dragstartFlag = false this.dragstartFlag = false