diff --git a/core/core-frontend/src/views/login/index.vue b/core/core-frontend/src/views/login/index.vue index 44a71d5c5a..cf84908f91 100644 --- a/core/core-frontend/src/views/login/index.vue +++ b/core/core-frontend/src/views/login/index.vue @@ -51,42 +51,10 @@ const state = reactive({ }, footContent: '' }) -const checkUsername = (rule: any, value: any, callback: any) => { - if (!value || activeName.value === 'ldap') { - return callback() - } - const pattern = /^[a-zA-Z0-9][a-zA-Z0-9\@._-]*$/ - const reg = new RegExp(pattern) - if (!reg.test(value)) { - const msg = t('user.user_name_pattern_error') - callback(new Error(msg)) - } - return callback() -} - -const validatePwd = (rule: any, value: any, callback: any) => { - if (!value || activeName.value === 'ldap') { - return callback() - } - const pattern = - /^.*(?=.{6,20})(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[~!@#$%^&*()_+\-\={}|":<>?`[\];',.\/])[a-zA-Z0-9~!@#$%^&*()_+\-\={}|":<>?`[\];',.\/]*$/ - const regep = new RegExp(pattern) - if (!regep.test(value)) { - const msg = t('user.pwd_pattern_error') - callback(new Error(msg)) - } - return callback() -} const rules = reactive({ - username: [ - { required: true, message: t('common.required'), trigger: 'blur' }, - { required: true, validator: checkUsername, trigger: 'blur' } - ], - password: [ - { required: true, message: t('common.required'), trigger: 'blur' }, - { required: true, validator: validatePwd, trigger: 'blur' } - ] + username: [{ required: true, message: t('common.required'), trigger: 'blur' }], + password: [{ required: true, message: t('common.required'), trigger: 'blur' }] }) const activeName = ref('simple') diff --git a/de-xpack b/de-xpack index 7cdb941249..315fa62982 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 7cdb9412491767474db9bbd3d49e97bcb0a39519 +Subproject commit 315fa62982d6f322fb3dddf641882251f1572c79