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

nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue

@@ -236,7 +236,7 @@ export default {
             disabled: false
           }, {
             name: this.$t('overall.acknowledge'),
-            type: 'selectString',
+            type: 'select',
             label: 'ack',
             readonly: true,
             disabled: false

nezha-fronted/src/components/common/detailView/view/detailViewRight.vue

@@ -253,7 +253,7 @@ export default {
       const config = this.obj.configs.find(c => c.type === 'logs')
       const hasLog = config && config.enable === 1
       const tabs = [
-        { prop: 'dashboardTab', name: this.$t('overall.detail') },
+        { prop: 'dashboardTab', name: this.$t('overall.dashboard') },
         { prop: 'endpointAlertMessage', name: this.$t('overall.alert') },
         { prop: 'endpointQuery', name: this.$t('overall.metrics') }
       ]

nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue

@@ -597,7 +597,15 @@ export default {
             })
           }
         }
-        this.editChart = obj
+        if (obj.elements && obj.elements.length) {
+          obj.elements.forEach((item, index) => {
+            item.orderNum = index
+            delete item.seq
+            delete item.buildIn
+            delete item.chartId
+          })
+        }
+        this.editChart = this.$loadsh.cloneDeep(obj)
         this.oldData = this.$loadsh.cloneDeep(obj)
         if (this.stableTime) {
           clearTimeout(this.stableTime)