Merge pull request #4129 from dataease/pr@dev@fix_dingtalk_user_modify

fix(用户管理): 钉钉用户因为username为纯数字导致无法修改DE用户信息
This commit is contained in:
fit2cloud-chenyw 2022-12-19 19:52:39 +08:00 committed by GitHub
commit e2c8c12341
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -261,12 +261,7 @@ export default {
message: this.$t('commons.input_limit', [1, 50]),
trigger: 'blur'
},
{
required: true,
pattern: '^[a-zA-Z][a-zA-Z0-9\._-]*$',
message: this.$t('user.user_name_pattern_error'),
trigger: 'blur'
}
{ required: true, validator: this.validateUsername, trigger: 'blur' }
],
nickName: [
{
@ -418,6 +413,16 @@ export default {
callback()
}
},
validateUsername(rule, value, callback) {
const pattern = '^[a-zA-Z][a-zA-Z0-9\._-]*$'
const regep = new RegExp(pattern)
if (!regep.test(value) && this.formType === 'add') {
const msg = this.$t('user.user_name_pattern_error')
callback(new Error(msg))
} else {
callback()
}
},
create() {
this.formType = 'add'
this.form = Object.assign({}, JSON.parse(JSON.stringify(this.defaultForm)))