From c6a6dab65aa47ddd583eaeb2eac2cf752865f85f Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Wed, 1 Dec 2021 15:23:54 +0800 Subject: [PATCH] =?UTF-8?q?style:=20asset=E6=89=B9=E9=87=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=92=8Cendpoint=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20=E4=B8=BB=E9=A2=98=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 --- .../common/rightBox/assetBactchEditBox.scss | 25 ++++++++++++ .../common/rightBox/batchAddEndpoint.scss | 39 +++++++++++++++++-- .../src/assets/css/components/index.scss | 9 ++--- .../src/assets/css/themes/theme-dark.scss | 1 + .../src/assets/css/themes/theme-light.scss | 1 + .../common/rightBox/batchAddEndpoint.vue | 12 +++--- 6 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 nezha-fronted/src/assets/css/components/common/rightBox/assetBactchEditBox.scss diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/assetBactchEditBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/assetBactchEditBox.scss new file mode 100644 index 000000000..bc19032ea --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/rightBox/assetBactchEditBox.scss @@ -0,0 +1,25 @@ +.right-box-asset-batch { + .el-table__header-wrapper { + tr th { + border-color: $--border-color-light; + } + } + .el-table__body-wrapper.is-scrolling-none { + background-color: $--background-color-empty; + tr { + background-color: $--background-color-empty; + } + } + .box__footer { + .top-tool-btn.top-tool-btn--disabled { + background-color: $--background-color-base; + border: 1px solid $--border-color-light; + i { + color: $--color-text-regular; + } + } + .top-tool-btn.top-tool-btn--disabled:hover { + background-color: $--asset-bactch-btn-background-color; + } + } +} diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/batchAddEndpoint.scss b/nezha-fronted/src/assets/css/components/common/rightBox/batchAddEndpoint.scss index a8582d035..d1d5786af 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/batchAddEndpoint.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/batchAddEndpoint.scss @@ -1,11 +1,12 @@ .right-box-modify-endpoint { + .container__form { + min-height: 400px; + flex: 1; + height: calc(100% - 400px); + } .error { border: 1px solid #F56C6C !important; } - .right-box-sub-title { - width: calc(100% - 70px); - margin-left: 15px; - } .el-table thead .cell { font-size: 14px; color: $--color-text-primary; @@ -21,6 +22,36 @@ .el-table th { padding: 7px 0; } + .el-table tr { + background-color: $--background-color-empty; + } + .el-table td { + border-bottom: 1px solid $--border-color-light; + border-right: 1px solid $--border-color-light; + } + .el-table th.is-leaf { + border-bottom: 1px solid $--border-color-light; + } + .el-table--fit { + background-color: $--background-color-empty; + border: 1px solid $--border-color-light; + border-bottom: none; + height: 100%; + flex: 1; + .el-table__header-wrapper { + tr th { + border-right: 1px solid $--border-color-light; + } + th.gutter { + background-color: $--background-color-empty; + border-bottom: 1px solid $--border-color-light; + border-right: none; + } + } + .el-table__body-wrapper { + overflow-y: auto; + } + } .configs-endpoint { border-radius: 4px; padding: 2px 7px; diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index 9011bf51d..2558b45c6 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -44,6 +44,7 @@ @import './common/rightBox/menuBox.scss'; @import './common/rightBox/moduleBox.scss'; @import './common/rightBox/chartRightBox/chartRightBox'; +@import './common/rightBox/assetBactchEditBox.scss'; @import './common/table/alert/alertMessageTable.scss'; @import './common/table/alert/alertRuleTable.scss'; @import './common/table/alert/alertSilenceTable.scss'; @@ -88,9 +89,7 @@ @import './page/dashboard/panel.scss'; @import './page/monitor/project/project.scss'; +@import './common/v-selectpagenew/selectpage.scss'; +@import './common/paramBpx/paramBox.scss'; +@import './common/picker/picker.scss'; -@import 'common/v-selectpagenew/selectpage.scss'; - -@import "common/paramBpx/paramBox.scss"; - -@import "common/picker/picker.scss"; diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss index a68732b83..2702c8999 100644 --- a/nezha-fronted/src/assets/css/themes/theme-dark.scss +++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss @@ -133,6 +133,7 @@ $--button-icon-active-border-color: $--color-text-primary; // focus边框色 /* Asset */ $--asset-label-btn-border-color: $--border-color-light; // border $--asset-label-btn-background-color: #222329; // background +$--asset-bactch-btn-background-color: mix(#FFF, $--background-color-base, 15%); /* clickSearch */ $--click-search-items-border-color: $--background-color-copy; // border diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss index a3639edc1..2707b4e85 100644 --- a/nezha-fronted/src/assets/css/themes/theme-light.scss +++ b/nezha-fronted/src/assets/css/themes/theme-light.scss @@ -131,6 +131,7 @@ $--button-icon-active-border-color: mix(#FFF, $--color-primary, 10%); // focus /* Asset */ $--asset-label-btn-border-color: mix(#FFF, $--color-primary, 60%); // border $--asset-label-btn-background-color: #FFF4E8; // background +$--asset-bactch-btn-background-color: $--background-color-empty; /* clickSearch */ $--click-search-items-border-color: #C7C7C7; // border diff --git a/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue b/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue index 264ed1313..e5019caac 100644 --- a/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue +++ b/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue @@ -10,9 +10,9 @@ -
-
- +
+
+ + :height="'100%'" + >