From 82d7386decf0b29acbe63b7ff9f00bf46f0ef987 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Wed, 6 Jul 2022 10:58:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20panelBox=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=B7=BB=E5=8A=A0=E5=8F=8A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/common/rightBox/panelBox.scss    | 13 +++++++++++++
 .../src/components/common/rightBox/panelBox.vue     |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/panelBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/panelBox.scss
index aa672465a..2683fc80a 100644
--- a/nezha-fronted/src/assets/css/components/common/rightBox/panelBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/panelBox.scss
@@ -1,4 +1,11 @@
 .right-box-panel{
+  .form-items--half-width-group{
+    .query-expression{
+      .el-form-item__label{
+        display: flex;
+      }
+    }
+  }
   .item-report{
     .form__sub-title{
       margin-bottom: 5px;
@@ -67,6 +74,12 @@
         border-radius: 0;
         background-color: $--color-primary !important;
       }
+
+      .el-form-item__content{
+        .el-form-item__error{
+          top: 102%;
+        }
+      }
     }
     .range-time{
       width: 100%;
diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue
index 6a4800b86..fd3166d9b 100644
--- a/nezha-fronted/src/components/common/rightBox/panelBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue
@@ -98,7 +98,7 @@
                     </el-select>
                   </el-form-item>
                   <!-- Query expression -->
-                  <el-form-item v-if="item.type==='query'" :prop="'param.variables.' + index + '.expression'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" key="expression" style="width: 100%;" >
+                  <el-form-item class="query-expression" v-if="item.type==='query'" :prop="'param.variables.' + index + '.expression'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" key="expression" style="width: 100%;" >
                     <div slot="label">
                       <span>{{$t('dashboard.panel.queryExpression')}}</span>
                       <el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside">
@@ -346,6 +346,10 @@ export default {
         'param.report.receivers': [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' },
           { validator: arrLength, trigger: 'blur' }
+        ],
+        nums: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+          { validator: arrLength, trigger: 'blur' }
         ]
       },
       week: [