Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4

2022-07-22 17:31:43 +08:00
parent ef1699f1de 8cb7db089b
commit ac175d5af4
5 changed files with 8 additions and 5 deletions
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -1221,7 +1221,6 @@ export default {
            data.fillStyle = '#FFFFFF00'
          }
          data.data = {
-            ...data.data,
            moduleId: '',
            moduleName: '',
            show: false,
@@ -1258,7 +1257,8 @@ export default {
            displayChart: true,
            aggregation: 'last',
            title: '',
-            url: ''
+            url: '',
+            ...data.data
          }
        } else if (data.type == 1 && !data.data) {
          // 连线是否自动计算锚点