From c08b0b58c1e740f59e305774f7d9664e490f3bb0 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Mon, 9 Aug 2021 14:25:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9Bentity=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/charts/panel.scss      |  1 +
 src/utils/unit-convert.js             | 10 +++++++++-
 src/views/charts/Panel.vue            | 14 +++++++++-----
 src/views/entities/EntityExplorer.vue |  2 +-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/components/charts/panel.scss b/src/components/charts/panel.scss
index 00e7eb54..327648ce 100644
--- a/src/components/charts/panel.scss
+++ b/src/components/charts/panel.scss
@@ -11,6 +11,7 @@
 
   .cn-icon-arrow-left-circle {
     color: $--color-primary;
+    font-size: 20px;
   }
 }
 .cn-panel, .cn-panel>.cn-chart__tabs>.el-tabs__content>.el-tab-pane {
diff --git a/src/utils/unit-convert.js b/src/utils/unit-convert.js
index 7f66cd5e..65e5e0f8 100644
--- a/src/utils/unit-convert.js
+++ b/src/utils/unit-convert.js
@@ -65,7 +65,15 @@ export function timeUnitFormatter (time, sourceUnit = 'ms', targetUnit, dot = 2)
 // unitType = time / number / byte
 export default function unitConvert (value, unitType, sourceUnit, targetUnit, dot = 2) {
   if (unitType === unitTypes.string) {
-    return [value, '']
+    if (value) {
+      if (typeof value === 'string') {
+        return [value, '']
+      } else {
+        return ['-', '']
+      }
+    } else {
+      return ['-', '']
+    }
   }
   if (!Number(value) && Number(value) !== 0) {
     return ['-', '']
diff --git a/src/views/charts/Panel.vue b/src/views/charts/Panel.vue
index 2b84011f..5725be1e 100644
--- a/src/views/charts/Panel.vue
+++ b/src/views/charts/Panel.vue
@@ -1,11 +1,10 @@
 <template>
   <div style="padding: 10px 0 20px 20px;">
-    <div v-if="!$_.isEmpty(tabs)" class="entity-detail-tool">
+    <div v-if="typeName" class="entity-detail-tool">
       <div>
-        <i class="cn-icon cn-icon-arrow-left-circle"></i>&nbsp;
-        <span>{{typeName}}&nbsp;{{$t('overall.detail')}}</span>
+        <span @click="goBack" style="cursor: pointer;"><i class="cn-icon cn-icon-arrow-left-circle"></i></span>
       </div>
-      <el-radio-group v-model="tab" size="mini">
+      <el-radio-group v-model="tab" size="mini" @change="changeTab">
         <el-radio-button v-for="tab in tabs" :key="tab.key" :label="tab.label"></el-radio-button>
       </el-radio-group>
     </div>
@@ -71,7 +70,7 @@ export default {
   setup (props, ctx) {
     let tab = ''
     if (!_.isEmpty(props.tabs)) {
-      tab = ref(props.tabs[0].key)
+      tab = ref(props.tabs[0].label)
     }
     // data
     const dateRangeValue = 60
@@ -90,6 +89,11 @@ export default {
     }
   },
   methods: {
+    goBack () {
+      this.$emit('goBack')
+    },
+    changeTab (label) {
+    },
     async init () {
       const panels = await getPanelList({ type: this.panelType })
       if (panels && panels.length > 0) {
diff --git a/src/views/entities/EntityExplorer.vue b/src/views/entities/EntityExplorer.vue
index d5947402..8e4efdeb 100644
--- a/src/views/entities/EntityExplorer.vue
+++ b/src/views/entities/EntityExplorer.vue
@@ -36,7 +36,7 @@
       ></entity-list>
     </div>
   </div>
-  <cn-panel v-else :entity="currentEntity" :type-name="typeName" :tabs="panelTabs"></cn-panel>
+  <cn-panel v-else :entity="currentEntity" :type-name="typeName" :tabs="panelTabs" @goBack="showDetail = false"></cn-panel>
 </template>
 
 <script>