diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json index c235bbfd3..023145d4b 100644 --- a/nezha-fronted/package.json +++ b/nezha-fronted/package.json @@ -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", diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 11787df9d..a40bd9f9e 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -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()"> @@ -711,7 +711,7 @@ + v-model="selection.pen.textAlign" value-key="chartType" @change="onChange"> {{ item.name }} @@ -725,7 +725,7 @@ + v-model="selection.pen.textBaseline" value-key="chartType" @change="onChange"> {{ item.name }} @@ -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() diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index d9538620c..9061a93c9 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -176,8 +176,8 @@
@@ -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 () {