From e1b7c8da6346c036b6278ed0d0cbc688b03dd69f Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Tue, 13 Oct 2020 17:06:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:threshold=E6=B7=BB=E5=8A=A0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/alertConfigBox.vue         | 4 +++-
 nezha-fronted/src/components/page/dashboard/chartBox.vue      | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
index 22fbe3ec9..81bcc0f5c 100644
--- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
@@ -35,7 +35,7 @@
         </el-form-item>
         <!--threshold-->
         <el-form-item :label="$t('alert.config.threshold')" prop="threshold" style="width: 415px;display: inline-block;">
-          <el-input type="text" placeholder="" v-model="editAlertRule.threshold" size="small">
+          <el-input type="text" placeholder="" v-model="editAlertRule.threshold" size="small" >
           </el-input>
         </el-form-item>
         <!--unit-->
@@ -111,6 +111,7 @@
 <script>
   import chartDataFormat from "../../charts/chartDataFormat";
   import promqlInput from "../../page/dashboard/explore/promqlInput";
+  import { nzNumber} from "../js/validate";
   export default {
     name: "alertConfigBox",
     props: {
@@ -152,6 +153,7 @@
           ],
           threshold:[
             {required:true,message:this.$t('validate.required'),trigger:'blur'},
+            {validator:nzNumber,trigger: 'blur'}
           ],
         },
         operators:[
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index daef72122..1088b290f 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -306,6 +306,7 @@
   import {getUUID, resetZIndex} from "../../common/js/common";
   import alertChartParam from "./alertChartParam";
   import promqlInput from "./explore/promqlInput";
+  import {nzNumber} from "../../common/js/validate";
   var rz = {
     methods: {
       rz(e) {
@@ -348,6 +349,9 @@
           ],
           url: [
             {required: true,  message: this.$t('validate.required'),  trigger: 'blur'}
+          ],
+          'param.threshold':[
+            {validator:nzNumber,trigger: 'blur'}
           ]
         },
         chartTypeList: [