Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev

src/utils/unit-convert.js

@@ -1,4 +1,5 @@
 import { unitTypes } from '@/utils/constants'
+import _ from 'lodash'
 
 const numberUnit = ['', 'K', 'M', 'G', 'T', 'P', 'E']
 const byteUnit = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB']
@@ -35,6 +36,9 @@ export function byteUnitConvert (value, sourceUnit = 'B', targetUnit, dot = 2) {
 }
 /* 时间单位转换，例如将ms转为h */
 export function timeUnitFormatter (time, sourceUnit = 'ms', targetUnit, dot = 2) {
+  if (!_.isNumber(time) || time === 0) {
+    return [0, sourceUnit]
+  }
   let sourceIndex = -1
   let targetIndex = -1
   timeUnit.forEach((t, i) => {

src/views/detections/DetectionFilter.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="detection-filter-case">
+    <div class="no-data" v-if="isNoData">No data</div>
     <template v-for="(filter, index) in filterData" :key="index">
       <div class="detection-filter" v-show="filter.data.length > 0">
         <div class="filter__header" @click="filter.collapse = !filter.collapse">
@@ -49,7 +50,18 @@ export default {
     }, */
     showMore (filter) {
       filter.showIndex && (filter.showIndex += 10)
-      filter.showIndex >= filter.data.length && (filter.showMore = false)
+      filter.showIndex >= (filter.data.length - 1) && (filter.showMore = false)
+    }
+  },
+  computed: {
+    isNoData () {
+      let isNoData = true
+      this.filterData.forEach(filter => {
+        if (!this.$_.isEmpty(filter.data)) {
+          isNoData = false
+        }
+      })
+      return isNoData
     }
   }
 }

src/views/detections/DetectionRow.vue

@@ -20,16 +20,26 @@
         <div class="cn-detection__body">
           <div class="body__basic-info">
             <div class="basic-info">
-              <div class="basic-info__item">
+              <div class="basic-info__item" v-if="detection.eventSecurity">
                 <i class="cn-icon cn-icon-severity-level"></i>
                 <span>{{$t('detection.list.eventSecurity')}}&nbsp;:&nbsp;&nbsp;</span>
                 <span>{{detection.eventSecurity}}</span>
               </div>
-              <div class="basic-info__item">
+              <div class="basic-info__item" v-if="detection.eventSeverity">
+                <i class="cn-icon cn-icon-severity-level"></i>
+                <span>{{$t('detections.eventSeverity')}}&nbsp;:&nbsp;&nbsp;</span>
+                <span>{{detection.eventSeverity}}</span>
+              </div>
+              <div class="basic-info__item" v-if="detection.securityType">
                 <i class="cn-icon cn-icon-event-type"></i>
                 <span>{{$t('detection.list.securityType')}}&nbsp;:&nbsp;&nbsp;</span>
                 <span>{{detection.securityType}}</span>
               </div>
+              <div class="basic-info__item" v-if="detection.eventType">
+                <i class="cn-icon cn-icon-event-type"></i>
+                <span>{{$t('detections.eventType')}}&nbsp;:&nbsp;&nbsp;</span>
+                <span>{{detection.eventType}}</span>
+              </div>
               <div class="basic-info__item" v-if="detection.malwareName">
                 <i class="cn-icon cn-icon-trojan"></i>
                 <span>{{$t('detection.list.malwareName')}}&nbsp;:&nbsp;&nbsp;</span>

src/views/detections/Index.vue

@@ -15,7 +15,7 @@
     <!-- 内容区 -->
     <div class="explorer-container" style="height: calc(100% - 20px); flex-direction: column">
       <div class="detection__event-severity-bar" :id="`eventSeverityTrendBar${pageType}`"></div>
-      <div style="display: flex;">
+      <div style="display: flex; flex-grow: 1">
         <detection-filter
             :filter-data="filterData[pageType]"
             :q="q"