gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-1173 fix： 升级 组件 解决无法保存已经改变线条的位置

Browse Source
This commit is contained in:
zhangyu
2021-11-05 17:08:25 +08:00
parent d227362bfe
commit b699286d5e
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/package.json
View File

@@ -18,7 +18,7 @@
"@topology/activity-diagram": "^0.3.0",
"@topology/chart-diagram": "^0.3.0",
"@topology/class-diagram": "^0.3.0",
"@topology/core": "^0.3.2",
"@topology/core": "^0.5.33",
"@topology/flow-diagram": "^0.3.0",
"@topology/layout": "^0.3.0",
"@topology/sequence-diagram": "^0.3.0",

8
nezha-fronted/src/components/common/project/L5/CanvasProps.vue
View File

@@ -691,7 +691,7 @@
controls-position="right"
size="small" name="x"
class="input"
v-model.number="selection.pen.font.fontSize"
v-model.number="selection.pen.fontSize"
:readonly="readonly"
required
@change="onChange()"></el-input-number>
@@ -711,7 +711,7 @@
<el-select :placeholder="$t('el.select.placeholder')" :popper-append-to-body="true"
class="right-box-row-with-btn no-style-class" popper-class="chart-box-dropdown-small"
size="mini"
v-model="selection.pen.font.textAlign" value-key="chartType" @change="onChange">
v-model="selection.pen.textAlign" value-key="chartType" @change="onChange">
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in textAlignOptions">
<span class="panel-dropdown-label-txt">{{ item.name }}</span>
</el-option>
@@ -725,7 +725,7 @@
<el-select :placeholder="$t('el.select.placeholder')" :popper-append-to-body="true"
class="right-box-row-with-btn no-style-class" popper-class="chart-box-dropdown-small"
size="mini"
v-model="selection.pen.font.textBaseline" value-key="chartType" @change="onChange">
v-model="selection.pen.textBaseline" value-key="chartType" @change="onChange">
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in textBaselineOptions">
<span class="panel-dropdown-label-txt">{{ item.name }}</span>
</el-option>
@@ -1683,7 +1683,7 @@ export default {
}
}
if (name === 'fontColor') {
this.selection.pen.font.color = this.colorRGBtoHex(val)
// this.selection.pen.font.color = this.colorRGBtoHex(val)
}
this.selection.pen.data[name] = this.colorRGBtoHex(val)
this.onChange()

17
nezha-fronted/src/components/common/project/topologyL5.vue
View File

@@ -176,8 +176,8 @@
<!--所有节点上的小图标-->
<div v-for="(item,index) in nodesArr" v-if="!editTopologyFlag&&item.data.iconToolState&&!fromPrev"
:key="index"
v-show="(item.rect.y - (48*(fromOverView?penToolTipScale:1)) > -10) && (item.rect.center.x - (24*(fromOverView?penToolTipScale:1)) > - 10)"
:style="{position: 'absolute',top:item.rect.y - (48*(fromOverView?penToolTipScale:1))+'px',left:item.rect.center.x - (24*(fromOverView?penToolTipScale:1)) +'px',transform:'scale('+(fromOverView?penToolTipScale:1)+')'}"
v-show="(item.rect.y + offsetY - (48*(fromOverView?penToolTipScale:1)) > -10) && (item.rect.center.x + offsetX - (24*(fromOverView?penToolTipScale:1)) > - 10)"
:style="{position: 'absolute',top:item.rect.y + offsetY - (48*(fromOverView?penToolTipScale:1))+'px',left:item.rect.center.x + offsetX - (24*(fromOverView?penToolTipScale:1)) +'px',transform:'scale('+(fromOverView?penToolTipScale:1)+')'}"
class="network-pop"
>
@@ -209,8 +209,8 @@
:key="index"
:style="{
position: 'absolute',
top:item.rect.y- 10 +'px',
left:item.rect.x - 10+'px',
top:item.rect.y + offsetY - 10 +'px',
left:item.rect.x + offsetX - 10+'px',
transform:'scale('+(fromOverView?penToolTipScale:1)+')',
}"
>
@@ -499,7 +499,10 @@ export default {
unitArr: [],
topoScreenState: '', // 记录编辑前的 $store.ShowTopoScreen 结束编辑后返回
isPreview: false,
previewData: ''
previewData: '',
offsetX: 0,
offsetY: 0,
prevData: null
}
},
components: {
@@ -1044,6 +1047,8 @@ export default {
getNodesArr () {
const arr = []
if (!getTopology(this.topologyIndex)) return
this.offsetX = getTopology(this.topologyIndex).data.x
this.offsetY = getTopology(this.topologyIndex).data.y
this.nodesArr = getTopology(this.topologyIndex).data.pens.filter(item => {
if (!item.data) {
item.data = {
@@ -1508,7 +1513,7 @@ export default {
onUpdateProps (node) {
// 如果是node属性改变，需要传入node，重新计算node相关属性值
// 如果是line属性改变，无需传参
getTopology(this.topologyIndex).updateProps(node)
getTopology(this.topologyIndex).updateProps(true, [node])
},
handleAvatarSuccess () {