From cf1f83dcba044d4cf0666b579ae499c20b8b36ac Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Wed, 20 Oct 2021 16:22:19 +0800 Subject: [PATCH 01/84] =?UTF-8?q?style:=20asset,endpoint=20=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E4=BA=8C=E7=BA=A7=E8=8F=9C=E5=8D=95=EF=BC=8Cdetail,Me?= =?UTF-8?q?trcs=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/bottomBox/bottomBox.vue | 6 ++++++ .../src/components/common/bottomBox/tabs/endpointQuery.vue | 2 +- .../src/components/common/bottomBox/tabs/panelTabNew.vue | 2 +- nezha-fronted/src/components/common/js/tools.js | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue index cd4b40e01..defe32216 100644 --- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue +++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue @@ -417,5 +417,11 @@ export default { .bottom-box .sub-container .nz-table2{ height: calc(100% - 20px); } +.asset-detail .sub-container .nz-table2 { + height: 100%; +} +.endpoint-tab-new .sub-container .nz-table2 { + height: 100%; +} /* end--二级顶部工具栏*/ diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue index 6daae9895..aa01d7c1e 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue @@ -1,5 +1,5 @@ @@ -149,7 +157,8 @@ export default { type: Boolean, default: true }, - assetTab: Boolean + assetTab: Boolean, + loading: Boolean }, data () { return { diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue index 7479e9346..ba5edfc0e 100644 --- a/nezha-fronted/src/components/common/table/settings/agentTable.vue +++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue @@ -69,6 +69,14 @@ + @@ -77,6 +85,9 @@ import table from '@/components/common/mixin/table' import { agent } from '@/components/common/js/constants' export default { name: 'agentTable', + props: { + loading: Boolean + }, mixins: [table], data () { return { diff --git a/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue b/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue index bd165d717..3a7d843bc 100644 --- a/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue +++ b/nezha-fronted/src/components/common/table/settings/assetTypeTable.vue @@ -83,6 +83,14 @@ + @@ -90,6 +98,9 @@ import table from '@/components/common/mixin/table' export default { name: 'asstTypeTable', + props: { + loading: Boolean + }, mixins: [table], data () { return { diff --git a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue index 4730c273e..d8e2312f5 100644 --- a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue +++ b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue @@ -50,6 +50,14 @@ + @@ -60,6 +68,9 @@ export default { name: 'cabinet Table', components: { Template }, mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ diff --git a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue index f153177ed..689d58ebb 100644 --- a/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue +++ b/nezha-fronted/src/components/common/table/settings/chartTmplTable.vue @@ -64,6 +64,14 @@ + @@ -73,6 +81,9 @@ import { chart as chartConstant } from '@/components/common/js/constants' export default { name: 'chartTmplTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { chartTypeList: chartConstant.type, diff --git a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue index f386d4afb..be9176525 100644 --- a/nezha-fronted/src/components/common/table/settings/credentialsTable.vue +++ b/nezha-fronted/src/components/common/table/settings/credentialsTable.vue @@ -83,6 +83,14 @@ + @@ -90,6 +98,9 @@ import table from '@/components/common/mixin/table' export default { name: 'credentialsTable', + props: { + loading: Boolean + }, mixins: [table], data () { return { diff --git a/nezha-fronted/src/components/common/table/settings/dcTable.vue b/nezha-fronted/src/components/common/table/settings/dcTable.vue index d498b4ff3..1a3e2b2ca 100644 --- a/nezha-fronted/src/components/common/table/settings/dcTable.vue +++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue @@ -41,14 +41,14 @@ @@ -108,6 +117,9 @@ import { showTableTooltip, hideTableTooltip } from '@/components/common/js/tools export default { name: 'dcTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { regNum: /^[0-9]+.?[0-9]*/, diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue index fd9fed998..b0c8b260e 100644 --- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue +++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue @@ -184,6 +184,14 @@ + @@ -201,7 +209,8 @@ export default { type: Boolean, default: true }, - endpointTab: Boolean + endpointTab: Boolean, + loading: Boolean }, data () { return { diff --git a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue index f10aa9b0f..174334a65 100644 --- a/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue +++ b/nezha-fronted/src/components/common/table/settings/exprTmplTable.vue @@ -56,6 +56,14 @@ + @@ -64,6 +72,9 @@ import table from '@/components/common/mixin/table' export default { name: 'exprTmplTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ diff --git a/nezha-fronted/src/components/common/table/settings/menuTable.vue b/nezha-fronted/src/components/common/table/settings/menuTable.vue index c6a85fe26..65397f738 100644 --- a/nezha-fronted/src/components/common/table/settings/menuTable.vue +++ b/nezha-fronted/src/components/common/table/settings/menuTable.vue @@ -72,6 +72,14 @@ + @@ -80,6 +88,9 @@ import table from '@/components/common/mixin/table' export default { name: 'menuTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ // 原table列 diff --git a/nezha-fronted/src/components/common/table/settings/mibTable.vue b/nezha-fronted/src/components/common/table/settings/mibTable.vue index 86a61f954..6bb037308 100644 --- a/nezha-fronted/src/components/common/table/settings/mibTable.vue +++ b/nezha-fronted/src/components/common/table/settings/mibTable.vue @@ -89,6 +89,14 @@ + @@ -98,6 +106,9 @@ import axios from 'axios' export default { name: 'mibTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ diff --git a/nezha-fronted/src/components/common/table/settings/modelTable.vue b/nezha-fronted/src/components/common/table/settings/modelTable.vue index d94edb31f..080fbbb55 100644 --- a/nezha-fronted/src/components/common/table/settings/modelTable.vue +++ b/nezha-fronted/src/components/common/table/settings/modelTable.vue @@ -76,6 +76,14 @@ + @@ -84,6 +92,9 @@ import table from '@/components/common/mixin/table' export default { name: 'modelTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ // 原始table列 diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue index 9ff191a59..8f606ec76 100644 --- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue @@ -81,6 +81,14 @@ + @@ -89,6 +97,9 @@ import table from '@/components/common/mixin/table' export default { name: 'moduleTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ // 原始table列 diff --git a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue index ebf8c2df4..668288c55 100644 --- a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue +++ b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue @@ -45,6 +45,14 @@ - + @@ -53,6 +61,9 @@ import table from '@/components/common/mixin/table' export default { name: 'operationLog', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue index 68a0d0e33..d5d32693e 100644 --- a/nezha-fronted/src/components/common/table/settings/projectTable.vue +++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue @@ -80,6 +80,14 @@ + @@ -88,6 +96,9 @@ import table from '@/components/common/mixin/table' export default { name: 'projectTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ // 原始table列 diff --git a/nezha-fronted/src/components/common/table/settings/roleTable.vue b/nezha-fronted/src/components/common/table/settings/roleTable.vue index 21a42be97..5fe97534f 100644 --- a/nezha-fronted/src/components/common/table/settings/roleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/roleTable.vue @@ -64,6 +64,14 @@ + @@ -72,6 +80,9 @@ import table from '@/components/common/mixin/table' export default { name: 'roleTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ // 原table列 diff --git a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue index 7714c684b..4833d7cfc 100644 --- a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue +++ b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue @@ -103,6 +103,14 @@ + @@ -116,7 +124,8 @@ export default { props: { nowTime: {}, terminalLogTab: Boolean, - terminalLog: Boolean + terminalLog: Boolean, + loading: Boolean }, data () { return { diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue index 768ddc47c..ed25b3d1d 100644 --- a/nezha-fronted/src/components/common/table/settings/userTable.vue +++ b/nezha-fronted/src/components/common/table/settings/userTable.vue @@ -54,14 +54,14 @@ {{utcTimeToTimezoneStr(scope.row[item.prop])}} {{utcTimeToTimezoneStr(scope.row[item.prop])}} @@ -93,6 +93,14 @@ + @@ -101,6 +109,9 @@ import table from '@/components/common/mixin/table' export default { name: 'userTable', mixins: [table], + props: { + loading: Boolean + }, data () { return { tableTitle: [ // 原始table列 @@ -154,7 +165,7 @@ export default { show: true, width: 150 }, { - label: this.$t('config.user.enable'), + label: this.$t('config.user.state'), prop: 'status', show: true, width: 100 diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 82319b138..b86faf1a0 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -52,6 +52,7 @@ + @@ -106,6 +114,9 @@ import { tableCommon } from './systemCommon' import table from '@/components/common/mixin/table' export default { name: 'apiKeyTable', + props: { + loading: Boolean + }, mixins: [table, tableCommon], data () { return { diff --git a/nezha-fronted/src/components/page/config/system/linkTab.vue b/nezha-fronted/src/components/page/config/system/linkTab.vue index 8f18a0666..252d2216f 100644 --- a/nezha-fronted/src/components/page/config/system/linkTab.vue +++ b/nezha-fronted/src/components/page/config/system/linkTab.vue @@ -20,6 +20,7 @@ + @@ -86,6 +94,9 @@ import bus from '../../../../libs/bus' import table from '@/components/common/mixin/table' export default { name: 'linkTable', + props: { + loading: Boolean + }, mixins: [table, tableCommon], data () { return { diff --git a/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue b/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue index 0a674b815..90b99606c 100644 --- a/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue +++ b/nezha-fronted/src/components/page/config/system/notifyMethodTab.vue @@ -21,6 +21,7 @@ + @@ -95,6 +103,9 @@ import table from '@/components/common/mixin/table' import { tableCommon } from './systemCommon' export default { name: 'notifyMethodTable', + props: { + loading: Boolean + }, mixins: [table, tableCommon], data () { return { diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue index 6f05825e1..ed4395df0 100644 --- a/nezha-fronted/src/components/page/config/terminalLog.vue +++ b/nezha-fronted/src/components/page/config/terminalLog.vue @@ -12,6 +12,7 @@
-
+
@@ -892,6 +892,7 @@ export default { From bbe760999da02b569481e1c36172b65ce9024a7f Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Mon, 25 Oct 2021 14:45:28 +0800 Subject: [PATCH 15/84] =?UTF-8?q?style:=20=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/common/tableCommon.scss | 4 ++-- .../src/components/common/table/alert/alertMessageTable.vue | 2 +- .../src/components/common/table/alert/alertRuleTable.vue | 2 +- .../src/components/common/table/alert/alertSilenceTable.vue | 2 +- .../src/components/common/table/asset/assetMetaTable.vue | 2 +- .../src/components/common/table/asset/assetTable.vue | 2 +- .../src/components/common/table/settings/agentTable.vue | 2 +- .../src/components/common/table/settings/assetTypeTable.vue | 2 +- .../src/components/common/table/settings/cabinetTable.vue | 2 +- .../src/components/common/table/settings/chartTmplTable.vue | 2 +- .../src/components/common/table/settings/credentialsTable.vue | 2 +- .../src/components/common/table/settings/dcTable.vue | 2 +- .../src/components/common/table/settings/endpointTable.vue | 2 +- .../src/components/common/table/settings/exprTmplTable.vue | 2 +- .../src/components/common/table/settings/menuTable.vue | 2 +- .../src/components/common/table/settings/mibTable.vue | 2 +- .../src/components/common/table/settings/modelTable.vue | 2 +- .../src/components/common/table/settings/moduleTable.vue | 2 +- .../components/common/table/settings/operationLogTable.vue | 2 +- .../src/components/common/table/settings/projectTable.vue | 2 +- .../src/components/common/table/settings/roleTable.vue | 2 +- .../src/components/common/table/settings/terminalLogTable.vue | 2 +- .../src/components/common/table/settings/userTable.vue | 2 +- .../src/components/common/table/special/endpointQueryTab.vue | 2 +- .../src/components/page/config/system/apiKeyTable.vue | 2 +- nezha-fronted/src/components/page/config/system/linkTable.vue | 2 +- .../src/components/page/config/system/notifyMethodTable.vue | 2 +- .../src/components/page/dashboard/explore/exploreItem.vue | 2 +- .../src/components/page/dashboard/explore/logTab.vue | 4 ++-- 29 files changed, 31 insertions(+), 31 deletions(-) diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 96c82ebeb..97ebfaec2 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -482,10 +482,10 @@ .fade-leave-active { transition: opacity 1s; } -.right-no-data /deep/ .icon { +.table-no-data /deep/ .icon { width: 5rem; height: 5rem; } -.right-no-data { +.table-no-data { line-height: 21px; } diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue index 28098917f..0ef65ff26 100644 --- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue @@ -126,7 +126,7 @@