diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js index 92d3d16d0..5a833f337 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js @@ -63,6 +63,7 @@ export default { meta2d.beforeAddPens = (pens) => { // 添加画笔前 bus.$emit('changeDrawState') const name = 'elements - ' + meta2d.store.data.pens.length + console.log('123123123123') if (pens.length === 1) { if (!pens[0].type) { this.nodeInit(pens[0], name) diff --git a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js index 66316a19d..1e04027c2 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js @@ -18,8 +18,8 @@ export default { this.calcNode(item) }) } - getTopology(id).render() getTopology(id).centerView() + getTopology(id).render() }, calcNode (node) { // 处理节点数据 node = { id: node.id, ...node.data.params } diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue index 6d6f1c479..f668a9e86 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue @@ -1213,8 +1213,8 @@ export default { this.elements[key] = !this.elements[key] }, inputFocus (e) { - e.path[2].children[0].setAttribute('tabindex', '0') - e.path[2].children[1].setAttribute('tabindex', '1') + e.path[2].children[0].setAttribute('tabindex', '-10') + e.path[2].children[1].setAttribute('tabindex', '-11') }, inputBlur (e) { }, diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue index aff7cbc30..cd7e67990 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue @@ -159,6 +159,7 @@ export default { this.$nextTick(() => { getTopology(this.meta2dId).resize() getTopology(this.meta2dId).centerView() + getTopology(this.meta2dId).translate(0, 0) }) }, previewTopology () { @@ -188,6 +189,10 @@ export default { getTopology(this.meta2dId).centerView() }, cancelTopology () { + this.$store.commit('setShowTopoScreen', this.topoScreenState) + if (this.$refs.topTool.option.map) { + getTopology(this.meta2dId).hideMap() + } this.$emit('exitEdit', true) } } diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index 99d88c721..2a497d6ab 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -1,5 +1,5 @@