fix:1.管理页创建用户时,包含中文的登录名被拦截;2.管理页创建用户时输入重复的用户名称,保存后界面上无报错信息且保存按钮变为不可点击状态;3.管理页创建用户时,密码框输入含有". / : @"等特殊字符时提示错误信息是"最少5位";
This commit is contained in:
@@ -124,7 +124,14 @@ export default {
|
|||||||
name: 'UserBox',
|
name: 'UserBox',
|
||||||
mixins: [rightBoxMixin],
|
mixins: [rightBoxMixin],
|
||||||
data () {
|
data () {
|
||||||
const validatePin = (rule, value, callback) => { // 确认密码的二次校验
|
const validatePin = (rule, value, callback) => { // 确认密码
|
||||||
|
if (value.length < 5) {
|
||||||
|
callback(new Error(this.$t('validate.atLeastFive')))
|
||||||
|
} else {
|
||||||
|
callback()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const validateConfirmPin = (rule, value, callback) => { // 确认密码的二次校验
|
||||||
if (value === '' && this.editObject.pin) {
|
if (value === '' && this.editObject.pin) {
|
||||||
callback(new Error(this.$t('config.user.confirmPin')))
|
callback(new Error(this.$t('config.user.confirmPin')))
|
||||||
} else if (value !== this.editObject.pin) {
|
} else if (value !== this.editObject.pin) {
|
||||||
@@ -147,7 +154,7 @@ export default {
|
|||||||
}
|
}
|
||||||
const validateUserName = (rule, value, callback) => {
|
const validateUserName = (rule, value, callback) => {
|
||||||
let validate = true
|
let validate = true
|
||||||
const reg = /^[a-zA-Z0-9_]{2,64}$/
|
const reg = /^[a-zA-Z0-9_\u4e00-\u9fa5\u30a1-\u30f6\u3041-\u3093\uFF00-\uFFFF\u4e00-\u9fa5\u0400-\u04FF\s]{2,64}$/
|
||||||
validate = reg.test(value)
|
validate = reg.test(value)
|
||||||
if (value.length < 2) {
|
if (value.length < 2) {
|
||||||
callback(new Error(this.$t('validate.atLeastTwo')))
|
callback(new Error(this.$t('validate.atLeastTwo')))
|
||||||
@@ -171,12 +178,12 @@ export default {
|
|||||||
],
|
],
|
||||||
pin: [
|
pin: [
|
||||||
{ required: true, message: this.$t('validate.required'), trigger: 'blur' },
|
{ required: true, message: this.$t('validate.required'), trigger: 'blur' },
|
||||||
{ pattern: /^[a-zA-Z0-9]{5,64}$/, message: this.$t('validate.atLeastFive') }
|
{ validator: validatePin, trigger: 'blur' }
|
||||||
],
|
],
|
||||||
pinChange: [
|
pinChange: [
|
||||||
{ validator: validatePin, trigger: 'blur' },
|
|
||||||
{ required: true, message: this.$t('validate.required') },
|
{ required: true, message: this.$t('validate.required') },
|
||||||
{ pattern: /^[a-zA-Z0-9]{5,64}$/, message: this.$t('validate.atLeastFive') }
|
{ validator: validatePin, trigger: 'blur' },
|
||||||
|
{ validator: validateConfirmPin, trigger: 'blur' }
|
||||||
],
|
],
|
||||||
roleIds: [
|
roleIds: [
|
||||||
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
|
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
|
||||||
@@ -194,7 +201,7 @@ export default {
|
|||||||
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
|
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
|
||||||
],
|
],
|
||||||
pinChange: [
|
pinChange: [
|
||||||
{ validator: validatePin, trigger: 'blur' },
|
{ validator: validateConfirmPin, trigger: 'blur' },
|
||||||
{ pattern: /^[a-zA-Z0-9]{5,64}$/, message: this.$t('validate.atLeastFive') }
|
{ pattern: /^[a-zA-Z0-9]{5,64}$/, message: this.$t('validate.atLeastFive') }
|
||||||
],
|
],
|
||||||
roleIds: [
|
roleIds: [
|
||||||
@@ -243,6 +250,10 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.$message.error(res.data.msg || res.data.message)
|
this.$message.error(res.data.msg || res.data.message)
|
||||||
}
|
}
|
||||||
|
}).catch(err => {
|
||||||
|
this.blockOperation.save = false
|
||||||
|
let errMsg = err.response ? err.response : (err.message ? err.message : err.toString())
|
||||||
|
this.$message.error(_.get(errMsg, 'data.message', []))
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
axios.post(this.url, this.editObject).then(res => {
|
axios.post(this.url, this.editObject).then(res => {
|
||||||
@@ -253,6 +264,10 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.$message.error(res.data.msg || res.data.message)
|
this.$message.error(res.data.msg || res.data.message)
|
||||||
}
|
}
|
||||||
|
}).catch((err) => {
|
||||||
|
this.blockOperation.save = false
|
||||||
|
let errMsg = err.response ? err.response : (err.message ? err.message : err.toString())
|
||||||
|
this.$message.error(_.get(errMsg, 'data.message', []))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user