fix:修复校验bug

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

@@ -1,4 +1,5 @@
 import vm from '../../../main'
+import ca from "element-ui/src/locale/lang/ca";
 
 export function host(rule, value, callback) {
   if(!value || value == ''){
@@ -13,6 +14,7 @@ export function host(rule, value, callback) {
     }
 
   }, 100)
+  callback();
 }
 
 export function phone(rule, value, callback) {
@@ -31,6 +33,7 @@ export function phone(rule, value, callback) {
       }
     }
   }, 100)
+  callback();
 }
 
 export function port(rule, value, callback) {
@@ -45,6 +48,7 @@ export function port(rule, value, callback) {
       callback(new Error(vm.$t('validate.port')))
     }
   }, 100)
+  callback();
 }
 
 export function noSpecialChar(rule, value, callback){
@@ -56,4 +60,5 @@ export function noSpecialChar(rule, value, callback){
       callback(new Error(vm.$t('validate.special')))
     }
   }, 100)
+  callback();
 }

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

@@ -3,7 +3,7 @@
     <div class="">
       <!-- begin--顶部按钮-->
       <div class="pop-top-btns">
-        <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">
+        <button type="button" v-if="idc.id && 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">
           <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/page/asset/accountConfig.vue

@@ -46,44 +46,11 @@ export default {
     name: "accountConfig",
     props:{
       account:{type:Object},
-      asComponent:{type:Boolean,default:true},//历史原因增加的逻辑，可删除
       isEdit:{type:Boolean,default:true}
     },
     created() {
     },
   data(){
-      let validataUser=(rule, value, callback) => {
-        if(this.asComponent){//作为组件使用，正常验证
-          if(!value || value == ''){
-            callback(new Error(this.$t('validate.required')))
-          }
-        }else{
-          if(!value || value == ''){
-            callback()
-          }
-        }
-        callback();
-      }
-
-      let validatePort=(rule,value,callback) => {
-        if(this.asComponent){//作为组件使用，正常验证
-          return port(rule,value,callback);
-        }else{
-          if(this.account.user){
-            if(!value || value == ''){
-              callback(new Error(this.$t('validate.required')))
-            }
-            if(typeof value != 'number'){
-              callback(new Error(this.$t('validate.number')))
-            }
-            if(value < 1 ||value > 65535){
-              callback(new Error(this.$t('validate.port')))
-            }
-          }
-        }
-        callback();
-      }
-
       let validateFile=(rule,value,callback) => {
         if(!this.validateFile()){
           callback(new Error(this.uploadTip))
@@ -94,11 +61,11 @@ export default {
         uploadFileList:[],
         rules:{
           user:[
-            { validator: validataUser, trigger: 'blur'}
+            { required: true, message:this.$t('validate.required'),trigger: 'blur'}
           ],
           port:[
-            { validator: validatePort, trigger: 'change'},
+            {required:true,message:this.$t('validate.required'),trigger: 'blur'},
-            {required:true,message:this.$t('validate.required')}
+            { validator: port, trigger: 'blur'}
           ],
           file:[
             { validator: validateFile, trigger: 'change'}

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

@@ -801,6 +801,8 @@
                 }
               });
 
+            }else{
+              return false;
             }
           });
         }