Merge remote-tracking branch 'origin/dev' into dev

src/views/entityExplorer/EntityExplorer.vue

@@ -28,7 +28,6 @@
     <div v-if="showList" style="display: flex;flex-direction: row;padding-bottom: 20px;">
       <entity-filter
           :filter-data="newFilterData"
-          :loading-left="loadingLeft"
           :q="q"
           :time-filter="timeFilter"
           @filter="filter"
@@ -227,28 +226,36 @@ export default {
           title: this.$t('entity.topCountries'),
           topColumn: 'ip.country',
           totalCount: 0,
-          data: []
+          data: [],
+          loading: false,
+          firstLoad: true
         },
         {
           icon: 'cn-icon cn-icon-city',
           title: this.$t('entity.topCities'),
           topColumn: 'ip.city',
           totalCount: 0,
-          data: []
+          data: [],
+          loading: false,
+          firstLoad: true
         },
         {
           icon: 'cn-icon cn-icon-as',
           title: this.$t('entity.topASNs'),
           topColumn: 'ip.asn',
           totalCount: 0,
-          data: []
+          data: [],
+          loading: false,
+          firstLoad: true
         },
         {
           icon: 'cn-icon cn-icon-operator',
           title: this.$t('entity.topISPs'),
           topColumn: 'ip.isp',
           totalCount: 0,
-          data: []
+          data: [],
+          loading: false,
+          firstLoad: true
         },
         {
           icon: 'cn-icon cn-icon-open-port',
@@ -256,28 +263,36 @@ export default {
           topColumn: 'ip.port',
           topColumn1: 'ip.protocol',
           totalCount: 0,
-          data: []
+          data: [],
+          loading: false,
+          firstLoad: true
         },
         {
           icon: 'cn-icon cn-icon-FQDN',
           title: this.$t('entity.topFQDNCategories'),
           topColumn: 'domain.category',
           totalCount: 0,
-          data: []
+          data: [],
+          loading: false,
+          firstLoad: true
         },
         {
           icon: 'cn-icon cn-icon-category2',
           title: this.$t('entity.topAppCategories'),
           topColumn: 'app.category',
           totalCount: 0,
-          data: []
+          data: [],
+          loading: false,
+          firstLoad: true
         },
         {
           icon: 'cn-icon cn-icon-tag1',
           title: this.$t('entity.topTags'),
           topColumn: 'tag',
           totalCount: 0,
-          data: []
+          data: [],
+          loading: false,
+          firstLoad: true
         }
       ],
       listData: [],
@@ -294,8 +309,6 @@ export default {
       loadingDomainActive: false,
       loadingIpActive: false,
 
-      // 实体详情列表页面 左侧筛选条件
-      loadingLeft: false,
       initFlag: true, // 初始化标志，避免初始化时pageSize和pageNo会调用搜索
       timer: null, // 初始化标志的延时器，需要销毁
       summaryCount: {
@@ -424,7 +437,8 @@ export default {
             mode: mode,
             range: this.timeFilter.dateRangeValue,
             pageNo: this.pageObj.pageNo,
-            pageSize: this.pageObj.pageSize
+            pageSize: this.pageObj.pageSize,
+            showList: true
           }
         })
         this.showList = true
@@ -432,8 +446,8 @@ export default {
         return true
       }
 
-      this.queryFilterNew({ q: this.q, ...this.pageObj, ...this.timeFilter })
       this.queryList({ q: this.q, ...this.pageObj, ...this.timeFilter })
+      this.queryFilterNew({ q: this.q, ...this.pageObj, ...this.timeFilter })
       this.queryCount({ q: this.q, ...this.pageObj, ...this.timeFilter })
 
       // 延时一秒，避免初始化时pageSize为20，pageNo为1也会调用“搜索”的情况
@@ -524,7 +538,6 @@ export default {
         hideRelated: this.isHideRelatedEntities,
         resource: params.q || ''
       }
-      this.loadingLeft = true
       const aggCountry = axios.get(api.entity.entityList.aggCountry, { params: queryParams })
       const aggCity = axios.get(api.entity.entityList.aggCity, { params: queryParams })
       const aggIPAsn = axios.get(api.entity.entityList.aggIPAsn, { params: queryParams })
@@ -534,43 +547,48 @@ export default {
       const aggAppCategory = axios.get(api.entity.entityList.aggAppCategory, { params: queryParams })
       const aggTag = axios.get(api.entity.entityList.aggTag, { params: queryParams })
 
-      Promise.all([aggCountry, aggCity, aggIPAsn, aggIPIsp, aggPort, aggDomain, aggAppCategory, aggTag]).then(response => {
+      const requests = [aggCountry, aggCity, aggIPAsn, aggIPIsp, aggPort, aggDomain, aggAppCategory, aggTag]
-        response.forEach((item1, index) => {
+      requests.forEach((req, index) => {
-          if (item1.status === 200 && item1.data.data.list) {
+        this.newFilterData[index].loading = true
-            if (item1.data.data.list.length >= 5) {
+        if (req) {
-              this.newFilterData[index].showNum = 5
+          req.then(response => {
-            } else {
+            if (response.status === 200 && response.data.data.list) {
-              this.newFilterData[index].showNum = item1.data.data.list.length
+              if (response.data.data.list.length >= 5) {
-            }
+                this.newFilterData[index].showNum = 5
-            this.newFilterData[index].data = []
+              } else {
-            item1.data.data.list.forEach((item, i) => {
+                this.newFilterData[index].showNum = response.data.data.list.length
-              let obj = {
-                label: item.value,
-                topColumn: this.newFilterData[index].topColumn,
-                value: item.uniqueEntities,
-                showNum: 5
               }
-              if (index === 0) {
+              this.newFilterData[index].data = []
-                obj.flag = item.value // 接口字段名称为'China'，svg名称为'CN'，通过countryNameIdMapping进行转换
+              response.data.data.list.forEach(item => {
-              }
+                let obj = {
-              if (index === 4) {
+                  label: item.value,
-                obj = {
                   topColumn: this.newFilterData[index].topColumn,
-                  topColumn1: this.newFilterData[index].topColumn1,
-                  port: item.port,
-                  l7Protocol: item.l7Protocol,
                   value: item.uniqueEntities,
                   showNum: 5
                 }
-              }
+                if (index === 0) {
-              this.newFilterData[index].data.push(obj)
+                  obj.flag = item.value // 接口字段名称为'China'，svg名称为'CN'，通过countryNameIdMapping进行转换
-            })
+                }
-          }
+                if (index === 4) {
-        })
+                  obj = {
-      }).catch(e => {
+                    topColumn: this.newFilterData[index].topColumn,
-        this.$message.error(e.response.data.message)
+                    topColumn1: this.newFilterData[index].topColumn1,
-      }).finally(() => {
+                    port: item.port,
-        this.loadingLeft = false
+                    l7Protocol: item.l7Protocol,
+                    value: item.uniqueEntities,
+                    showNum: 5
+                  }
+                }
+                this.newFilterData[index].data.push(obj)
+              })
+            }
+          }).catch(e => {
+            this.$message.error(e.response.data.message)
+          }).finally(() => {
+            this.newFilterData[index].loading = false
+            this.newFilterData[index].firstLoad = false
+          })
+        }
       })
     },
     /** 实体列表查询 */
@@ -736,6 +754,7 @@ export default {
       const ssl = axios.get(api.npm.overview.sslConDelay, { params: params })
       const tcpPercent = axios.get(api.npm.overview.tcpLostlenPercent, { params: params })
       const packetPercent = axios.get(api.npm.overview.packetRetransPercent, { params: params })
+      // 需要值都请求到才计算，使用promise.all
       Promise.all([tcp, http, ssl, tcpPercent, packetPercent]).then(res => {
         const scoreBase = {}
         res.forEach((t, i) => {
@@ -759,7 +778,7 @@ export default {
           }
         })
         this.$store.commit('setScoreBase', scoreBase)
-      }).catch((e) => {
+      }).catch(() => {
       }).finally(() => {
       })
     },
@@ -806,8 +825,8 @@ export default {
     hideRelatedEntities (e) {
       this.isHideRelatedEntities = e
       this.reloadUrl({ hideRelated: e })
-      this.queryFilterNew({ q: this.q, ...this.pageObj, ...this.timeFilter })
       this.queryList({ q: this.q, ...this.pageObj, ...this.timeFilter })
+      this.queryFilterNew({ q: this.q, ...this.pageObj, ...this.timeFilter })
       this.queryCount({ q: this.q, ...this.pageObj, ...this.timeFilter })
     }
   },

src/views/entityExplorer/EntityFilter.vue

@@ -11,7 +11,7 @@
           </div>
 
           <div class="filter__body" style="position: relative">
-            <loading :loading="loadingLeft" style="top: -5px;"></loading>
+            <loading :loading="item.loading" style="top: -5px;"></loading>
 
             <div class="filter__body-item"
                  v-for="(data, i) in item.data.slice(0, item.showNum)"
@@ -45,6 +45,7 @@
         </div>
       </div>
     </div>
+    <loading v-else-if="isFirstLoad" :loading="isFirstLoad"></loading>
     <chart-no-data v-else style="padding-top: 40px"></chart-no-data>
 
   </div>
@@ -54,15 +55,13 @@
 import Loading from '@/components/common/Loading'
 import ChartNoData from '@/views/charts/charts/ChartNoData'
 import { countryNameIdMapping } from '@/utils/constants'
+import _ from 'lodash'
 export default {
   name: 'EntityFilter',
   components: { ChartNoData, Loading },
   props: {
     filterData: {
       type: Array
-    },
-    loadingLeft: {
-      type: Boolean
     }
   },
   computed: {
@@ -73,6 +72,9 @@ export default {
       })
 
       return length
+    },
+    isFirstLoad () {
+      return this.myFilterData.some(d => d.firstLoad)
     }
   },
   data () {
@@ -85,6 +87,14 @@ export default {
   mounted () {
     this.myFilterData = this.filterData
   },
+  watch: {
+    filterData: {
+      deep: true,
+      handler (n) {
+        this.myFilterData = _.cloneDeep(n)
+      }
+    }
+  },
   methods: {
     /**
      * 判断文字是否溢出，超出则鼠标移入tooltip显示，否则鼠标移入不显示
@@ -113,7 +123,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss" scoped>
-
-</style>