CN-1159 fix:userbox、rolebox表单校验提示内容不合理
This commit is contained in:
@@ -64,6 +64,18 @@ export default {
|
|||||||
detail: Boolean
|
detail: Boolean
|
||||||
},
|
},
|
||||||
data () {
|
data () {
|
||||||
|
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}$/
|
||||||
|
validate = reg.test(value)
|
||||||
|
if (value.length < 2) {
|
||||||
|
callback(new Error(this.$t('validate.atLeastTwo')))
|
||||||
|
} else if (!validate) {
|
||||||
|
callback(new Error(this.$t('validate.name')))
|
||||||
|
} else {
|
||||||
|
callback()
|
||||||
|
}
|
||||||
|
}
|
||||||
return {
|
return {
|
||||||
editRole: {},
|
editRole: {},
|
||||||
url: api.role,
|
url: api.role,
|
||||||
@@ -71,7 +83,7 @@ export default {
|
|||||||
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') } // 目前仅对长度要求在2-64之间,后续有需求再添加
|
{ validator: validateName, trigger: 'change' }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
menus: [],
|
menus: [],
|
||||||
|
|||||||
@@ -132,17 +132,29 @@ 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}$/
|
||||||
|
validate = reg.test(value)
|
||||||
|
if (value.length < 2) {
|
||||||
|
callback(new Error(this.$t('validate.atLeastTwo')))
|
||||||
|
} else if (!validate) {
|
||||||
|
callback(new Error(this.$t('validate.name')))
|
||||||
|
} else {
|
||||||
|
callback()
|
||||||
|
}
|
||||||
|
}
|
||||||
return {
|
return {
|
||||||
url: api.user,
|
url: api.user,
|
||||||
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') }
|
{ validator: validateName, trigger: 'change' }
|
||||||
],
|
],
|
||||||
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') }
|
{ 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' },
|
||||||
|
|||||||
@@ -105,6 +105,8 @@ export const entityDetailTabsName = {
|
|||||||
performanceEvent: 'performanceEvent'
|
performanceEvent: 'performanceEvent'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const entityDetailRelatedEntitiesShowSize = 100
|
||||||
|
|
||||||
export const echartsFontSize = {
|
export const echartsFontSize = {
|
||||||
legendFirstFontSize: 12, // <1920
|
legendFirstFontSize: 12, // <1920
|
||||||
legendSecondFontSize: 14, // >=1920 && <2560
|
legendSecondFontSize: 14, // >=1920 && <2560
|
||||||
|
|||||||
Reference in New Issue
Block a user