diff --git a/continew-admin-ui/src/views/system/user/center/components/security-settings/update-pwd.vue b/continew-admin-ui/src/views/system/user/center/components/security-settings/update-pwd.vue
index 890c8a5b..433cbd1b 100644
--- a/continew-admin-ui/src/views/system/user/center/components/security-settings/update-pwd.vue
+++ b/continew-admin-ui/src/views/system/user/center/components/security-settings/update-pwd.vue
@@ -8,14 +8,25 @@
- {{ $t('userCenter.securitySettings.updatePwd.placeholder.success.password') }}
+ {{
+ $t(
+ 'userCenter.securitySettings.updatePwd.placeholder.success.password'
+ )
+ }}
- {{ $t('userCenter.securitySettings.updatePwd.placeholder.error.password') }}
+ {{
+ $t(
+ 'userCenter.securitySettings.updatePwd.placeholder.error.password'
+ )
+ }}
-
+
{{ $t('userCenter.securitySettings.button.update') }}
@@ -30,26 +41,53 @@
@cancel="handleCancel"
>
-
+
-
+
-
+
@@ -81,31 +119,61 @@
// 表单验证规则
const rules = computed((): Record => {
return {
- oldPassword: [{ required: true, message: t('userCenter.securitySettings.updatePwd.form.error.required.oldPassword') }],
+ oldPassword: [
+ {
+ required: true,
+ message: t(
+ 'userCenter.securitySettings.updatePwd.form.error.required.oldPassword'
+ ),
+ },
+ ],
newPassword: [
- { required: true, message: t('userCenter.securitySettings.updatePwd.form.error.required.newPassword') },
- { match: /^(?=.*\d)(?=.*[a-z]).{6,32}$/, message: t('userCenter.securitySettings.updatePwd.form.error.match.newPassword') },
+ {
+ required: true,
+ message: t(
+ 'userCenter.securitySettings.updatePwd.form.error.required.newPassword'
+ ),
+ },
+ {
+ match: /^(?=.*\d)(?=.*[a-z]).{6,32}$/,
+ message: t(
+ 'userCenter.securitySettings.updatePwd.form.error.match.newPassword'
+ ),
+ },
{
validator: (value, callback) => {
if (value === form.oldPassword) {
- callback(t('userCenter.securitySettings.updatePwd.form.error.validator.newPassword'))
+ callback(
+ t(
+ 'userCenter.securitySettings.updatePwd.form.error.validator.newPassword'
+ )
+ );
} else {
- callback()
+ callback();
}
- }
- }
+ },
+ },
],
rePassword: [
- { required: true, message: t('userCenter.securitySettings.updatePwd.form.error.required.rePassword') },
+ {
+ required: true,
+ message: t(
+ 'userCenter.securitySettings.updatePwd.form.error.required.rePassword'
+ ),
+ },
{
validator: (value, callback) => {
if (value !== form.newPassword) {
- callback(t('userCenter.securitySettings.updatePwd.form.error.validator.rePassword'))
+ callback(
+ t(
+ 'userCenter.securitySettings.updatePwd.form.error.validator.rePassword'
+ )
+ );
} else {
- callback()
+ callback();
}
- }
- }
+ },
+ },
],
};
});
diff --git a/continew-admin-ui/src/views/system/user/center/locale/en-US.ts b/continew-admin-ui/src/views/system/user/center/locale/en-US.ts
index 0ed53611..47677a7c 100644
--- a/continew-admin-ui/src/views/system/user/center/locale/en-US.ts
+++ b/continew-admin-ui/src/views/system/user/center/locale/en-US.ts
@@ -25,9 +25,11 @@ export default {
'userCenter.basicInfo.form.placeholder.nickname': 'Please enter nickname',
'userCenter.basicInfo.form.error.required.username': 'Please enter username',
- 'userCenter.basicInfo.form.error.match.username': 'Username are 4 to 16 characters long and can contain letters, numbers, underscores, and start with a letter',
+ 'userCenter.basicInfo.form.error.match.username':
+ 'Username are 4 to 16 characters long and can contain letters, numbers, underscores, and start with a letter',
'userCenter.basicInfo.form.error.required.nickname': 'Please enter nickname',
- 'userCenter.basicInfo.form.error.match.nickname': 'Nickname are 1 to 20 digits long and can contain Chinese, letters, numbers, underscores, dashes',
+ 'userCenter.basicInfo.form.error.match.nickname':
+ 'Nickname are 1 to 20 digits long and can contain Chinese, letters, numbers, underscores, dashes',
'userCenter.basicInfo.form.save': 'Save',
'userCenter.basicInfo.form.save.success': 'Save success',
@@ -36,55 +38,81 @@ export default {
// security-settings
// update-pwd
'userCenter.securitySettings.updatePwd.label.password': 'Login Password',
- 'userCenter.securitySettings.updatePwd.placeholder.success.password': 'Has been set',
+ 'userCenter.securitySettings.updatePwd.placeholder.success.password':
+ 'Has been set',
'userCenter.securitySettings.updatePwd.placeholder.error.password':
'You have not set a password yet. The password must contain at least six letters, digits, and special characters except Spaces.',
'userCenter.securitySettings.updatePwd.modal.title': 'Update login password',
- 'userCenter.securitySettings.updatePwd.form.label.oldPassword': 'Old password',
- 'userCenter.securitySettings.updatePwd.form.label.newPassword': 'New password',
- 'userCenter.securitySettings.updatePwd.form.label.rePassword': 'Confirm password',
+ 'userCenter.securitySettings.updatePwd.form.label.oldPassword':
+ 'Old password',
+ 'userCenter.securitySettings.updatePwd.form.label.newPassword':
+ 'New password',
+ 'userCenter.securitySettings.updatePwd.form.label.rePassword':
+ 'Confirm password',
- 'userCenter.securitySettings.updatePwd.form.placeholder.oldPassword': 'Please enter old password',
- 'userCenter.securitySettings.updatePwd.form.placeholder.newPassword': 'Password contains 6 to 32 digits and letters',
- 'userCenter.securitySettings.updatePwd.form.placeholder.rePassword': 'Please enter new password again',
+ 'userCenter.securitySettings.updatePwd.form.placeholder.oldPassword':
+ 'Please enter old password',
+ 'userCenter.securitySettings.updatePwd.form.placeholder.newPassword':
+ 'Password contains 6 to 32 digits and letters',
+ 'userCenter.securitySettings.updatePwd.form.placeholder.rePassword':
+ 'Please enter new password again',
- 'userCenter.securitySettings.updatePwd.form.error.required.oldPassword': 'Please enter old password',
- 'userCenter.securitySettings.updatePwd.form.error.required.newPassword': 'Please enter new password',
- 'userCenter.securitySettings.updatePwd.form.error.match.newPassword': 'Password contains 6 to 32 digits and letters',
- 'userCenter.securitySettings.updatePwd.form.error.validator.newPassword': 'New password cannot be the same as the old password',
- 'userCenter.securitySettings.updatePwd.form.error.required.rePassword': 'Please enter new password again',
- 'userCenter.securitySettings.updatePwd.form.error.validator.rePassword': 'Two passwords are different',
+ 'userCenter.securitySettings.updatePwd.form.error.required.oldPassword':
+ 'Please enter old password',
+ 'userCenter.securitySettings.updatePwd.form.error.required.newPassword':
+ 'Please enter new password',
+ 'userCenter.securitySettings.updatePwd.form.error.match.newPassword':
+ 'Password contains 6 to 32 digits and letters',
+ 'userCenter.securitySettings.updatePwd.form.error.validator.newPassword':
+ 'New password cannot be the same as the old password',
+ 'userCenter.securitySettings.updatePwd.form.error.required.rePassword':
+ 'Please enter new password again',
+ 'userCenter.securitySettings.updatePwd.form.error.validator.rePassword':
+ 'Two passwords are different',
// update-phone
'userCenter.securitySettings.updatePhone.label.phone': 'Phone',
- 'userCenter.securitySettings.updatePhone.placeholder.success.phone': 'Has been bound',
+ 'userCenter.securitySettings.updatePhone.placeholder.success.phone':
+ 'Has been bound',
'userCenter.securitySettings.updatePhone.placeholder.error.phone':
'You have not set a phone yet. The phone binding can be used to retrieve passwords and receive notifications and SMS login.',
// update-email
'userCenter.securitySettings.updateEmail.label.email': 'Email',
- 'userCenter.securitySettings.updateEmail.placeholder.success.email': 'Has been bound',
+ 'userCenter.securitySettings.updateEmail.placeholder.success.email':
+ 'Has been bound',
'userCenter.securitySettings.updateEmail.placeholder.error.email':
'You have not set a mailbox yet. The mailbox binding can be used to retrieve passwords and receive notifications.',
'userCenter.securitySettings.updateEmail.modal.title': 'Update email',
'userCenter.securitySettings.updateEmail.form.label.newEmail': 'New email',
'userCenter.securitySettings.updateEmail.form.label.captcha': 'Captcha',
- 'userCenter.securitySettings.updateEmail.form.label.currentPassword': 'Current password',
+ 'userCenter.securitySettings.updateEmail.form.label.currentPassword':
+ 'Current password',
'userCenter.securitySettings.updateEmail.form.sendCaptcha': 'Send captcha',
- 'userCenter.securitySettings.updateEmail.form.reSendCaptcha': 'Resend captcha',
- 'userCenter.securitySettings.updateEmail.form.loading.sendCaptcha': 'Sending...',
+ 'userCenter.securitySettings.updateEmail.form.reSendCaptcha':
+ 'Resend captcha',
+ 'userCenter.securitySettings.updateEmail.form.loading.sendCaptcha':
+ 'Sending...',
- 'userCenter.securitySettings.updateEmail.form.placeholder.newEmail': 'Please enter new email',
- 'userCenter.securitySettings.updateEmail.form.placeholder.captcha': 'Please enter email captcha',
- 'userCenter.securitySettings.updateEmail.form.placeholder.currentPassword': 'Please enter current password',
+ 'userCenter.securitySettings.updateEmail.form.placeholder.newEmail':
+ 'Please enter new email',
+ 'userCenter.securitySettings.updateEmail.form.placeholder.captcha':
+ 'Please enter email captcha',
+ 'userCenter.securitySettings.updateEmail.form.placeholder.currentPassword':
+ 'Please enter current password',
- 'userCenter.securitySettings.updateEmail.form.error.required.newEmail': 'Please enter new email',
- 'userCenter.securitySettings.updateEmail.form.error.match.newEmail': 'Please enter the correct email',
- 'userCenter.securitySettings.updateEmail.form.error.validator.newEmail': 'New email cannot be the same as the old email',
- 'userCenter.securitySettings.updateEmail.form.error.required.captcha': 'Please enter email captcha',
- 'userCenter.securitySettings.updateEmail.form.error.required.currentPassword': 'Please enter current password',
+ 'userCenter.securitySettings.updateEmail.form.error.required.newEmail':
+ 'Please enter new email',
+ 'userCenter.securitySettings.updateEmail.form.error.match.newEmail':
+ 'Please enter the correct email',
+ 'userCenter.securitySettings.updateEmail.form.error.validator.newEmail':
+ 'New email cannot be the same as the old email',
+ 'userCenter.securitySettings.updateEmail.form.error.required.captcha':
+ 'Please enter email captcha',
+ 'userCenter.securitySettings.updateEmail.form.error.required.currentPassword':
+ 'Please enter current password',
'userCenter.securitySettings.button.update': 'Update',
};
diff --git a/continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts b/continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts
index 592b19e4..bdb71407 100644
--- a/continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts
+++ b/continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts
@@ -25,9 +25,11 @@ export default {
'userCenter.basicInfo.form.placeholder.nickname': '请输入昵称',
'userCenter.basicInfo.form.error.required.username': '请输入用户名',
- 'userCenter.basicInfo.form.error.match.username': '长度为 4 到 16 位,可以包含字母、数字,下划线,以字母开头',
+ 'userCenter.basicInfo.form.error.match.username':
+ '长度为 4 到 16 位,可以包含字母、数字,下划线,以字母开头',
'userCenter.basicInfo.form.error.required.nickname': '请输入昵称',
- 'userCenter.basicInfo.form.error.match.nickname': '长度为 1 到 20 位,可以包含中文、字母、数字、下划线,短横线',
+ 'userCenter.basicInfo.form.error.match.nickname':
+ '长度为 1 到 20 位,可以包含中文、字母、数字、下划线,短横线',
'userCenter.basicInfo.form.save': '保存',
'userCenter.basicInfo.form.save.success': '保存成功',
@@ -36,7 +38,8 @@ export default {
// security-settings
// update-pwd
'userCenter.securitySettings.updatePwd.label.password': '登录密码',
- 'userCenter.securitySettings.updatePwd.placeholder.success.password': '已设置',
+ 'userCenter.securitySettings.updatePwd.placeholder.success.password':
+ '已设置',
'userCenter.securitySettings.updatePwd.placeholder.error.password':
'您暂未设置密码,密码至少6位字符,支持数字、字母和除空格外的特殊字符。',
@@ -45,16 +48,25 @@ export default {
'userCenter.securitySettings.updatePwd.form.label.newPassword': '新密码',
'userCenter.securitySettings.updatePwd.form.label.rePassword': '确认新密码',
- 'userCenter.securitySettings.updatePwd.form.placeholder.oldPassword': '请输入当前密码',
- 'userCenter.securitySettings.updatePwd.form.placeholder.newPassword': '长度为 6 到 32 位,同时包含字母和数字',
- 'userCenter.securitySettings.updatePwd.form.placeholder.rePassword': '请再次输入新密码',
+ 'userCenter.securitySettings.updatePwd.form.placeholder.oldPassword':
+ '请输入当前密码',
+ 'userCenter.securitySettings.updatePwd.form.placeholder.newPassword':
+ '长度为 6 到 32 位,同时包含字母和数字',
+ 'userCenter.securitySettings.updatePwd.form.placeholder.rePassword':
+ '请再次输入新密码',
- 'userCenter.securitySettings.updatePwd.form.error.required.oldPassword': '请输入当前密码',
- 'userCenter.securitySettings.updatePwd.form.error.required.newPassword': '请输入新密码',
- 'userCenter.securitySettings.updatePwd.form.error.match.newPassword': '长度为 6 到 32 位,同时包含字母和数字',
- 'userCenter.securitySettings.updatePwd.form.error.validator.newPassword': '新密码不能与当前密码相同',
- 'userCenter.securitySettings.updatePwd.form.error.required.rePassword': '请再次输入新密码',
- 'userCenter.securitySettings.updatePwd.form.error.validator.rePassword': '两次输入的密码不一致',
+ 'userCenter.securitySettings.updatePwd.form.error.required.oldPassword':
+ '请输入当前密码',
+ 'userCenter.securitySettings.updatePwd.form.error.required.newPassword':
+ '请输入新密码',
+ 'userCenter.securitySettings.updatePwd.form.error.match.newPassword':
+ '长度为 6 到 32 位,同时包含字母和数字',
+ 'userCenter.securitySettings.updatePwd.form.error.validator.newPassword':
+ '新密码不能与当前密码相同',
+ 'userCenter.securitySettings.updatePwd.form.error.required.rePassword':
+ '请再次输入新密码',
+ 'userCenter.securitySettings.updatePwd.form.error.validator.rePassword':
+ '两次输入的密码不一致',
// update-phone
'userCenter.securitySettings.updatePhone.label.phone': '安全手机',
@@ -71,20 +83,30 @@ export default {
'userCenter.securitySettings.updateEmail.modal.title': '修改邮箱',
'userCenter.securitySettings.updateEmail.form.label.newEmail': '新邮箱',
'userCenter.securitySettings.updateEmail.form.label.captcha': '验证码',
- 'userCenter.securitySettings.updateEmail.form.label.currentPassword': '当前密码',
+ 'userCenter.securitySettings.updateEmail.form.label.currentPassword':
+ '当前密码',
'userCenter.securitySettings.updateEmail.form.sendCaptcha': '发送验证码',
'userCenter.securitySettings.updateEmail.form.reSendCaptcha': '重新发送',
- 'userCenter.securitySettings.updateEmail.form.loading.sendCaptcha': '发送中...',
+ 'userCenter.securitySettings.updateEmail.form.loading.sendCaptcha':
+ '发送中...',
- 'userCenter.securitySettings.updateEmail.form.placeholder.newEmail': '请输入新邮箱',
- 'userCenter.securitySettings.updateEmail.form.placeholder.captcha': '请输入邮箱验证码',
- 'userCenter.securitySettings.updateEmail.form.placeholder.currentPassword': '请输入当前密码',
+ 'userCenter.securitySettings.updateEmail.form.placeholder.newEmail':
+ '请输入新邮箱',
+ 'userCenter.securitySettings.updateEmail.form.placeholder.captcha':
+ '请输入邮箱验证码',
+ 'userCenter.securitySettings.updateEmail.form.placeholder.currentPassword':
+ '请输入当前密码',
- 'userCenter.securitySettings.updateEmail.form.error.required.newEmail': '请输入新邮箱',
- 'userCenter.securitySettings.updateEmail.form.error.match.newEmail': '请输入正确的邮箱',
- 'userCenter.securitySettings.updateEmail.form.error.validator.newEmail': '新邮箱不能与当前邮箱相同',
- 'userCenter.securitySettings.updateEmail.form.error.required.captcha': '请输入邮箱验证码',
- 'userCenter.securitySettings.updateEmail.form.error.required.currentPassword': '请输入当前密码',
+ 'userCenter.securitySettings.updateEmail.form.error.required.newEmail':
+ '请输入新邮箱',
+ 'userCenter.securitySettings.updateEmail.form.error.match.newEmail':
+ '请输入正确的邮箱',
+ 'userCenter.securitySettings.updateEmail.form.error.validator.newEmail':
+ '新邮箱不能与当前邮箱相同',
+ 'userCenter.securitySettings.updateEmail.form.error.required.captcha':
+ '请输入邮箱验证码',
+ 'userCenter.securitySettings.updateEmail.form.error.required.currentPassword':
+ '请输入当前密码',
'userCenter.securitySettings.button.update': '修改',
};
diff --git a/continew-admin-ui/src/views/system/user/index.vue b/continew-admin-ui/src/views/system/user/index.vue
index 6740bca2..dd6f2f70 100644
--- a/continew-admin-ui/src/views/system/user/index.vue
+++ b/continew-admin-ui/src/views/system/user/index.vue
@@ -3,7 +3,14 @@
-
+
-
+
- {{ record.email }}
+ {{ record.email }}
{{ record.phone }}
@@ -173,7 +183,10 @@
v-model="record.status"
:checked-value="1"
:unchecked-value="2"
- :disabled="record.disabled || !checkPermission(['system:user:update'])"
+ :disabled="
+ record.disabled ||
+ !checkPermission(['system:user:update'])
+ "
@change="handleChangeStatus(record)"
/>
@@ -186,7 +199,7 @@
- {{ record.createUserString }}
+ {{ record.createUserString }}
{{ record.createTime }}
@@ -240,7 +253,9 @@
size="small"
title="重置密码"
>
-
+
-
+
@@ -325,7 +342,11 @@
style="width: 431px"
/>
-
+