diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js index 744f6f0e6..f3c752cd5 100644 --- a/nezha-fronted/src/components/common/js/validate.js +++ b/nezha-fronted/src/components/common/js/validate.js @@ -2,9 +2,6 @@ import vm from '../../../main' import ca from "element-ui/src/locale/lang/ca"; export function host(rule, value, callback) { - if(!value || value == ''){ - 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(() => { if (hostReg.test(value)) { @@ -12,15 +9,10 @@ export function host(rule, value, callback) { } else { callback(new Error(vm.$t('validate.host'))) } - }, 100) - callback(); } export function phone(rule, value, callback) { - if(!value || value == ''){ - callback() - } const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/ setTimeout(() => { if (!Number.isInteger(+value)) { @@ -33,22 +25,20 @@ export function phone(rule, value, callback) { } } }, 100) - callback(); } export function port(rule, value, callback) { - if(!value || value == ''){ - callback() - } setTimeout(() => { if(typeof value != 'number'){ callback(new Error(vm.$t('validate.number'))) - } - if(value < 1 ||value > 65535){ - callback(new Error(vm.$t('validate.port'))) + }else{ + if(value < 1 ||value > 65535){ + callback(new Error(vm.$t('validate.port'))) + }else{ + callback(); + } } }, 100) - callback(); } export function noSpecialChar(rule, value, callback){ @@ -60,5 +50,4 @@ export function noSpecialChar(rule, value, callback){ callback(new Error(vm.$t('validate.special'))) } }, 100) - callback(); } diff --git a/nezha-fronted/src/components/page/asset/assetAddUnit.vue b/nezha-fronted/src/components/page/asset/assetAddUnit.vue index 4b86d23cf..9787c62b8 100644 --- a/nezha-fronted/src/components/page/asset/assetAddUnit.vue +++ b/nezha-fronted/src/components/page/asset/assetAddUnit.vue @@ -487,8 +487,8 @@ {required: true, message: this.$t('validate.required'), trigger: 'blur'} ], host: [ - {required: true,validator:host, trigger: 'blur'} - + {required:true,message:this.$t('validate.required'),trigger: 'blur'}, + {validator:host, trigger: 'blur'} ], modelId: [ {required: true, message: this.$t('validate.required'), trigger: 'change'} diff --git a/nezha-fronted/src/components/page/asset/assetEditUnit.vue b/nezha-fronted/src/components/page/asset/assetEditUnit.vue index 695b2fae6..72f897fca 100644 --- a/nezha-fronted/src/components/page/asset/assetEditUnit.vue +++ b/nezha-fronted/src/components/page/asset/assetEditUnit.vue @@ -627,7 +627,8 @@ {required: true, message: this.$t('validate.required'), trigger: 'blur'} ], host: [ - {required: true, validator:host, trigger: 'blur'} + {required:true,message:this.$t('validate.required'),trigger: 'blur'}, + {validator:host, trigger: 'blur'} ], modelId: [ {required: true, message: this.$t('validate.required'), trigger: 'change'} diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index fc53837d9..96bf336e6 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -182,8 +182,8 @@ export default { {required:true,message:this.$t('validate.required'),trigger:'change'} ], host:[ - { validator: host, trigger: 'blur',required:true}, - {required:true,message:this.$t('validate.required')} + {required:true,message:this.$t('validate.required'),trigger: 'blur'}, + { validator: host, trigger: 'blur'} ], port:[ { validator: port, trigger: 'blur'},