feat：所有表格添加 loading

2021-05-18 19:18:14 +08:00
parent d34865c858
commit fd77ced048
26 changed files with 31 additions and 31 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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"
--- 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"
--- 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"}