From fd77ced048de12d1faa09dafa814b91120252d9f Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 18 May 2021 19:18:14 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=20=E6=89=80=E6=9C=89=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=20=E6=B7=BB=E5=8A=A0=20loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/alert/alertMessage.vue         |  2 +-
 nezha-fronted/src/components/page/alert/alertRule.vue  |  2 +-
 .../src/components/page/alert/alertSilence.vue         |  2 +-
 nezha-fronted/src/components/page/asset/asset.vue      |  2 +-
 nezha-fronted/src/components/page/config/agent.vue     |  2 +-
 nezha-fronted/src/components/page/config/assetMeta.vue |  2 +-
 nezha-fronted/src/components/page/config/assetType.vue |  2 +-
 .../src/components/page/config/credentials.vue         |  2 +-
 nezha-fronted/src/components/page/config/dc.vue        |  2 +-
 nezha-fronted/src/components/page/config/menus.vue     |  2 +-
 nezha-fronted/src/components/page/config/mib.vue       |  2 +-
 nezha-fronted/src/components/page/config/model.vue     |  2 +-
 .../src/components/page/config/operationLog.vue        |  2 +-
 nezha-fronted/src/components/page/config/roles.vue     |  2 +-
 .../src/components/page/config/system/apiKeyTab.vue    |  2 +-
 .../src/components/page/config/system/linkTab.vue      |  2 +-
 .../components/page/config/system/notifyMethodTab.vue  |  2 +-
 .../src/components/page/config/template/chartTemp.vue  |  2 +-
 .../src/components/page/config/template/exprTemp.vue   |  2 +-
 .../src/components/page/config/terminalLog.vue         |  2 +-
 nezha-fronted/src/components/page/config/user.vue      |  2 +-
 nezha-fronted/src/components/page/dashboard/panel.vue  | 10 +++++-----
 .../components/page/monitor/endpoint/endpointList.vue  |  4 ++--
 .../src/components/page/monitor/module/moduleList.vue  |  2 +-
 .../components/page/monitor/project/projectList.vue    |  2 +-
 nezha-fronted/static/config.json                       |  2 +-
 26 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 834cf2640..6bc06facb 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -26,7 +26,7 @@
       <template v-slot:default="slotProps">
         <alert-message-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue
index 076fb8a30..5e67e380e 100644
--- a/nezha-fronted/src/components/page/alert/alertRule.vue
+++ b/nezha-fronted/src/components/page/alert/alertRule.vue
@@ -37,7 +37,7 @@
       <template v-slot:default="slotProps">
         <alert-rule-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/alert/alertSilence.vue b/nezha-fronted/src/components/page/alert/alertSilence.vue
index 4efaa46ab..0c0226a61 100644
--- a/nezha-fronted/src/components/page/alert/alertSilence.vue
+++ b/nezha-fronted/src/components/page/alert/alertSilence.vue
@@ -19,7 +19,7 @@
       <template v-slot:default="slotProps">
         <alert-silence-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 4675a7855..c4c6d6143 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -48,7 +48,7 @@
       <template v-slot:default="slotProps">
         <asset-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="dataListLayout.indexOf('clickSearch') > -1 ? assetTableHeight : mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue
index 5f95520a2..bd69c1be0 100644
--- a/nezha-fronted/src/components/page/config/agent.vue
+++ b/nezha-fronted/src/components/page/config/agent.vue
@@ -22,7 +22,7 @@
       <template v-slot:default="slotProps">
         <agent-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/assetMeta.vue b/nezha-fronted/src/components/page/config/assetMeta.vue
index 6ce8f999c..19d8becd0 100644
--- a/nezha-fronted/src/components/page/config/assetMeta.vue
+++ b/nezha-fronted/src/components/page/config/assetMeta.vue
@@ -34,7 +34,7 @@
       <template v-slot:default="slotProps">
         <asset-meta-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/assetType.vue b/nezha-fronted/src/components/page/config/assetType.vue
index 60274c6a7..1592dbcf0 100644
--- a/nezha-fronted/src/components/page/config/assetType.vue
+++ b/nezha-fronted/src/components/page/config/assetType.vue
@@ -19,7 +19,7 @@
       <template v-slot="slotProps">
         <asset-type-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/credentials.vue b/nezha-fronted/src/components/page/config/credentials.vue
index d7047e5d5..ea00ccfe0 100644
--- a/nezha-fronted/src/components/page/config/credentials.vue
+++ b/nezha-fronted/src/components/page/config/credentials.vue
@@ -28,7 +28,7 @@
       <template v-slot:default="slotProps">
         <credentials-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index 1fb9651f0..e7b70fd68 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -19,7 +19,7 @@
       <template v-slot:default="slotProps">
         <dc-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/menus.vue b/nezha-fronted/src/components/page/config/menus.vue
index 104c87e3b..093f6eac7 100644
--- a/nezha-fronted/src/components/page/config/menus.vue
+++ b/nezha-fronted/src/components/page/config/menus.vue
@@ -17,7 +17,7 @@
       <template v-slot="slotProps">
         <menu-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue
index d394b56f9..c550fd056 100644
--- a/nezha-fronted/src/components/page/config/mib.vue
+++ b/nezha-fronted/src/components/page/config/mib.vue
@@ -30,7 +30,7 @@
       <template v-slot:default="slotProps">
         <mib-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index f4bf4c400..08afd4a6a 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -19,7 +19,7 @@
       <template v-slot="slotProps">
         <model-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/operationLog.vue b/nezha-fronted/src/components/page/config/operationLog.vue
index 03b4853e6..d20fe8181 100644
--- a/nezha-fronted/src/components/page/config/operationLog.vue
+++ b/nezha-fronted/src/components/page/config/operationLog.vue
@@ -11,7 +11,7 @@
       <template v-slot:default="slotProps">
         <operation-log-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/roles.vue b/nezha-fronted/src/components/page/config/roles.vue
index ac7c95e7e..f9a55a574 100644
--- a/nezha-fronted/src/components/page/config/roles.vue
+++ b/nezha-fronted/src/components/page/config/roles.vue
@@ -19,7 +19,7 @@
       <template v-slot:default="slotProps">
         <role-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/system/apiKeyTab.vue b/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
index 1ff5b1197..db12f6650 100644
--- a/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
+++ b/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
@@ -18,7 +18,7 @@
       <template v-slot:default="slotProps">
         <api-key-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :table-id="tableId"
           :api="url"
           :custom-table-title="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/page/config/system/linkTab.vue b/nezha-fronted/src/components/page/config/system/linkTab.vue
index 002961cf9..20f09ca4e 100644
--- a/nezha-fronted/src/components/page/config/system/linkTab.vue
+++ b/nezha-fronted/src/components/page/config/system/linkTab.vue
@@ -18,7 +18,7 @@
       <template v-slot:default="slotProps">
         <link-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :table-id="tableId"
           :api="url"
           :custom-table-title="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue b/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue
index 214756cd9..b932810bf 100644
--- a/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue
+++ b/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue
@@ -19,7 +19,7 @@
       <template v-slot:default="slotProps">
         <notify-method-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :table-id="tableId"
           :api="url"
           :custom-table-title="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue
index 626467454..7495fef5c 100644
--- a/nezha-fronted/src/components/page/config/template/chartTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue
@@ -42,7 +42,7 @@
       <template  v-slot="slotProps">
         <chartTmplTable
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/template/exprTemp.vue b/nezha-fronted/src/components/page/config/template/exprTemp.vue
index 7a9accf2e..b5c361bf5 100644
--- a/nezha-fronted/src/components/page/config/template/exprTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/exprTemp.vue
@@ -45,7 +45,7 @@
       <template v-slot:default="slotProps">
         <expr-tmpl-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue
index 133c5fd15..8ff6205a4 100644
--- a/nezha-fronted/src/components/page/config/terminalLog.vue
+++ b/nezha-fronted/src/components/page/config/terminalLog.vue
@@ -11,7 +11,7 @@
       <template v-slot:default="slotProps">
         <terminal-log-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/config/user.vue b/nezha-fronted/src/components/page/config/user.vue
index 21c00ccfa..04a289063 100644
--- a/nezha-fronted/src/components/page/config/user.vue
+++ b/nezha-fronted/src/components/page/config/user.vue
@@ -19,7 +19,7 @@
       <template v-slot="slotProps">
         <user-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 5c1ca8b36..e8116dde1 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -320,14 +320,14 @@ export default {
     closeChartBox (refresh) {
       this.rightBox.chart.show = false
       /* if (refresh) {
-
+         this.getData(this.filter)
       } */
     },
-    closeChartTempBox () {
+    closeChartTempBox (refresh) {
       this.rightBox.chartTemp.show = false
-      /* if (refresh) {
-
-      } */
+      if (refresh) {
+        this.getData(this.filter)
+      }
     },
     closePanelBox (refresh) {
       this.rightBox.panel.show = false
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 1f914583e..8782a3a53 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -44,10 +44,10 @@
       <template v-slot:search>
         <clickSearch :titleSearchList="titleSearchList" :selectValue.sync="selectValue" @reload="reloadTable"/>
       </template>
-      <template v-slot="slotProps">
+      <template  v-slot:default="slotProps">
         <endpoint-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          :loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="dataListLayout.indexOf('clickSearch') > -1 ? endpointTableHeight : mainTableHeight"
diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
index e4777665c..441a3a3c3 100644
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -34,7 +34,7 @@
       <template v-slot="slotProps">
         <module-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :tableId="tableId"
           :custom-table-title="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/page/monitor/project/projectList.vue b/nezha-fronted/src/components/page/monitor/project/projectList.vue
index 41e5a5eff..bf0ed08e8 100644
--- a/nezha-fronted/src/components/page/monitor/project/projectList.vue
+++ b/nezha-fronted/src/components/page/monitor/project/projectList.vue
@@ -20,7 +20,7 @@
       <template v-slot="slotProps">
         <project-table
           ref="dataTable"
-          v-loading="slotProps.loading"
+          v-loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="projectTableHeight"
diff --git a/nezha-fronted/static/config.json b/nezha-fronted/static/config.json
index 452d84b4f..11023ada9 100644
--- a/nezha-fronted/static/config.json
+++ b/nezha-fronted/static/config.json
@@ -1 +1 @@
-{"baseUrl":"/", "version": "2.0.2021.05.08.18.07"}
+{"baseUrl":"http://192.168.40.42:8080/nz-admin/", "version": "2.0.2021.05.11.19.43"}