From b1e4745909b207c44db0f967119a69cf4271fdb4 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Fri, 25 Mar 2022 15:40:05 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-1739=20feat:=20=E8=A1=A5=E5=85=85loading=20?= =?UTF-8?q?=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/common/bottomBox/bottomBox.scss | 5 ++++- .../src/components/chart/chart/chartAutotopology.vue | 2 +- .../src/components/chart/chart/chartHexagon.vue | 4 ++-- nezha-fronted/src/components/chart/panelChart.vue | 2 +- .../src/components/charts/chart-alert-list.vue | 2 +- nezha-fronted/src/components/cli/webSSH.vue | 4 ++-- .../src/components/common/ChartDiagram/diagram.vue | 4 ++-- .../src/components/common/alert/alertLabel.vue | 10 +++++----- .../src/components/common/alert/alertLabel2.vue | 10 +++++----- .../src/components/common/alert/alertRuleInfo.vue | 2 +- .../components/common/alert/selectAlertSilence.vue | 2 +- .../components/common/bottomBox/tabs/IpDetails.vue | 2 +- .../common/bottomBox/tabs/alertMessageTabNew.vue | 5 +++-- .../common/bottomBox/tabs/alertRuleEvalLog.vue | 2 +- .../components/common/bottomBox/tabs/assetSubTab.vue | 3 ++- .../components/common/bottomBox/tabs/assetTab.vue | 2 +- .../components/common/bottomBox/tabs/cabinetTab.vue | 2 +- .../common/bottomBox/tabs/endpointQueryTab.vue | 2 +- .../components/common/bottomBox/tabs/endpointTab.vue | 2 +- .../common/bottomBox/tabs/endpointTabNew.vue | 2 +- .../common/bottomBox/tabs/logBottomTab.vue | 4 ++-- .../common/bottomBox/tabs/operationLogTab.vue | 2 +- .../components/common/bottomBox/tabs/panelTabNew.vue | 6 +++--- .../common/bottomBox/tabs/scrapeEndpoint.vue | 2 +- .../common/bottomBox/tabs/terminalLogTab.vue | 2 +- .../components/common/globalSearch/globalSearch.vue | 6 +++--- nezha-fronted/src/components/common/login.vue | 6 +++--- nezha-fronted/src/components/common/nzTransfer.vue | 2 +- .../src/components/common/overView/messageAsset.vue | 4 ++-- .../src/components/common/project/popData/Info.vue | 2 +- .../components/common/project/popData/alertTable.vue | 2 +- .../components/common/project/popData/assetTable.vue | 2 +- .../common/project/popData/endpointTable.vue | 2 +- .../src/components/common/project/topologyL5.vue | 4 ++-- .../common/rightBox/chart/systemChartConfig.vue | 2 +- .../common/table/special/endpointQueryTab.vue | 4 ++-- .../src/components/page/alert/alertMessage.vue | 2 +- .../src/components/page/alert/alertRule.vue | 6 +++--- .../src/components/page/alert/alertSilence.vue | 2 +- nezha-fronted/src/components/page/config/agent.vue | 2 +- .../src/components/page/config/assetMeta.vue | 2 +- .../src/components/page/config/assetState.vue | 2 +- .../src/components/page/config/assetType.vue | 2 +- .../src/components/page/config/credentials.vue | 2 +- nezha-fronted/src/components/page/config/dc.vue | 6 +++--- .../src/components/page/config/globalization.vue | 2 +- nezha-fronted/src/components/page/config/ipam.vue | 2 +- nezha-fronted/src/components/page/config/menus.vue | 2 +- nezha-fronted/src/components/page/config/mib.vue | 2 +- .../src/components/page/config/mibBrowser.vue | 4 ++-- nezha-fronted/src/components/page/config/model.vue | 2 +- .../src/components/page/config/operationLog.vue | 2 +- .../src/components/page/config/operationRecord.vue | 2 +- nezha-fronted/src/components/page/config/profile.vue | 2 +- nezha-fronted/src/components/page/config/roles.vue | 2 +- .../src/components/page/config/system/apiKeyTab.vue | 2 +- .../src/components/page/config/system/license.vue | 2 +- .../src/components/page/config/system/linkTab.vue | 2 +- .../page/config/system/notifyMethodTab.vue | 2 +- .../components/page/config/template/chartTemp.vue | 4 ++-- .../src/components/page/config/template/exprTemp.vue | 2 +- .../src/components/page/config/terminalLog.vue | 6 +++--- nezha-fronted/src/components/page/config/user.vue | 6 +++--- .../page/dashboard/explore/exploreItem.vue | 6 +++--- .../page/dashboard/explore/promqlInput.vue | 8 ++++---- .../components/page/dashboard/overview/overview.vue | 12 ++++++------ .../components/page/dashboard/overview/overview2.vue | 12 ++++++------ .../src/components/page/dashboard/panel.vue | 6 +++--- .../page/monitor/endpoint/endpointList.vue | 8 ++++---- .../components/page/monitor/module/moduleList.vue | 6 +++--- .../components/page/monitor/project/projectList.vue | 2 +- 71 files changed, 130 insertions(+), 125 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss index c63cf9dc5..2e3ef09d2 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -168,8 +168,11 @@ .bottom-box .sub-container{ height: calc(100% - 64px); } -.bottom-box .sub-container .nz-table2{ +.bottom-box .sub-container .nz-table2 { height: calc(100% - 20px); + .bottom-box__top .my-loading-box { + height: calc(100% + 20px) !important; + } } .asset-detail .sub-container .nz-table2 { height: 100%; diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue index fb47b5912..a65e93c8d 100644 --- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue +++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue @@ -1,5 +1,5 @@