From 28127e3653d82b1ae9f765e0e01da91eef5ffaab Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 27 Dec 2021 15:37:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20explore=20table=20=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=88=97=E5=88=87=E6=8D=A2=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E7=9A=84=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/common/elementSet.scss | 10 +++++++ .../src/components/common/elementSet.vue | 10 +++---- .../page/dashboard/explore/exploreItem.vue | 28 +++++++++++++++++++ 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/elementSet.scss b/nezha-fronted/src/assets/css/components/common/elementSet.scss index cd3a652c3..61eb27164 100644 --- a/nezha-fronted/src/assets/css/components/common/elementSet.scss +++ b/nezha-fronted/src/assets/css/components/common/elementSet.scss @@ -35,6 +35,7 @@ width: 100%; height: 300px; border: 1px solid $--button-light-border-color !important; + line-height: 1.5; } .custom-labels i { color: #04b330; @@ -42,6 +43,15 @@ position: absolute; left: 5px; top: 6px; + margin: 0 !important; +} +.explore-table-title{ + display: none; +} +.is-active .explore-table-title{ + display: block; + position: relative; + width: 100% } .nz-btn.nz-btn-style-light { background-color: $--background-color-empty; diff --git a/nezha-fronted/src/components/common/elementSet.vue b/nezha-fronted/src/components/common/elementSet.vue index e42db76d5..605ad3747 100644 --- a/nezha-fronted/src/components/common/elementSet.vue +++ b/nezha-fronted/src/components/common/elementSet.vue @@ -8,7 +8,7 @@ v-for="(item,index) in custom" :key="index" class="custom-label" - @click="handler(item,index)" + @click.stop="handler(item,index)" :id="'element-set-el-'+index" :class="{'custom-title orange-font':item.type == 'title','custom-label-disabled':!allowedAll&&!item.allowed && (index==0 || index == 1 || item.NotSet)}" > @@ -20,17 +20,17 @@
- -
- -
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index 4b0be2577..113346d0c 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -91,6 +91,29 @@
+
+ Table + + + + +