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

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/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

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) {
           // 连线是否自动计算锚点

nezha-fronted/src/components/page/config/system/linkTable.vue

@@ -114,6 +114,7 @@ export default {
         }, {
           label: 'URL',
           prop: 'url',
+          visibility: 'disabled',
           show: true
         }
       ],

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'),