gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CN-1663 fix: 用户name和loginName校验规则修改

Browse Source
This commit is contained in:
刘洪洪
2024-06-27 18:58:15 +08:00
parent 71c27f1838
commit b32b300f4e
1 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/components/rightBox/settings/UserBox.vue
View File

@@ -13,7 +13,7 @@
<el-form-item :label="$t('config.user.name')" prop="name"> <el-form-item :label="$t('config.user.name')" prop="name">
<el-input id="account-input-name" v-model="editObject.name" <el-input id="account-input-name" v-model="editObject.name"
:disabled="editObject.username==='admin' && editObject.id === 1" :disabled="editObject.username==='admin' && editObject.id === 1"
maxlength="64" placeholder="" show-word-limit type="text"></el-input> maxlength="32" placeholder="" show-word-limit type="text"></el-input>
</el-form-item> </el-form-item>
<!--username--> <!--username-->
<el-form-item :label="$t('config.user.username')" prop="username"> <el-form-item :label="$t('config.user.username')" prop="username">
@@ -129,30 +129,13 @@ export default {
callback() callback()
} }
} }
const validateName = (rule, value, callback) => {
let validate = true
// const reg = /^[a-zA-Z0-9\u4e00-\u9fa5\u30a1-\u30f6\u3041-\u3093\uFF00-\uFFFF\u4e00-\u9fa5\u0400-\u04FF\s]{2,64}$/
const reg = /^[\u4E00-\u9FA5\a-zA-Z0-9\u3040-\u309F\u0800-\u4e00\u0400-\u04FF\u2000-\u206F\s]{2,64}$/
const emptyFlag = value[0] === ' ' || value[value.length - 1] === ' '
validate = reg.test(value)
if (value.length < 2) {
callback(new Error(this.$t('validate.atLeastTwo')))
} else if (!validate || value.trim() === '' || emptyFlag) {
// 除满足中英日俄、数字空格外，不能全为空格，前后也不可为空格
callback(new Error(this.$t('validate.name')))
} else {
callback()
}
}
const validateUserName = (rule, value, callback) => { const validateUserName = (rule, value, callback) => {
let validate = true let validate = true
// const reg = /^[a-zA-Z0-9_\u4e00-\u9fa5\u30a1-\u30f6\u3041-\u3093\uFF00-\uFFFF\u4e00-\u9fa5\u0400-\u04FF\s]{2,64}$/ // const reg = /^[a-zA-Z0-9_\u4e00-\u9fa5\u30a1-\u30f6\u3041-\u3093\uFF00-\uFFFF\u4e00-\u9fa5\u0400-\u04FF\s]{2,64}$/
// 校验，只允许英文、数字和标点符号 // 校验，只允许英文、数字和标点符号
const reg = /^[A-Za-z0-9~!@#$%^&*_.?]+$/ const reg = /^[A-Za-z0-9~!@#$%^&*_.?]+$/
validate = reg.test(value) validate = reg.test(value)
if (value.length < 2) { if (!validate) {
callback(new Error(this.$t('validate.atLeastTwo')))
} else if (!validate) {
callback(new Error(this.$t('validate.userName1'))) callback(new Error(this.$t('validate.userName1')))
} else { } else {
callback() callback()
@@ -163,11 +146,10 @@ export default {
loginName: localStorage.getItem(storageKey.username), loginName: localStorage.getItem(storageKey.username),
rules: { // 表单校验规则 rules: { // 表单校验规则
name: [ name: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { required: true, message: this.$t('validate.nameLength'), trigger: 'blur' }
{ validator: validateName, trigger: 'blur' }
], ],
username: [ username: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { required: true, message: this.$t('validate.userNameLength'), trigger: 'blur' },
{ validator: validateUserName, trigger: 'blur' } { validator: validateUserName, trigger: 'blur' }
], ],
pin: [ pin: [
@@ -192,11 +174,10 @@ export default {
}, },
rules2: { // 表单校验规则 rules2: { // 表单校验规则
name: [ name: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { required: true, message: this.$t('validate.nameLength'), trigger: 'blur' }
{ validator: validateName, trigger: 'blur' }
], ],
username: [ username: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { required: true, message: this.$t('validate.userNameLength'), trigger: 'blur' },
{ validator: validateUserName, trigger: 'blur' } { validator: validateUserName, trigger: 'blur' }
], ],
pinChange: [ pinChange: [