perf:公共校验调整

This commit is contained in:
wangwenrui
2020-01-17 15:40:56 +08:00
parent 93f06e2e1e
commit ff865b7ea9
4 changed files with 12 additions and 22 deletions

View File

@@ -2,9 +2,6 @@ import vm from '../../../main'
import ca from "element-ui/src/locale/lang/ca"; import ca from "element-ui/src/locale/lang/ca";
export function host(rule, value, callback) { 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])$/ 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(() => { setTimeout(() => {
if (hostReg.test(value)) { if (hostReg.test(value)) {
@@ -12,15 +9,10 @@ export function host(rule, value, callback) {
} else { } else {
callback(new Error(vm.$t('validate.host'))) callback(new Error(vm.$t('validate.host')))
} }
}, 100) }, 100)
callback();
} }
export function phone(rule, value, callback) { export function phone(rule, value, callback) {
if(!value || value == ''){
callback()
}
const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/ const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
setTimeout(() => { setTimeout(() => {
if (!Number.isInteger(+value)) { if (!Number.isInteger(+value)) {
@@ -33,22 +25,20 @@ export function phone(rule, value, callback) {
} }
} }
}, 100) }, 100)
callback();
} }
export function port(rule, value, callback) { export function port(rule, value, callback) {
if(!value || value == ''){
callback()
}
setTimeout(() => { setTimeout(() => {
if(typeof value != 'number'){ if(typeof value != 'number'){
callback(new Error(vm.$t('validate.number'))) callback(new Error(vm.$t('validate.number')))
} }else{
if(value < 1 ||value > 65535){ if(value < 1 ||value > 65535){
callback(new Error(vm.$t('validate.port'))) callback(new Error(vm.$t('validate.port')))
}else{
callback();
}
} }
}, 100) }, 100)
callback();
} }
export function noSpecialChar(rule, value, callback){ export function noSpecialChar(rule, value, callback){
@@ -60,5 +50,4 @@ export function noSpecialChar(rule, value, callback){
callback(new Error(vm.$t('validate.special'))) callback(new Error(vm.$t('validate.special')))
} }
}, 100) }, 100)
callback();
} }

View File

@@ -487,8 +487,8 @@
{required: true, message: this.$t('validate.required'), trigger: 'blur'} {required: true, message: this.$t('validate.required'), trigger: 'blur'}
], ],
host: [ host: [
{required: true,validator:host, trigger: 'blur'} {required:true,message:this.$t('validate.required'),trigger: 'blur'},
{validator:host, trigger: 'blur'}
], ],
modelId: [ modelId: [
{required: true, message: this.$t('validate.required'), trigger: 'change'} {required: true, message: this.$t('validate.required'), trigger: 'change'}

View File

@@ -627,7 +627,8 @@
{required: true, message: this.$t('validate.required'), trigger: 'blur'} {required: true, message: this.$t('validate.required'), trigger: 'blur'}
], ],
host: [ host: [
{required: true, validator:host, trigger: 'blur'} {required:true,message:this.$t('validate.required'),trigger: 'blur'},
{validator:host, trigger: 'blur'}
], ],
modelId: [ modelId: [
{required: true, message: this.$t('validate.required'), trigger: 'change'} {required: true, message: this.$t('validate.required'), trigger: 'change'}

View File

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