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

nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js

@@ -151,6 +151,10 @@ export default {
           if (!pen.moduleId) {
             pen.moduleId = ''
           }
+          if (pen.data && pen.data.moduleId) {
+            pen.moduleId = pen.data.moduleId
+            delete pen.data.moduleId
+          }
           if (pen.icon) {
             pen.iconFamily = 'nz-icon'
           }

nezha-fronted/src/components/page/integration/integration-tabs/integration-tabs.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="integration-tabs">
     <ul class="integration-tabs-nav">
-      <li class="integration-tabs-nav-item" :class="{active:tabId===item.id}"  v-for="item in tabs" :key="item.id" @click="tabChange(item.id)">{{item.name}}</li>
+      <li class="integration-tabs-nav-item" :class="{active:tabId===item.id}"  v-for="item in filterTabs" :key="item.id" @click="tabChange(item.id)">{{item.name}}</li>
     </ul>
     <div class="integration-tabs-content">
       <!-- internal -->
@@ -10,7 +10,7 @@
       <!-- module -->
       <configuration v-if="tabId==='configuration'" :configuration="detailsObj.configuration"></configuration>
       <dashboard v-if="tabId==='dashboard'" :tempId="detailsObj.tempId"></dashboard>
-      <alert v-if="tabId==='alert'" :moduleId="detailsObj.id"></alert>
+<!--      <alert v-if="tabId==='alert'" :moduleId="detailsObj.id"></alert>-->
       <metric v-if="tabId==='metric'" :moduleId="detailsObj.id"></metric>
     </div>
   </div>
@@ -37,6 +37,11 @@ export default {
     alert,
     metric
   },
+  computed: {
+    filterTabs () {
+      return this.tabs.filter(item=> item.id !== 'alert')
+    }
+  },
   data () {
     return {
       tabs: [],

nezha-fronted/src/components/page/integration/integration.vue

@@ -7,7 +7,7 @@
         <img class="integration-icon" :src="talon.icon" alt="">
         <h2 class="integration-name">{{talon.name}}</h2>
         <p class="integration-remark">{{talon.remark}}</p>
-        <div class="integration-internal">{{$t('integration.internal')}}</div>
+<!--        <div class="integration-internal">{{$t('integration.internal')}}</div>-->
       </li>
     </ul>
     <!-- Available Integration -->