Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8

nezha-fronted/src/components/common/js/validate.js

@@ -314,3 +314,15 @@ export function maxHopsValidator (rule, value, callback) {
     }
   }, 100)
 }
+// 验证mac地址
+export function validateMAC (rule, value, callback) {
+  const macRule = /^([0-9a-fA-F]{2}(:|-)){5}[0-9a-fA-F]{2}$/
+  setTimeout(() => {
+    if (value == '') return callback()
+    if (macRule.test(value)) {
+      callback()
+    } else {
+      callback(new Error(vm.$t('validate.macError')))
+    }
+  }, 100)
+}

nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue

@@ -53,6 +53,7 @@
 
 <script>
 import editRigthBox from '../mixin/editRigthBox'
+import { validateMAC } from '@/components/common/js/validate'
 import vm from '../../../entrance/app/main'
 
 export default {
@@ -95,6 +96,9 @@ export default {
         addr: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' },
           { validator: detailsIpv, trigger: 'blur' }
+        ],
+        mac: [
+          { validator: validateMAC, trigger: 'blur' }
         ]
       }
     }