diff --git a/src/components/rightBox/settings/UserBox.vue b/src/components/rightBox/settings/UserBox.vue
index 374add50..b7a430d6 100644
--- a/src/components/rightBox/settings/UserBox.vue
+++ b/src/components/rightBox/settings/UserBox.vue
@@ -12,30 +12,30 @@
+ minlength="2" maxlength="64" placeholder="" show-word-limit size="small" type="text">
+ minlength="2" maxlength="64" placeholder="" show-word-limit size="small" type="text">
-
-
-
+
-
+
@@ -89,7 +89,7 @@
@@ -125,7 +125,7 @@ export default {
data () {
const validatePin = (rule, value, callback) => { // 确认密码的二次校验
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) {
callback(new Error(this.$t('config.user.confirmPinErr')))
} else {
@@ -137,23 +137,31 @@ export default {
loginName: localStorage.getItem(storageKey.username),
rules: { // 表单校验规则
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: [
- { 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: [
- { 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: [
{ 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: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
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: { // 表单校验规则
@@ -161,13 +169,19 @@ export default {
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
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: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
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: [],