fix:dc添加bug & module、project name校验

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

@@ -1,12 +1,8 @@
 import vm from '../../../main'
 
 export function host(rule, value, callback) {
-  console.log("callback:")
-  console.log(callback)
-  console.log(typeof callback)
-
   if(!value || value == ''){
-    callback(new Error(vm.$t('validate.required')))
+    callback()
   }
   const hostReg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
   setTimeout(() => {
@@ -39,7 +35,7 @@ export function phone(rule, value, callback) {
 
 export function port(rule, value, callback) {
   if(!value || value == ''){
-    callback(new Error(vm.$t('validate.required')))
+    callback()
   }
   setTimeout(() => {
     if(typeof value != 'number'){
@@ -50,3 +46,14 @@ export function port(rule, value, callback) {
     }
   }, 100)
 }
+
+export function noSpecialChar(rule, value, callback){
+  const charReg = /\w+/;
+  setTimeout(() => {
+    if (charReg.test(value)) {
+      callback()
+    } else {
+      callback(new Error(vm.$t('validate.special')))
+    }
+  }, 100)
+}

nezha-fronted/src/components/common/language/cn.js

@@ -123,6 +123,8 @@ const cn = {
     tel:'不合法的电话号码',
     host:'不合法的IP',
     fileSize:'文件过大',
+    port:'不合法的端口',
+    special:'不能包含特殊字符',
     config: {
       account: {
 

nezha-fronted/src/components/common/language/en.js

@@ -125,6 +125,7 @@ const en = {
     host:'IP Address is invalid',
     fileSize:'upload file is too large',
     port:'Port is invalide',
+    special:'Has special characters',
     config: {
       account: {
 

nezha-fronted/src/components/common/popBox/dcConfig.vue

@@ -1,9 +1,9 @@
 <template>
-  <el-popover :placement="placement"  @show="afterShow"  width="400" @hide="hidePop"  ref="popBox" v-model="popBox.show" popper-class="nz-pop">
+  <el-popover :placement="placement"  @show="afterShow"  width="400" @hide="hidePop"  ref="popBox" v-model="popBox.show">
     <div class="">
       <!-- begin--顶部按钮-->
       <div class="pop-top-btns">
-        <button type="button" v-if="idc.id != '' && popBox.isEdit" @click="del" class="nz-btn nz-btn-size-small nz-btn-size-alien nz-btn-style-light nz-btn-min-width-60" id="dc-del">
+        <button type="button" v-if="idc.id && idc.id != ''" @click="del" class="nz-btn nz-btn-size-small nz-btn-size-alien nz-btn-style-light nz-btn-min-width-60" id="dc-del">
           <span class="pop-top-btn-icon"><i class="el-icon-delete"></i></span>
           <span class="pop-top-btn-txt">{{$t('overall.delete')}}</span>
         </button>

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

@@ -164,6 +164,9 @@
 </template>
 
 <script>
+  import {noSpecialChar} from "../js/validate";
+  import {port} from "../js/validate";
+
   export default {
     name: "moduleBox",
     props: {
@@ -179,13 +182,14 @@
         },
         rules: {
           name: [
-            {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+            {required: true, message: this.$t('validate.required'), trigger: 'blur'},
+            {validator:noSpecialChar,trigger: "change"}
           ],
           project: [
             {required: true, message: this.$t('validate.required'), trigger: 'change'}
           ],
           port: [
-            {type: 'number', message: this.$t('validate.number'), trigger: 'blur'}
+            {validator:port, trigger: 'blur'}
           ],
         },
         projectList: [],

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

@@ -43,6 +43,7 @@
   </transition>
 </template>
 <script>
+  import {noSpecialChar} from '../../common/js/validate';
   export default {
     name: "projectBox",
     props: {
@@ -58,7 +59,8 @@
         },
         rules: {
           name: [
-            {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+            {required: true, message: this.$t('validate.required'), trigger: 'blur'},
+            {validator:noSpecialChar,trigger: "change"}
           ]
         }
       }

nezha-fronted/src/components/page/asset/accountConfig.vue

@@ -67,7 +67,7 @@ export default {
 
       let validatePort=(rule,value,callback) => {
         if(this.asComponent){//作为组件使用，正常验证
-          port(rule,value,callback);
+          return port(rule,value,callback);
         }else{
           if(this.account.user){
             if(!value || value == ''){
@@ -97,7 +97,8 @@ export default {
             { validator: validataUser, trigger: 'blur'}
           ],
           port:[
-            { validator: validatePort, trigger: 'change',required:true}
+            { validator: validatePort, trigger: 'change'},
+            {required:true,message:this.$t('validate.required')}
           ],
           file:[
             { validator: validateFile, trigger: 'change'}

nezha-fronted/src/components/page/config/promServer.vue

@@ -182,10 +182,12 @@ export default {
           {required:true,message:this.$t('validate.required'),trigger:'change'}
         ],
         host:[
-          { validator: host, trigger: 'blur',required:true}
+          { validator: host, trigger: 'blur',required:true},
+          {required:true,message:this.$t('validate.required')}
         ],
         port:[
-          { validator: port, trigger: 'blur',required:true}
+          { validator: port, trigger: 'blur'},
+          {required:true,message:this.$t('validate.required')}
         ],
         type:[
           {required:true,message:this.$t('validate.required'),trigger:'change'},