diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json index 7e9570dde064153a5d938e948edec1c3bff0a2ce..c821d3953b44bc159a32722e751aee0ba6bfebbe 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 4285ea4d72309b347bd3a3d32f0ec58e5ac7667a..407297484ccaab2630cbab2549879a1ed5b4e2c9 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": "组件列表", diff --git a/src/resources/plugins/TsTopoNew/js/topo.js b/src/resources/plugins/TsTopoNew/js/topo.js index e960821851d167b8c03501db0ed0cb307099c905..270b0636401ec177c7fe9afd9cc1c474c35d42d2 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; }