From ef3dd84bf74c1544426aa13d906784ecf8523c97 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Wed, 26 May 2021 16:56:45 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-670=20fix:=20=E4=BF=AE=E6=94=B9prominput?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/alertRuleBox.vue          | 22 ++++++++--------
 .../common/rightBox/exprTmplBox.vue           | 25 ++++++++++---------
 .../components/page/dashboard/chartBox.vue    |  1 -
 .../page/dashboard/explore/promqlInput.vue    |  1 -
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
index 45aa2d4b0..f7b521a01 100644
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -18,16 +18,18 @@
             <el-input id="alert-box-input-name" v-model="editAlertRule.name" maxlength="64" placeholder="" show-word-limit size="small"></el-input>
           </el-form-item>
           <el-form-item :label='$t("alert.config.expr")' prop="expr" >
-            <promql-input
-              id="alert-box-input-promql"
-              ref="promql"
-              :expression-list.sync="expressions"
-              :index="0"
-              :plugins="['metric-selector','metric-input']"
-              :required="true"
-              :styleType="2"
-              @change="metricChange"
-            ></promql-input>
+            <el-row style="height: 32px; line-height: 32px;">
+              <promql-input
+                id="alert-box-input-promql"
+                ref="promql"
+                :expression-list.sync="expressions"
+                :index="0"
+                :plugins="['metric-selector','metric-input']"
+                :required="true"
+                :styleType="2"
+                @change="metricChange"
+              ></promql-input>
+            </el-row>
           </el-form-item>
           <!--threshold-->
           <el-form-item :label="$t('alert.config.threshold')" prop="threshold" style="display: inline-block;">
diff --git a/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue b/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
index 9164e1ae8..d822960b3 100644
--- a/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
@@ -28,18 +28,19 @@
             ></el-autocomplete>
           </el-form-item>
           <el-form-item :label="$t('config.exprTemp.expression')" prop="expression">
-            <!--<el-input v-model="editExprTemp.expression" size="small" :placeholder="$t('overall.placeHolder')"></el-input>-->
-            <promql-input
-              :id="'promqlKeys0'"
-              :key="'promqlKeys0'"
-              :expression-list="editExprTemp.expression"
-              :index="0"
-              :plugins="['metric-selector', 'metric-input', 'remove']"
-              :show-temp="false"
-              :showRemove="false"
-              :styleType="2"
-              @change="expressionChange"
-            ></promql-input>
+            <el-row style="height: 32px; line-height: 32px;">
+              <promql-input
+                :id="'promqlKeys0'"
+                :key="'promqlKeys0'"
+                :expression-list="editExprTemp.expression"
+                :index="0"
+                :plugins="['metric-selector', 'metric-input', 'remove']"
+                :show-temp="false"
+                :showRemove="false"
+                :styleType="2"
+                @change="expressionChange"
+              ></promql-input>
+            </el-row>
           </el-form-item>
           <el-form-item :label="$t('config.exprTemp.remark')" prop="remark">
             <el-input
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index 48f6e8192..53afdcf8e 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -61,7 +61,6 @@
     margin-right: 10px;
     text-align: left;
     padding-left:10px;
-    margin-left: 10px;
     height: 32px;
     border-radius: $--primary-border-radius;
     line-height: 32px;
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index 6b0369076..a1211ed47 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -629,7 +629,6 @@ export default {
   /*'text-align':'left', 'color': '#666',*/
   /*'font-weight':plugins.indexOf('metric-selector') > -1 ?'400':'bold',*/
     width:100px;
-    margin-left: 10px;
     margin-right: 10px;
     height: 32px;
     text-align: left;