From 7b4bb68db3f831c92e7704ff97d8a647683aaa42 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 27 Dec 2021 11:15:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9=20explore=20?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart.vue  |  6 +-
 .../src/components/chart/defaultLineData.js   | 13 +--
 .../src/components/chart/defaultLogData.js    | 12 +--
 .../src/components/chart/defaultTableData.js  | 97 +++++++++++++++++++
 .../src/components/chart/panelChart.vue       | 10 +-
 .../page/dashboard/explore/exploreItem.vue    |  2 +-
 .../page/dashboard/overview/chart.vue         |  2 +-
 7 files changed, 114 insertions(+), 28 deletions(-)
 create mode 100644 nezha-fronted/src/components/chart/defaultTableData.js

diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue
index 578dcc935..7c5585671 100644
--- a/nezha-fronted/src/components/chart/chart.vue
+++ b/nezha-fronted/src/components/chart/chart.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :style="chartInfo.param.showHeader ? '' : 'padding-top: 15px;'" class="nz-chart" :class="chartInfo.param.showHeader ? '' : 'no-header'" >
+  <div :style="showHeader&&chartInfo.param.showHeader ? '' : 'padding-top: 15px;'" class="nz-chart" :class="showHeader&&chartInfo.param.showHeader ? '' : 'no-header'" >
     <loading :loading="loading"></loading>
     <chart-no-data v-if="isNoData || isError || chartChildrenData"></chart-no-data>
     <template v-else>
@@ -231,6 +231,10 @@ export default {
     showAllData: {
       type: Boolean,
       default: false
+    },
+    showHeader: {
+      type: Boolean,
+      default: true
     }
   },
   data () {
diff --git a/nezha-fronted/src/components/chart/defaultLineData.js b/nezha-fronted/src/components/chart/defaultLineData.js
index e001a0879..b45477f1f 100644
--- a/nezha-fronted/src/components/chart/defaultLineData.js
+++ b/nezha-fronted/src/components/chart/defaultLineData.js
@@ -41,18 +41,7 @@ const data = {
   seq: null,
   x: 0,
   y: 12,
-  elements: [
-    {
-      id: '',
-      chartId: '',
-      expression: '',
-      type: 'expert',
-      legend: '',
-      buildIn: '',
-      name: 'A',
-      state: 1
-    }
-  ],
+  elements: [],
   sync: null,
   panel: {
     id: 1244,
diff --git a/nezha-fronted/src/components/chart/defaultLogData.js b/nezha-fronted/src/components/chart/defaultLogData.js
index 813127e99..799c598f0 100644
--- a/nezha-fronted/src/components/chart/defaultLogData.js
+++ b/nezha-fronted/src/components/chart/defaultLogData.js
@@ -40,17 +40,7 @@ const data = {
   seq: null,
   x: 0,
   y: 12,
-  elements: [
-    {
-      id: '',
-      chartId: '',
-      expression: '',
-      type: 'expert',
-      legend: '',
-      name: 'A',
-      state: 1
-    }
-  ],
+  elements: [],
   sync: null,
   panel: {
     id: 1244,
diff --git a/nezha-fronted/src/components/chart/defaultTableData.js b/nezha-fronted/src/components/chart/defaultTableData.js
new file mode 100644
index 000000000..c7e1b4464
--- /dev/null
+++ b/nezha-fronted/src/components/chart/defaultTableData.js
@@ -0,0 +1,97 @@
+const TableData = {
+  id: 697356,
+  name: 'Table',
+  loaded: true,
+  panelId: 1479,
+  groupId: 0,
+  span: 4.0,
+  height: 3.0,
+  updateBy: 1,
+  updateAt: '2021-12-14 03:24:25',
+  type: 'table',
+  unit: 2,
+  weight: 5,
+  param: {
+    enable: {
+      thresholds: true,
+      legend: true,
+      valueMapping: true
+    },
+    columns: [{
+      unit: 1,
+      display: '{{A.$legend}}',
+      show: true,
+      title: 'Element'
+    }, {
+      unit: 2,
+      display: '{{A.$value}}',
+      show: true,
+      title: 'Value'
+    }],
+    indexs: '',
+    valueMapping: [],
+    nullType: 'zero',
+    statistics: 'last'
+  },
+  pid: null,
+  buildIn: 0,
+  remark: 'This is table',
+  seq: null,
+  x: 0.0,
+  y: 10.0,
+  elements: [],
+  sync: null,
+  panel: {
+    id: 1479,
+    name: 'Chart Component Configuration Test',
+    createBy: null,
+    type: null,
+    link: null,
+    pid: null,
+    weight: null,
+    buildIn: null,
+    seq: null,
+    children: null,
+    parent: null,
+    chartNum: null
+  },
+  group: {
+    id: 0,
+    name: null,
+    panelId: null,
+    groupId: null,
+    span: null,
+    height: null,
+    updateBy: null,
+    updateAt: null,
+    type: null,
+    unit: null,
+    weight: null,
+    param: null,
+    pid: null,
+    buildIn: null,
+    remark: null,
+    seq: null,
+    x: null,
+    y: null,
+    elements: null,
+    sync: null,
+    panel: null,
+    group: null,
+    children: null,
+    chartNums: null,
+    asset: null,
+    varType: null,
+    varId: null,
+    varName: null,
+    datasource: null
+  },
+  children: null,
+  chartNums: null,
+  asset: null,
+  varType: null,
+  varId: null,
+  varName: null,
+  datasource: 'metrics'
+}
+export default TableData
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 75e8d08d9..a14296485 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -3,7 +3,7 @@
   <div :class="{'panel-chart--fullscreen': isFullscreen}" class="panel-chart" :id="isFullscreen ? ('chart-screen-' + chartInfo.id ) : ('chart-local-' + chartInfo.id)"  v-loading="loading">
     <!-- title和工具栏，支持浮动 -->
     <chart-header
-      v-if="!isFullscreen"
+      v-if="!isFullscreen&&showHeader"
       :is-group="isGroup(chartInfo.type)"
       :isError="isError"
       :chartData="chartData"
@@ -43,6 +43,7 @@
       :panelLock="panelLock"
       :filter="filter"
       :from="from"
+      :show-header="showHeader"
       :isError="isError"
       :loading="loading"
       :minusTime="minusTime"
@@ -80,7 +81,11 @@ export default {
     panelLock: Boolean,
     chartDetailInfo: Object,
     from: String,
-    filter: {}
+    filter: {},
+    showHeader: {
+      type: Boolean,
+      default: true
+    }
   },
   data () {
     return {
@@ -418,6 +423,7 @@ export default {
       immediate: true,
       deep: true,
       handler (n) {
+        console.log(n)
       }
     }
   },
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
index 13084cfd8..4b0be2577 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
@@ -723,7 +723,7 @@ export default {
                           value: ['', val]
                         }
                       }
-                      this.$set(metrics, 'value#' + index, chartDataFormat.getUnit(this.chartUnit).compute(result.value[1], null, 2))
+                      this.$set(metrics, 'value#' + index, chartDataFormat.getUnit(this.chartUnit || 2).compute(result.value[1], null, 2))
                       for (const key in metrics) {
                         const label = {
                           label: key === '__name__' ? 'metric' : key,
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
index 20235dfbf..f80017758 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
@@ -434,7 +434,7 @@ export default {
           } else if (dot > 6) {
             dot = 6
           }
-          str += chartDataFormat.getUnit(this.unit).compute(val, null, -1, dot)
+          str += chartDataFormat.getUnit(this.unit || 2).compute(val, null, -1, dot)
           const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName)
           if (previousItem) {
             str += '<span style="padding-left: 10px; display: inline-block;width: 65px;text-align: right;box-sizing: border-box;padding-right: 10px">'