From 2a21578480c245b2e00a6ac3a7f19466e70b2d3a Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 4 Jul 2022 14:46:10 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1999=20fix=20:=20metric=20=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=20=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E8=8F=9C=E5=8D=95=E6=9C=AA=E6=AD=A3=E7=A1=AE=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/components/page/config/backups.scss        | 4 ++--
 .../css/components/page/dashboard/explore/promqlInput.scss    | 4 ++--
 nezha-fronted/src/components/common/mixin/promqlInput.js      | 2 +-
 .../src/components/page/dashboard/explore/promqlInput.vue     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/page/config/backups.scss b/nezha-fronted/src/assets/css/components/page/config/backups.scss
index 848093f07..f7449fa9a 100644
--- a/nezha-fronted/src/assets/css/components/page/config/backups.scss
+++ b/nezha-fronted/src/assets/css/components/page/config/backups.scss
@@ -129,7 +129,7 @@
               display: flex;
               justify-content: center;
               align-items: center;
-              width: 90px;
+              width: calc(100% / 7.1) !important;
               height: 34px;
               border: 1px solid $--border-color-light;
               margin-right: -1px;
@@ -164,7 +164,7 @@
             display: flex;
             justify-content: center;
             align-items: center;
-            width: 90px;
+            width: calc(100% / 7.1) !important;
             height: 35px;
             border: 1px solid $--border-color-light;
             margin-right: -1px;
diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
index b9b3e7815..bf5f4e331 100644
--- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
@@ -57,7 +57,7 @@
     margin-left: 1px;
   }
   .el-cascader-menu {
-    width: 200px;
+    width: 300px;
     height: 100%;
   }
   .metric-btn:hover, .metric-btn:focus {
@@ -66,7 +66,7 @@
   }
 
   .metric-selector .el-cascader-panel {
-    height: 300px;
+    height: 500px;
     position: absolute;
     z-index: 2100;
     background-color: $--background-color-empty;
diff --git a/nezha-fronted/src/components/common/mixin/promqlInput.js b/nezha-fronted/src/components/common/mixin/promqlInput.js
index df005758f..16c136758 100644
--- a/nezha-fronted/src/components/common/mixin/promqlInput.js
+++ b/nezha-fronted/src/components/common/mixin/promqlInput.js
@@ -15,7 +15,7 @@ export default {
           const metricMap = new Map()
           metrics.forEach((item) => {
             let key = ''
-            if (/^[a-zA-Z]+?_[a-zA-Z]*/.test(item)) {
+            if (/^[a-zA-Z0-9]+?_[a-zA-Z0-9]*/.test(item)) {
               key = item.split('_')[0]
             } else if (/^_\w*/.test(item)) {
               key = '      '
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index 338d4e221..9a617d32a 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -114,8 +114,8 @@
             class="top-tool-btn"
             @click="enableExpression"
           >
-            <i  v-if="state" class="nz-icon nz-icon-mimakejian"></i>
-            <i v-else class="nz-icon nz-icon-mimabukejian" style="fontSize:16px"></i>
+            <i  v-if="state" class="nz-icon nz-icon-mimakejian" :title="$t('overall.visible')"></i>
+            <i v-else class="nz-icon nz-icon-mimabukejian" style="fontSize:16px" :title="$t('overall.invisible')"></i>
           </button>
           <button
             v-if="plugins.indexOf('add') > -1"