Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8

This commit is contained in:
zhangyu
2023-06-21 15:37:25 +08:00
9 changed files with 48 additions and 13 deletions

View File

@@ -13,7 +13,11 @@
@saveChart="saveChart"
@getNodesArr="getNodesArr"
/>
<div class="meta2d-main" :class="isChart ? 'meta2d-chart': 'meta2d-project'" @contextmenu="onContextMenu($event)" style="position: relative" :style="{border: editFlag ? '1px solid' : ''}">
<div class="meta2d-main" :class="{
'meta2d-chart-hide-header': !showHeader,
'meta2d-chart': isChart,
'meta2d-project': !isChart
}" @contextmenu="onContextMenu($event)" style="position: relative" :style="{border: editFlag ? '1px solid' : ''}">
<div v-for="(item,index) in nodesArr" v-if="!editFlag && project"
:key="index"
v-show="(item.y + offsetY - 48 > -20) && (item.x + item.width/2 + offsetX - 24 > - 20)"
@@ -127,6 +131,11 @@ import { globalStore } from '@meta2d/core'
export default {
name: 'meta2dMain',
mixins: [meta2dMainCalc, topoUtil],
provide () {
return {
option: this.option
}
},
props: {
meta2dId: {}, // 唯一id 不可重复
iconArray: {
@@ -156,6 +165,20 @@ export default {
default: true
},
},
data () {
return {
option: {
lineName: 'curve',
lineWidth: 1,
fromArrow: '',
toArrow: 'triangleSolid',
scale: 100,
grid: false,
rule: false,
map: false
},
}
},
computed: {
},
components: {