From 8958538df3844d79ea1f772252d77b27850e2a54 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 20 Jul 2022 15:03:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?NEZ-2047=20=20=20fix=EF=BC=9A=20bug3=20bug4?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/ChartDiagram/diagram.vue          | 4 ++--
 nezha-fronted/src/components/common/project/topologyL5.vue  | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index 1561ed59b..482bca06b 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/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'
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 4e8aff89f..a2cc1bcb9 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/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
       })

From 8cb7db089b4f8a11c9dac463a0364ddd973461ca Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 20 Jul 2022 15:15:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?NEZ-2047=20fix=EF=BC=9A=20bug5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/elementSet.vue              | 2 +-
 nezha-fronted/src/components/page/config/system/linkTable.vue   | 1 +
 .../src/components/page/config/system/notifyMethodTable.vue     | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/elementSet.vue b/nezha-fronted/src/components/common/elementSet.vue
index e81b38526..b552261df 100644
--- a/nezha-fronted/src/components/common/elementSet.vue
+++ b/nezha-fronted/src/components/common/elementSet.vue
@@ -77,7 +77,7 @@ export default {
     batchHandler (state) {
       for (let index = 0; index < this.custom.length; index++) {
         if (this.custom[index].type != 'title') {
-          if ((index == 0 || index == 1 || this.custom[index].NotSet)) {
+          if ((index == 0 || index == 1 || this.custom[index].NotSet || this.custom[index].visibility=='disabled')) {
             this.custom[index].show = true
           } else {
             this.custom[index].show = state
diff --git a/nezha-fronted/src/components/page/config/system/linkTable.vue b/nezha-fronted/src/components/page/config/system/linkTable.vue
index 5a320c583..e1f988e26 100644
--- a/nezha-fronted/src/components/page/config/system/linkTable.vue
+++ b/nezha-fronted/src/components/page/config/system/linkTable.vue
@@ -114,6 +114,7 @@ export default {
         }, {
           label: 'URL',
           prop: 'url',
+          visibility: 'disabled',
           show: true
         }
       ],
diff --git a/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue b/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
index 64236bd4f..68e880d46 100644
--- a/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
+++ b/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
@@ -123,10 +123,12 @@ export default {
         }, {
           label: this.$t('webshell.filePath'),
           prop: 'filePath',
+          visibility: 'disabled',
           show: true
         }, {
           label: this.$t('config.system.notification.account'),
           prop: 'account',
+          visibility: 'disabled',
           show: true
         }, {
           label: this.$t('overall.state'),