From 6e601b36df5ed81c952904d6a0ac7e99239de93d Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 28 May 2021 13:12:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D=E5=8F=B7=E7=A0=81=E6=98=AF=E5=90=A6=E5=90=88?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/language/cn.js      |  1 +
 .../src/components/common/language/en.js      |  1 +
 .../rightBox/administration/userBox.vue       | 19 +++++++++++++++++--
 .../src/components/common/rightBox/dcBox.vue  | 15 +++++++++++++++
 nezha-fronted/src/store/validate.js           |  4 ++++
 5 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 nezha-fronted/src/store/validate.js

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 13e7956d7..510830d0b 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -504,6 +504,7 @@ const cn = {
     number: '必须是数字',
     email: '不合法的E-mail地址',
     tel: '不合法的电话号码',
+    telephone: '电话号码不能为空',
     host: '不合法的IP',
     fileSize: '文件过大',
     port: '不合法的端口',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 91e61e5e9..4cff73fc1 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -515,6 +515,7 @@ const en = {
     positiveInteger: 'Positive integer',
     email: 'Invalid email', // '不合法的E-mail地址'
     tel: 'Invalid phone number', // '不合法的电话号码'
+    telephone: 'Phone number cannot be empty',
     host: 'Invalid Host', // '不合法的Host'
     domain: 'Invalid domain',
     usize: 'Must be number(1 - 47)',
diff --git a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
index 059f72af8..9d22da4cf 100644
--- a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
@@ -81,7 +81,9 @@
 </template>
 
 <script>
-import { host, port } from '@/components/common/js/validate'
+// import { host, port } from '@/components/common/js/validate'
+import {isvalidPhone} from "../../../../store/validate";
+
 export default {
   name: 'userBox',
   components: {
@@ -108,7 +110,16 @@ export default {
       } else {
         callback()
       }
-    }
+    };
+    const phoneVerification = (rule, value,callback) => {
+      if (!value){
+        callback(new Error(this.$t('validate.telephone')))
+      }else  if (!isvalidPhone(value)){
+        callback(new Error(this.$t('validate.tel')))
+      }else {
+        callback()
+      }
+    };
     return {
       editUser: {},
       url: 'sys/user',
@@ -132,6 +143,10 @@ export default {
         ],
         email: [
           { type: 'email', message: this.$t('validate.email') }
+        ],
+        mobile: [
+          { validator: phoneVerification, required : true, trigger: 'blur' },
+          { required: true, message: '', trigger: 'blur' }
         ]
       },
       rules2: { // 表单校验规则
diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue
index 4709c0d6f..8a7cc715f 100644
--- a/nezha-fronted/src/components/common/rightBox/dcBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue
@@ -65,6 +65,8 @@
 <script>
 import latlngPicker from '../latlngPicker'
 const regNum = /^[0-9]+.?[0-9]*/
+import {isvalidPhone} from "../../../store/validate";
+
 export default {
   name: 'dcBox',
   components: { latlngPicker },
@@ -75,6 +77,15 @@ export default {
     userData: Array
   },
   data () {
+    const phoneVerification = (rule, value,callback) => {
+      if (!value){
+        callback(new Error(this.$t('validate.telephone')))
+      }else  if (!isvalidPhone(value)){
+        callback(new Error(this.$t('validate.tel')))
+      }else {
+        callback()
+      }
+    }
     return {
       editDc: {},
       rules: {
@@ -83,6 +94,10 @@ export default {
         ],
         state: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        tel: [
+          { validator: phoneVerification, required: true, trigger: 'blur' },
+          { required: true, message: '', trigger: 'blur' }
         ]
       },
       areaData: [],
diff --git a/nezha-fronted/src/store/validate.js b/nezha-fronted/src/store/validate.js
new file mode 100644
index 000000000..1f09a9fce
--- /dev/null
+++ b/nezha-fronted/src/store/validate.js
@@ -0,0 +1,4 @@
+export function isvalidPhone(str) {
+  const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
+  return reg.test(str)
+}