From fbf6e5fa2cc9b7dea9514534414dcf8076ec1f95 Mon Sep 17 00:00:00 2001
From: Yuan <yuanliyedefy@gmail.com>
Date: Fri, 15 Jul 2022 18:10:37 +0800
Subject: [PATCH] resolve conflict

---
 src/jmapNew/shape/graph/SignalButton/index.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js
index c87fd6786..b6d5053cd 100644
--- a/src/jmapNew/shape/graph/SignalButton/index.js
+++ b/src/jmapNew/shape/graph/SignalButton/index.js
@@ -41,8 +41,8 @@ export default class SignalButton extends Group {
 				zlevel: this.zlevel,
 				z: this.z,
 				shape: {
-					cx: this.model.position.x + 7,
-					cy: this.model.position.y + 7,
+					cx: computedPosition.x + 7,
+					cy: computedPosition.y + 7,
 					r: 7
 				},
 				style: {
@@ -59,8 +59,8 @@ export default class SignalButton extends Group {
                 zlevel: this.zlevel,
                 z: this.z + 2,
                 shape: {
-					cx: this.model.position.x + 7,
-					cy: this.model.position.y + 7,
+					cx: computedPosition.x + 7,
+					cy: computedPosition.y + 7,
 					r: 7
                 },
                 style: {
@@ -73,8 +73,8 @@ export default class SignalButton extends Group {
                 zlevel: this.zlevel,
                 z: this.z + 1,
                 shape: {
-					cx: this.model.position.x + 7,
-					cy: this.model.position.y + 9,
+					cx: computedPosition.x + 7,
+					cy: computedPosition.y + 9,
 					r: 8
                 },
                 style: {
@@ -85,8 +85,8 @@ export default class SignalButton extends Group {
                 zlevel: this.zlevel,
                 z: this.z,
                 shape: {
-					cx: this.model.position.x + 7,
-					cy: this.model.position.y + 9,
+					cx: computedPosition.x + 7,
+					cy: computedPosition.y + 9,
 					r: 9
                 },
                 style: {