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

fix: 添加Administration模块下user模块的新建、编辑用户信息校验

Browse Source
This commit is contained in:
刘洪洪
2023-05-18 11:46:50 +08:00
parent 761cb528af
commit 77f3bd94d2
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,30 +12,30 @@
<!--name--> <!--name-->
<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" :disabled="editObject.username==='admin' && editObject.id === 1" <el-input id="account-input-name" v-model="editObject.name" :disabled="editObject.username==='admin' && editObject.id === 1"
maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input> minlength="2" maxlength="64" placeholder="" show-word-limit size="small" 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">
<el-input id="account-input-username" v-model="editObject.username" :disabled="editObject.username==='admin' && editObject.id === 1" <el-input id="account-input-username" v-model="editObject.username" :disabled="editObject.username==='admin' && editObject.id === 1"
maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input> minlength="2" maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<!--password--> <!--password-->
<el-form-item :label="$t('config.user.pin')" prop="pin"> <el-form-item :label="$t('config.user.pin')" prop="pin">
<el-input id="account-input-password" v-model="editObject.pin" maxlength="64" placeholder="" <el-input id="account-input-password" v-model="editObject.pin" minlength="5" maxlength="64" placeholder=""
show-word-limit size="small" type="password" @blur="pinBlur" autocomplete="new-password"></el-input> show-word-limit size="small" type="password" @blur="pinBlur" autocomplete="new-password"></el-input>
</el-form-item> </el-form-item>
<!--pinChange--> <!--pinChange-->
<el-form-item :label="$t('config.user.confirmPin')" label-width="200px" prop="pinChange"> <el-form-item :label="$t('config.user.confirmPin')" label-width="200px" prop="pinChange">
<el-input id="account-input-pinChange" v-model="editObject.pinChange" maxlength="64" placeholder="" <el-input id="account-input-pinChange" v-model="editObject.pinChange" minlength="5" maxlength="64" placeholder=""
show-word-limit size="small" type="password"></el-input> show-word-limit size="small" type="password"></el-input>
</el-form-item> </el-form-item>
<!--email--> <!--email-->
<el-form-item label="E-mail" prop="email"> <el-form-item label="E-mail" prop="email">
<el-input id="account-input-email" v-model="editObject.email" maxlength="64" show-word-limit placeholder="" size="small" type="text"></el-input> <el-input id="account-input-email" v-model="editObject.email" maxlength="35" show-word-limit placeholder="" size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<!--mobile--> <!--mobile-->
<el-form-item :label="$t('config.user.mobile')" prop="mobile"> <el-form-item :label="$t('config.user.mobile')" prop="mobile">
<el-input id="account-input-mobile" v-model.number="editObject.mobile" maxlength="64" show-word-limit placeholder="" size="small" type="text"></el-input> <el-input id="account-input-mobile" v-model.number="editObject.mobile" maxlength="11" show-word-limit placeholder="" size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<!--roles--> <!--roles-->
<el-form-item :label="$t('config.user.roles')" prop="roleIds"> <el-form-item :label="$t('config.user.roles')" prop="roleIds">
@@ -89,7 +89,7 @@
<el-switch <el-switch
id="account-input-status" id="account-input-status"
v-model="editObject.status" v-model="editObject.status"
:disabled="(editObject.username === loginName) || (editObject.username==='admin' && editObject.id==1)" :disabled="(editObject.username === loginName) || (editObject.username === 'admin' && editObject.id === 1)"
:active-value="1" :active-value="1"
:inactive-value="0"> :inactive-value="0">
</el-switch> </el-switch>
@@ -125,7 +125,7 @@ export default {
data () { data () {
const validatePin = (rule, value, callback) => { // 确认密码的二次校验 const validatePin = (rule, value, callback) => { // 确认密码的二次校验
if (value === '' && this.editObject.pin) { if (value === '' && this.editObject.pin) {
callback(new Error(this.$t('config.user.inputConfirmPin'))) callback(new Error(this.$t('config.user.confirmPin')))
} else if (value !== this.editObject.pin) { } else if (value !== this.editObject.pin) {
callback(new Error(this.$t('config.user.confirmPinErr'))) callback(new Error(this.$t('config.user.confirmPinErr')))
} else { } else {
@@ -137,23 +137,31 @@ 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.required'), trigger: 'blur' },
{ pattern: /^[a-zA-Z0-9]{2,64}$/, message: this.$t('validate.atLeastTwo') }
], ],
username: [ username: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' },
{ pattern: /^[a-zA-Z0-9]{2,64}$/, message: this.$t('validate.atLeastTwo') }
], ],
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') }
], ],
pinChange: [ pinChange: [
{ validator: validatePin, trigger: 'blur' }, { validator: validatePin, trigger: 'blur' },
{ required: true, message: '', trigger: 'blur' } { required: true, message: this.$t('validate.required') },
{ pattern: /^[a-zA-Z0-9]{5,64}$/, message: this.$t('validate.atLeastFive') }
], ],
roleIds: [ roleIds: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
email: [ email: [
{ type: 'email', message: this.$t('validate.email') } { type: 'email', message: this.$t('validate.email') }
],
mobile: [
{ required: false, message: this.$t('validate.required') },
{ pattern: /^(1[345678]\d{9})$/, message: this.$t('validate.mobile') }
] ]
}, },
rules2: { // 表单校验规则 rules2: { // 表单校验规则
@@ -161,13 +169,19 @@ 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: validatePin, trigger: 'blur' },
{ required: true, message: this.$t('validate.required') },
{ pattern: /^[a-zA-Z0-9]{5,64}$/, message: this.$t('validate.atLeastFive') }
], ],
roleIds: [ roleIds: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
email: [ email: [
{ type: 'email', message: this.$t('validate.email') } { type: 'email', message: this.$t('validate.email') }
],
mobile: [
{ required: false, message: this.$t('validate.required') },
{ pattern: /^(1[345678]\d{9})$/, message: this.$t('validate.mobile') }
] ]
}, },
roleData: [], roleData: [],