CN-1273 fix: 调整内置tag字典

src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue

@@ -60,7 +60,7 @@ import {
   drillDownPanelTypeMapping,
   entityType,
   entityDetailTags,
-  psiphon3IpType,
+  tagValueLabelMapping,
   riskLevelMapping,
   entityDefaultColor
 } from '@/utils/constants'
@@ -92,16 +92,9 @@ export default {
   },
   methods: {
     getTagColor,
-    tagValueHandler (k, k2, value) {
+    tagValueHandler (value) {
-      if (k === 'psiphon3Ip') {
+      const find = tagValueLabelMapping.find(t => t.value === value)
-        if (k2 === 'type') {
+      return find ? find.name : value
-          const find = psiphon3IpType.find(t => t.value === value)
-          if (find) {
-            return find.name
-          }
-        }
-      }
-      return value
     },
     getData () {
       this.toggleLoading(true)
@@ -122,7 +115,7 @@ export default {
                 Object.keys(res.data[k]).forEach(k2 => {
                   const find = entityDetailTags[this.entity.entityType].find(t => t.name === k2)
                   if (find) {
-                    this.levelTwoTags.push({ key: k2, value: this.tagValueHandler(k, k2, res.data[k][k2]), type: find.type })
+                    this.levelTwoTags.push({ key: k2, value: this.tagValueHandler(res.data[k][k2]), type: find.type })
                   }
                 })
               }

src/views/charts2/charts/entityDetail/EntityDetailTabs.vue

@@ -40,6 +40,7 @@ import { overwriteUrl, urlParamsHandler } from '@/utils/tools'
 import { useRoute } from 'vue-router'
 import axios from 'axios'
 import { api } from '@/utils/api'
+import {tagValueLabelMapping} from '../../../../utils/constants'
 
 export default {
   name: 'EntityDetailTabs',
@@ -136,7 +137,7 @@ export default {
                 Object.keys(r[k]).forEach(k2 => {
                   const find = entityDetailTags[this.entity.entityType].find(t => t.name === k2)
                   if (find) {
-                    aggregation.intelligenceContent.push({ key: k2, value: this.tagValueHandler(k, k2, r[k][k2]), type: find.type })
+                    aggregation.intelligenceContent.push({ key: k2, value: this.tagValueHandler(r[k][k2]), type: find.type })
                   }
                 })
               }
@@ -251,16 +252,9 @@ export default {
         case 'app': return api.entity.openPortOfApp
       }
     },
-    tagValueHandler (k, k2, value) {
+    tagValueHandler (value) {
-      if (k === 'psiphon3Ip') {
+      const find = tagValueLabelMapping.find(t => t.value === value)
-        if (k2 === 'type') {
+      return find ? find.name : value
-          const find = psiphon3IpType.find(t => t.value === value)
-          if (find) {
-            return find.name
-          }
-        }
-      }
-      return value
     }
   },
   beforeUnmount () {

src/views/entityExplorer/entityList/Row.vue

@@ -187,7 +187,7 @@ import relatedServer from '@/mixins/relatedServer'
 import Loading from '@/components/common/Loading'
 import axios from 'axios'
 import { api } from '@/utils/api'
-import { entityDefaultColor, entityDetailTags, psiphon3IpType } from '@/utils/constants'
+import { entityDefaultColor, entityDetailTags, tagValueLabelMapping } from '@/utils/constants'
 import _ from 'lodash'
 import { getTagColor } from '@/utils/tools'
 
@@ -292,7 +292,7 @@ export default {
               Object.keys(res.data[k]).forEach(k2 => {
                 const find = entityDetailTags[this.entity.entityType].find(t => t.name === k2)
                 if (find) {
-                  this.levelTwoTags.push({ key: k2, value: this.tagValueHandler(k, k2, res.data[k][k2]), type: find.type })
+                  this.levelTwoTags.push({ key: k2, value: this.tagValueHandler(res.data[k][k2]), type: find.type })
                 }
               })
             }
@@ -304,16 +304,9 @@ export default {
         }
       })
     },
-    tagValueHandler (k, k2, value) {
+    tagValueHandler (value) {
-      if (k === 'psiphon3Ip') {
+      const find = tagValueLabelMapping.find(t => t.value === value)
-        if (k2 === 'type') {
+      return find ? find.name : value
-          const find = psiphon3IpType.find(t => t.value === value)
-          if (find) {
-            return find.name
-          }
-        }
-      }
-      return value
     },
     /* 切换折叠状态 */
     switchCollapse () {