From 614a9c183fc444b906b91aa9f01a4c805cb1d0e9 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 29 Jul 2021 16:23:15 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-887=EF=BC=9A=E5=BD=93=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9C=AA=E5=88=9B=E5=BB=BA=20dashboard=20panel=20=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8Cchart=20=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/charts/chart-list.vue      |  1 +
 .../components/common/bottomBox/bottomBox.vue | 11 ++++--
 .../common/bottomBox/tabs/panelTabNew.vue     |  1 +
 .../src/components/common/js/constants.js     | 37 +++++++++++++++++++
 .../common/rightBox/addEndpointBox.vue        |  2 +
 .../components/common/rightBox/agentBox.vue   | 11 ++++--
 .../components/common/table/nzDataList.vue    |  4 ++
 .../src/components/page/asset/asset.vue       |  1 +
 .../page/config/template/chartTemp.vue        |  1 +
 .../page/monitor/endpoint/endpointList.vue    |  1 +
 10 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index d7951dc4a..b508f2185 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -656,6 +656,7 @@ export default {
       if (!param.query) delete param.query
       // 根据panelId获得panel下的所有图表
       // const groupId = true ? '&groupId=0' : ''
+      if (!params.panelId) { return } // 没有panelId不调用接口
       this.$get('visual/panel/chart?panelId=' + params.panelId + '&groupId=0' + '&pageSize=-1').then(response => {
         if (response.code === 200) {
           response.data.list.forEach((item, index) => {
diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index 043061b6b..8f24c2d7c 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -37,20 +37,20 @@
         <operation-log-tab v-if="from === fromRoute.user && targetTab === 'operationLogTab'" :from="from" :obj="obj" :tabs="tabs.user.operationLog" @changeTab="changeTab"></operation-log-tab>
         <terminal-log-tab v-if="from === fromRoute.user && targetTab === 'terminalLogTab'" :from="from" :obj="obj" :tabs="tabs.user.terminalLog" @changeTab="changeTab"></terminal-log-tab>
         <!-- asset列表的3个 -->
-        <panel-tab-new :paramsType="'asset'" v-if="from === fromRoute.asset && targetTab === 'panelTab'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.asset.panel" :targetTab.sync="targetTab" @changeTab="changeTab"></panel-tab-new>
+        <panel-tab-new @getTableData="getTableData" :paramsType="'asset'" v-if="from === fromRoute.asset && targetTab === 'panelTab'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.asset.panel" :targetTab.sync="targetTab" @changeTab="changeTab"></panel-tab-new>
         <alertMessageTabNew v-if="from === fromRoute.asset && targetTab === 'alertMessageTab'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.asset.alertMessage" :targetTab="targetTab" @changeTab="changeTab"></alertMessageTabNew>
         <endpointTabNew v-if="from === fromRoute.asset && targetTab === 'endpointTab'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.asset.endpoint" :targetTab="targetTab" @changeTab="changeTab"></endpointTabNew>
         <assetSubTab v-if="from === fromRoute.asset && targetTab === 'assetSubTab' && obj.childrenNum" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.asset.alertMessageSub" :targetTab="targetTab" @changeTab="changeTab"></assetSubTab>
         <!--module列表的tab-->
         <endpointTabNew v-if="from === fromRoute.module && targetTab === 'endpoint'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.module.moduleTabTitle" :targetTab="targetTab" @changeTab="changeTab"></endpointTabNew>
         <alertMessageTabNew v-if="from === fromRoute.module && targetTab === 'moduleAlertMessage'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.module.moduleTabTitle" @changeTab="changeTab" :targetTab="targetTab"></alertMessageTabNew>
-        <panel-tab-new :paramsType="'module'" v-if="from === fromRoute.module && targetTab === 'panel'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.module.moduleTabTitle" :targetTab.sync="targetTab" @changeTab="changeTab"></panel-tab-new>
+        <panel-tab-new @getTableData="getTableData" :paramsType="'module'" v-if="from === fromRoute.module && targetTab === 'panel'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.module.moduleTabTitle" :targetTab.sync="targetTab" @changeTab="changeTab"></panel-tab-new>
         <!--endpoint列表的tab-->
-        <panel-tab-new :paramsType="'endpoint'" v-if="from === fromRoute.endpoint && targetTab === 'panelTab'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.endpoint.endpointTabTitle" :targetTab.sync="targetTab" @changeTab="changeTab"></panel-tab-new>
+        <panel-tab-new @getTableData="getTableData" :paramsType="'endpoint'" v-if="from === fromRoute.endpoint && targetTab === 'panelTab'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.endpoint.endpointTabTitle" :targetTab.sync="targetTab" @changeTab="changeTab"></panel-tab-new>
         <endpointQuery v-if="from === fromRoute.endpoint && targetTab === 'endpointQuery'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.endpoint.endpointTabTitle" @changeTab="changeTab" :targetTab="targetTab"></endpointQuery>
         <alertMessageTabNew  v-if="from === fromRoute.endpoint && targetTab === 'endpointAlertMessage'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.endpoint.endpointTabTitle" @changeTab="changeTab" :targetTab="targetTab"></alertMessageTabNew>
         <!--chartTemp的Tab-->
-        <panel-tab-new  :paramsType="'template'" v-if="from === fromRoute.chartTemp && targetTab === 'panel'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.chartTemp.chartTempTabTitle" :targetTab.sync="targetTab" @changeTab="changeTab"></panel-tab-new>
+        <panel-tab-new @getTableData="getTableData"  :paramsType="'template'" v-if="from === fromRoute.chartTemp && targetTab === 'panel'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.chartTemp.chartTempTabTitle" :targetTab.sync="targetTab" @changeTab="changeTab"></panel-tab-new>
         <!--alertRule Tab-->
         <alertMessageTabNew v-if="from === fromRoute.alertRule && targetTab === 'alertRuleAlertMessage'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.alertRule.alertRule" @changeTab="changeTab" :targetTab="targetTab"></alertMessageTabNew>
         <!--model 下滑-->
@@ -250,6 +250,9 @@ export default {
           this.$refs.reminalLogRecordTab.consoleResize()
         }, 600)
       }
+    },
+    getTableData () {
+      this.$emit('getTableData')
     }
   }
 }
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index a0ee2c7dd..3d73ff0de 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -272,6 +272,7 @@ export default {
               this.getData(this.filter)
             }
           })
+          this.$emit('getTableData')
         }
       }
     },
diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js
index 279d6d5a8..967e40c34 100644
--- a/nezha-fronted/src/components/common/js/constants.js
+++ b/nezha-fronted/src/components/common/js/constants.js
@@ -17,6 +17,11 @@ export const agent = {
           label: 'Per-datacenter',
           value: 2,
           text: 'Per-datacenter'
+        },
+        {
+          label: 'Loki',
+          value: 11,
+          text: 'Loki'
         }
       ]
     },
@@ -65,6 +70,38 @@ export const agent2 = {
       label: 'Per-datacenter',
       value: 2,
       text: 'Per-datacenter'
+    },
+    {
+      label: 'Loki',
+      value: 11,
+      text: 'Loki'
+    }
+  ],
+  theDataGroup: [
+    {
+      label: 'Metrics',
+      option: [
+        {
+          label: 'Global',
+          value: 1,
+          text: 'Global'
+        },
+        {
+          label: 'Per-datacenter',
+          value: 2,
+          text: 'Per-datacenter'
+        }
+      ]
+    },
+    {
+      label: 'Logs',
+      option: [
+        {
+          label: 'Loki',
+          value: 11,
+          text: 'Loki'
+        }
+      ]
     }
   ]
 
diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
index 687643c1b..a272f8907 100644
--- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
@@ -556,6 +556,8 @@ export default {
       if (this.endpointTableData.length === 0) {
         this.endpointTouch = true
         this.$refs.addEndpoint.validate()
+        this.prevent_opt.save = false
+        this.showError = true
         return false
       }
       // 对endpointList进行处理，避免携带过多无用数据
diff --git a/nezha-fronted/src/components/common/rightBox/agentBox.vue b/nezha-fronted/src/components/common/rightBox/agentBox.vue
index 04e40a093..31db5bab4 100644
--- a/nezha-fronted/src/components/common/rightBox/agentBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/agentBox.vue
@@ -43,9 +43,14 @@
   <!--            :props="{ multiple: false, checkStrictly: false ,emitPath:false}"-->
   <!--            clearable></el-cascader>-->
             <el-select  v-model="editPromServer.type" :disabled="editPromServer.id != null&& editPromServer.id != ''" placeholder="" class="right-box__select" popper-class="right-box-select-dropdown prevent-clickoutside" size="small" value-key="value">
-              <el-option v-for="item in agent2.theData" :key="item.value" :label="item.label" :value="item.value" :disabled="federationEnabled && item.value == 2">
-                <span class="panel-dropdown-label-txt" >{{item.label}}</span>
-              </el-option>
+              <el-option-group
+                v-for="group in agent2.theDataGroup"
+                :key="group.label"
+                :label="group.label">
+                <el-option v-for="item in group.option" :key="item.value" :label="item.label" :value="item.value" :disabled="federationEnabled && item.value == 2">
+                  <span class="panel-dropdown-label-txt" >{{item.label}}</span>
+                </el-option>
+              </el-option-group>
             </el-select>
           </el-form-item>
           <el-form-item label="Token" prop="token">
diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue
index 8831de331..66cdd51fa 100644
--- a/nezha-fronted/src/components/common/table/nzDataList.vue
+++ b/nezha-fronted/src/components/common/table/nzDataList.vue
@@ -47,6 +47,7 @@
     </div>
     <transition name="el-zoom-in-bottom">
       <bottom-box v-if="bottomBox.showSubList"
+                  @getTableData = 'getTableData'
                   ref="bottomBox"
                   :from="from"
                   :is-full-screen="bottomBox.isFullScreen"
@@ -137,6 +138,9 @@ export default {
     },
     search (searchObj) {
       this.$emit('search', searchObj)
+    },
+    getTableData () {
+      this.$emit('getTableData')
     }
   },
   watch: {
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 110b47f7d..5fc3a0f85 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -8,6 +8,7 @@
       :layout="dataListLayout"
       :search-msg="searchMsg"
       @search="search"
+      @getTableData="getTableData"
     >
       <template v-slot:top-tool-right>
         <button id="asset-filter" :class="{ 'is-focus': dataListLayout.indexOf('clickSearch') > -1 }" class="top-tool-btn margin-r-10" @click.stop="showClickSearch">
diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue
index 5897c0c0d..f369b91fe 100644
--- a/nezha-fronted/src/components/page/config/template/chartTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue
@@ -8,6 +8,7 @@
       :from="fromRoute.chartTemp"
       :search-msg="searchMsg"
       @search="search"
+      @getTableData="getTableData"
     >
       <template v-slot:top-tool-left>
         <div id="module-type-1"  class="nz-tab-item-box" @click="clickTab([],'exprTemp')"><!--v-has="'snmp_browser_view'"-->
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index b9f4bdbd7..801523b62 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -8,6 +8,7 @@
       :layout="dataListLayout"
       :search-msg="searchMsg"
       @search="search"
+      @getTableData="getTableData"
     >
       <template v-slot:top-tool-right>
         <button id="asset-filter" :class="{ 'is-focus': dataListLayout.indexOf('clickSearch') > -1 }" class="top-tool-btn margin-r-10" @click.stop="showClickSearch">