NEZ-2047 fix： bug3 bug4 修改

nezha-fronted/src/components/common/ChartDiagram/diagram.vue

@@ -1152,7 +1152,6 @@ export default {
       if (!Array.isArray(data) && data) { // 判断不是数组 提前个data配置好节点属性
         if (data.type == 0 && !data.data.valueMapping) {
           data.data = {
-            ...data.data,
             moduleId: '',
             moduleName: '',
             show: false,
@@ -1190,7 +1189,8 @@ export default {
             displayChart: true,
             aggregation: 'last',
             title: '',
-            url: ''
+            url: '',
+            ...data.data
           }
           if (data.iconFamily) {
             data.data.fillStyle = 'transparent'

nezha-fronted/src/components/common/project/topologyL5.vue

@@ -1214,7 +1214,6 @@ export default {
             data.fillStyle = '#FFFFFF00'
           }
           data.data = {
-            ...data.data,
             moduleId: '',
             moduleName: '',
             show: false,
@@ -1251,7 +1250,8 @@ export default {
             displayChart: true,
             aggregation: 'last',
             title: '',
-            url: ''
+            url: '',
+            ...data.data
           }
         } else if (data.type == 1 && !data.data) {
           // 连线是否自动计算锚点
@@ -2295,8 +2295,6 @@ export default {
           delete StoreData[key]
         }
       })
-      console.log(this.$loadsh.uniq(arr))
-      console.log(le5leStore.get())
       Object.keys(getTopology(this.topologyIndex)).forEach(key => {
         getTopology(this.topologyIndex)[key] = null
       })