diff --git a/nezha-fronted/src/assets/css/components/common/table/settings/cortexDetailTable.scss b/nezha-fronted/src/assets/css/components/common/table/settings/cortexDetailTable.scss new file mode 100644 index 000000000..d9647f4ed --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/table/settings/cortexDetailTable.scss @@ -0,0 +1,139 @@ +#cortexDetail { + .sub-container .nz-table-list{ + height: 100%; + min-height: 1169px !important; + } + #cortexDetailTable { + display: flex; + flex-direction: column; + height: 100%; + min-height: 1144px !important; + .has-gutter { + th { + background: $--background-color-2; + } + } + .cortex-title { + font-size: 14px; + color: $--color-text-regular; + letter-spacing: 0; + font-weight: 700; + margin-top: 30px; + margin-bottom: 10px; + } + .cortex-service { + & > div:nth-of-type(3) { + margin-top: -1px; + } + td, + th { + .cell { + padding-left: 20px; + } + } + } + .cortex-ring { + td { + border-bottom: none; + } + .cortex-store-gateway { + margin-top: -1px; + .has-gutter { + display: none; + } + } + } + + .cortex-service, + .cortex-ring { + .el-table { + border-left: none; + .el-table__header-wrapper:hover { + th { + border-right-color: transparent !important; + } + } + } + tr { + td, + th { + border-left: 1px solid $--border-color-light !important; + } + } + } + + .cortex-config { + position: relative; + flex: 1; + .cortex-config-tab { + position: absolute; + width: 100%; + height: calc(100% - 92px); + .config-tab { + overflow: hidden; + .el-table__body-wrapper { + height: 100%; + tbody { + tr:hover > td { + background-color: $--background-color-empty; + } + tr > td:nth-of-type(1) { + background: $--background-color-2; + border-right: 1px solid $--border-color-light; + .cell { + padding-left: 3px; + padding-right: 3px; + text-align: center; + } + } + tr > td:nth-of-type(2) { + .cell { + color: $--color-text-primary; + padding-left: 20px; + } + } + td { + padding: 2px 0; + border-bottom: none; + } + } + } + } + } + .config-tab, + .config-switch-tab { + height: 100%; + border: 1px solid $--border-color-light; + border-bottom: none; + .has-gutter { + th:nth-of-type(1) { + border-right: 1px solid $--border-color-light !important; + border-bottom: none; + } + th > div { + text-align: end; + } + } + } + .config-switch-tab { + .has-gutter { + th:nth-of-type(2) { + border-bottom: none; + } + } + .el-table__body-wrapper { + display: none; + } + } + } + + .table-no-data { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + } + } +} diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index b07f48f12..01da4de7a 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -69,6 +69,7 @@ @import './common/table/settings/userTable.scss'; @import './common/table/settings/backupsTable.scss'; @import './common/table/settings/switchTab.scss'; +@import './common/table/settings/cortexDetailTable.scss'; @import './common/table/special/endpointQuery.scss'; @import './common/globalSearch/globalSearch'; @import './common/globalSearch/searchItemInfo'; diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue index b77e6e32a..2434caf9d 100644 --- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue +++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue @@ -66,7 +66,8 @@ - + + @@ -107,6 +108,7 @@ import LogBottomTab from '@/components/common/bottomBox/tabs/logBottomTab' import processBottomTab from '@/components/common/bottomBox/tabs/processBottomTab' import networkBottomTab from '@/components/common/bottomBox/tabs/networkBottomTab' import scrapeEndpoint from '@/components/common/bottomBox/tabs/scrapeEndpoint' +import cortexDetail from '@/components/common/bottomBox/tabs/cortexDetail' import IpDetails from '@/components/common/bottomBox/tabs/IpDetails' import recordRuleEvalLog from '@/components/common/bottomBox/tabs/recordRuleEvalLog' import routerPathParams from '@/components/common/mixin/routerPathParams' @@ -116,6 +118,7 @@ export default { mixins: [routerPathParams], components: { scrapeEndpoint, + cortexDetail, LogBottomTab, processBottomTab, networkBottomTab, @@ -245,9 +248,16 @@ export default { { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true } ] }, - agent: [ - { prop: 'agent', name: this.$t('config.agent.scrapeEndpoint'), active: true } - ], + agent: { + scrapeEndpoint: [ + { prop: 'scrapeEndpoint', name: this.$t('config.agent.scrapeEndpoint'), active: true }, + { prop: 'cortexDetail', name: this.$t('config.agent.cortexDetail'), active: false } + ], + cortexDetail: [ + { prop: 'scrapeEndpoint', name: this.$t('config.agent.scrapeEndpoint'), active: false }, + { prop: 'cortexDetail', name: this.$t('config.agent.cortexDetail'), active: true } + ] + }, ipam: [ { prop: 'ipam', name: this.$t('ipam.subnet.ipDetails'), active: true } ], diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue new file mode 100644 index 000000000..5e631a057 --- /dev/null +++ b/nezha-fronted/src/components/common/bottomBox/tabs/cortexDetail.vue @@ -0,0 +1,111 @@ + + + diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue index af3f26dff..bb4e17445 100644 --- a/nezha-fronted/src/components/common/table/settings/agentTable.vue +++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue @@ -77,7 +77,7 @@
{{$t('overall.option')}}
- +
diff --git a/nezha-fronted/src/components/common/table/settings/cortexDetailTable.vue b/nezha-fronted/src/components/common/table/settings/cortexDetailTable.vue new file mode 100644 index 000000000..1c603255c --- /dev/null +++ b/nezha-fronted/src/components/common/table/settings/cortexDetailTable.vue @@ -0,0 +1,310 @@ + + + + +