diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 786866073..d6ccd8e2e 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -129,7 +129,7 @@ width: 200px; line-height: 40px; font-size: 16px; - color: #202F3F; + color: $--color-text-regular; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; @@ -527,3 +527,7 @@ ::-webkit-scrollbar-corner { background-color: $--background-color-empty; } +.full-width-height{ + width: 100%; + height: 100%; +} 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 c21903c8e..bd1e5ad61 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -32,6 +32,15 @@ &>.nz-table2 { height: 100%; padding-top: 20px !important; + .table-list { + background-color: $--background-color-empty; + .list-width { + width: 100%; + padding: 0 10px 5px; + box-sizing: border-box; + overflow: hidden; + } + } } } .sub-top-tools .top-tool-btn-txt .nz-icon{ @@ -46,9 +55,10 @@ .has-sub-popper { color: $--color-danger; } -.sub-box { +.sub-box.bottom-box { height: 50%; position: relative; + padding: 0; } .sub-list { height: calc(100% - 9px); @@ -138,3 +148,8 @@ .symbol-select .el-input__inner { padding-left: 8px; } +.list-page.endpoint,.list-page.asset { + .nz-table2 { + height: 100%; + } +} diff --git a/nezha-fronted/src/assets/css/components/common/detailView/detailView.scss b/nezha-fronted/src/assets/css/components/common/detailView/detailView.scss index 0f0c00641..c140911c5 100644 --- a/nezha-fronted/src/assets/css/components/common/detailView/detailView.scss +++ b/nezha-fronted/src/assets/css/components/common/detailView/detailView.scss @@ -26,6 +26,9 @@ flex: 1; height: calc(100% - 100px); } + .detail-row.selected { + background-color: $--detail-left-background-color; + } .nz-detail-view-pagination { height: 30px; text-align: center; @@ -68,17 +71,15 @@ color: $--color-text-regular; vertical-align: middle; } - /deep/ .bottom-log { +.bottom-log { height: 100%; overflow-y: auto; padding-top: 15px; } } -.detail-view { - .list-page div.main-container{ +.list-page div.main-container{ height: calc(100% - 20px); width: calc(100% - 20px); - } } .nz-detail-view-no-data { border-top: 1px solid $--border-color-light; diff --git a/nezha-fronted/src/assets/css/components/common/detailView/detailViewTopSearch.scss b/nezha-fronted/src/assets/css/components/common/detailView/detailViewTopSearch.scss index ac5a916a2..ba26178c0 100644 --- a/nezha-fronted/src/assets/css/components/common/detailView/detailViewTopSearch.scss +++ b/nezha-fronted/src/assets/css/components/common/detailView/detailViewTopSearch.scss @@ -6,7 +6,7 @@ border-radius: 2px; } .search-detail-box:hover{ - background: #F9F9F9; + background: $--background-color-base; } .search-detail-box.select-dropdown{ background: #F9F9F9; @@ -51,6 +51,7 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + display: flex; .el-checkbox{ width: calc(100% - 20px); height: 36px; @@ -79,7 +80,7 @@ } .el-dropdown-menu__item:not(.is-disabled):hover{ color: $--color-text-secondary; - background: $--background-color-empty !important; + background: $--background-color-base !important; } } .clear-all-select{ diff --git a/nezha-fronted/src/assets/css/components/common/detailView/view/detailViewRight.scss b/nezha-fronted/src/assets/css/components/common/detailView/view/detailViewRight.scss index 129ecf20d..70b771ffa 100644 --- a/nezha-fronted/src/assets/css/components/common/detailView/view/detailViewRight.scss +++ b/nezha-fronted/src/assets/css/components/common/detailView/view/detailViewRight.scss @@ -1,74 +1,69 @@ -.detail-view-sub-box { - .detail-view-right-top { - height: 60px; - background: $--background-color-empty; - border: 1px solid $--border-color-light; - margin-bottom: 10px - } - - .sub-box { - height: 100%; - flex-direction: column; - } - - .sub-list__tabs { - flex: 1; - background-color: $--background-color-empty; - height: calc(100% - 12px); - border: 1px solid $--border-color-light; - - & > div { +.detail-view.asset { + .nz-detail-view-right { + .sub-box { height: 100%; + flex-direction: column; + } + .sub-box .top-tools.top-tools--sub { + padding: 0 15px 0 0; + margin-right: 15px; + margin-left: 20px; + border: none; + border-bottom: 1px solid $--border-color-light; + } - & > .nz-table2 { - height: calc(100% - 92px); - padding: 20px 20px 0; + .sub-box { + padding: 0; + } + + .sub-box .sub-list__tabs .chart-list .nz-table2 { + padding: 20px; + height: 100%; + } + + .sub-box .table-list { + padding: 0; + height: 100%; + background-color: $--background-color-empty; + } + + .sub-box .pagination-bottom { + bottom: -3px; + } + + .sub-box .sub-list-tab { + cursor: pointer; + } + .sub-list__tabs { + flex: 1; + background-color: $--background-color-empty; + height: calc(100% - 12px); + border: 1px solid $--border-color-light; + + & > div { + height: 100%; + + & > .nz-table2 { + height: calc(100% - 92px); + padding: 20px 20px 0; + } + } + + .chart-list { + .nz-table2 { + box-sizing: border-box; + padding: 0; + } } } - .chart-list { - .nz-table2 { - box-sizing: border-box; - padding: 0; - } + .bottom-data-list .sub-container { + height: calc(100% - 45px); + position: relative; + padding: 0; + background-color: $--background-color-empty; + overflow-y: hidden; } } - - .bottom-data-list .sub-container { - height: calc(100% - 45px); - position: relative; - padding: 0; - background-color: $--background-color-empty; - overflow-y: hidden; - } - - .sub-box .top-tools.top-tools--sub { - border: none; - padding: 0 15px 0 0; - margin-right: 15px; - margin-left: 20px; - border-bottom: 1px solid $--border-color-light; - } - - .sub-box .list-width { - padding: 0; - } - - .sub-box .nz-table2 { - padding: 20px; - height: 100%; - } - - .sub-box .table-list { - padding: 0; - height: 100%; - } - - .sub-box .pagination-bottom { - bottom: -3px; - } - - .sub-box .sub-list-tab { - cursor: pointer; - } } + diff --git a/nezha-fronted/src/assets/css/components/common/table/special/endpointQuery.scss b/nezha-fronted/src/assets/css/components/common/table/special/endpointQuery.scss index 00b368316..e8b10b9dd 100644 --- a/nezha-fronted/src/assets/css/components/common/table/special/endpointQuery.scss +++ b/nezha-fronted/src/assets/css/components/common/table/special/endpointQuery.scss @@ -22,4 +22,13 @@ margin-right: -5px; padding: 0 5px; } + .full-width-height{ + width: 100%; + height: 100%; + } + .control-icon-unchecked { + color: #bcbec2; + cursor: not-allowed; + background-color: #f4f4f5; + } } diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss index 7240b7581..522c7f547 100644 --- a/nezha-fronted/src/assets/css/themes/theme-dark.scss +++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss @@ -197,6 +197,9 @@ $--guide-border-color: $--select-page-focus-color; $--guide-icon-border-color: $--time-picker-hover-color; $--guide-icon-color: $--time-picker-hover-color; +/* detail */ +$--detail-left-background-color: $--background-color-base; + /* 13.panel */ $--chart-title-hover-background-color: #323238; $--chart-box-border-color: $--border-color-light; diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss index 96e650518..7f649081a 100644 --- a/nezha-fronted/src/assets/css/themes/theme-light.scss +++ b/nezha-fronted/src/assets/css/themes/theme-light.scss @@ -195,6 +195,9 @@ $--guide-border-color: #18171D; $--guide-icon-border-color: #666666; $--guide-icon-color: $--guide-icon-border-color; +/* detail */ +$--detail-left-background-color: $--table-row-hover-background-color; + /* 13.panel */ $--chart-title-hover-background-color: $--background-color-1; $--chart-box-border-color: $--border-color-light; diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue index 30d9f33e0..46c3df5a7 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue @@ -220,14 +220,3 @@ export default { } } -