From 6deddd79f8ff1feef7d90d8bb7ac5143bce14f4f Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 14 Nov 2023 11:41:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=9B=BE=E7=BC=A9=E6=94=BE=EF=BC=8C=E6=8B=96=E5=8A=A8=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D=E7=BD=AE=E5=81=8F=E7=A7=BBbug=20=20-=20[?=
 =?UTF-8?q?=E5=85=B3=E8=81=94]=20#[1021705378562048]=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91-=E7=BC=A9=E6=94=BE=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E6=8B=96=E5=8A=A8=E8=8A=82=E7=82=B9=E5=88=B0?=
 =?UTF-8?q?=E7=94=BB=E5=B8=83=E4=B8=AD=EF=BC=8C=E8=8A=82=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=81=8F=E7=A7=BB=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1021705378562?=
 =?UTF-8?q?048?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsTopoNew/js/topo.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/resources/plugins/TsTopoNew/js/topo.js b/src/resources/plugins/TsTopoNew/js/topo.js
index e9608218..f85d29b1 100644
--- a/src/resources/plugins/TsTopoNew/js/topo.js
+++ b/src/resources/plugins/TsTopoNew/js/topo.js
@@ -694,9 +694,16 @@
       action = action || 'invert';
       if (data.hasOwnProperty('x') && data.hasOwnProperty('y')) {
         var zoomTransform = d3.zoomTransform(this.el.node());
+        var k = zoomTransform.k || 1;
         var position = zoomTransform[action]([data.x, data.y]);
-        data.x = position[0];
-        data.y = position[1];
+        if(k !== 1 ){ 
+          //流程图缩放时，坐标轴位置调整
+          data.x = position[0] + zoomTransform.x;
+          data.y = position[1] + zoomTransform.y;
+        } else {
+          data.x = position[0];
+          data.y = position[1];
+        }
       }
       return data;
     }
@@ -732,6 +739,7 @@
     }
     zoomTransform(transform, time) {
       let _this = this;
+      console.log(transform, 'transform');
       if (!transform) return false;
       time = time !== undefined ? time : 700;
       !this.zoomed
@@ -740,6 +748,7 @@
           }))
         : '';
       this.el.call(this.zoomed);
+      console.log(this.el, 'this.el');
       this.el
         .transition()
         .duration(time)
-- 
Gitee


From a68238d5c79ab5649522f9920dc2f9dafbae66a1 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 14 Nov 2023 11:42:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/languages/term/en.json | 3 ++-
 src/resources/assets/languages/term/zh.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index 7e9570dd..c821d395 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -2537,7 +2537,8 @@
     "servicedependency": "Service Dependency",
     "scenarioplan": "Scenario Plan",
     "relyonmyservices": "Rely on my services",
-    "servicerelyon": "The service I rely on"
+    "servicerelyon": "The service I rely on",
+    "dependentapp": "Dependent applications"
   },
   "diagram": {
     "widgetlist": "Component List",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index 4285ea4d..40729748 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -2535,7 +2535,8 @@
     "servicedependency": "服务依赖",
     "scenarioplan": "场景预案",
     "relyonmyservices": "依赖我的服务",
-    "servicerelyon": "我依赖的服务"
+    "servicerelyon": "我依赖的服务",
+    "dependentapp": "依赖应用"
   },
   "diagram": {
     "widgetlist": "组件列表",
-- 
Gitee


From 2c4e64176b5ae12f733d47523bb023d3ef81238b Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 14 Nov 2023 11:43:54 +0800
Subject: [PATCH 3/3] commit

---
 src/resources/plugins/TsTopoNew/js/topo.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/resources/plugins/TsTopoNew/js/topo.js b/src/resources/plugins/TsTopoNew/js/topo.js
index f85d29b1..270b0636 100644
--- a/src/resources/plugins/TsTopoNew/js/topo.js
+++ b/src/resources/plugins/TsTopoNew/js/topo.js
@@ -739,7 +739,6 @@
     }
     zoomTransform(transform, time) {
       let _this = this;
-      console.log(transform, 'transform');
       if (!transform) return false;
       time = time !== undefined ? time : 700;
       !this.zoomed
@@ -748,7 +747,6 @@
           }))
         : '';
       this.el.call(this.zoomed);
-      console.log(this.el, 'this.el');
       this.el
         .transition()
         .duration(time)
-- 
Gitee