From 69395aa46548fdd1b7dd049cea192715bff9354b Mon Sep 17 00:00:00 2001 From: Jianguo-Genius Date: Mon, 8 Apr 2024 15:59:36 +0800 Subject: [PATCH] =?UTF-8?q?style(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=87=8D=E7=BD=AEadmin=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001038714 --- frontend/src/views/setting/system/user/index.vue | 7 ++++++- frontend/src/views/setting/system/user/locale/en-US.ts | 1 + frontend/src/views/setting/system/user/locale/zh-CN.ts | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/setting/system/user/index.vue b/frontend/src/views/setting/system/user/index.vue index e1f14bf636..235111ad40 100644 --- a/frontend/src/views/setting/system/user/index.vue +++ b/frontend/src/views/setting/system/user/index.vue @@ -422,10 +422,15 @@ title = t('system.user.batchResetPswTip', { count: params?.currentSelectCount || tableSelected.value.length }); selectIds = tableSelected.value as string[]; } + + let content = t('system.user.resetPswContent'); + if (record && record.id === 'admin') { + content = t('system.user.resetAdminPswContent'); + } openModal({ type: 'warning', title, - content: t('system.user.resetPswContent'), + content, okText: t('system.user.resetPswConfirm'), cancelText: t('system.user.resetPswCancel'), onBeforeOk: async () => { diff --git a/frontend/src/views/setting/system/user/locale/en-US.ts b/frontend/src/views/setting/system/user/locale/en-US.ts index ddc8aa932c..b559214c51 100644 --- a/frontend/src/views/setting/system/user/locale/en-US.ts +++ b/frontend/src/views/setting/system/user/locale/en-US.ts @@ -32,6 +32,7 @@ export default { 'system.user.resetPswTip': 'Reset the password of {name} to its initial password?', 'system.user.batchResetPswTip': 'Reset the passwords of the selected {count} users to their initial passwords?', 'system.user.resetPswContent': "The initial password is the user's mailbox, which will take effect at the next login", + 'system.user.resetAdminPswContent': 'The initial password is metersphere, which will take effect at the next login', 'system.user.resetPswConfirm': 'Reset', 'system.user.resetPswCancel': 'Cancel', 'system.user.resetPswSuccess': 'Reset successfully', diff --git a/frontend/src/views/setting/system/user/locale/zh-CN.ts b/frontend/src/views/setting/system/user/locale/zh-CN.ts index e78ddb176d..390f9004ea 100644 --- a/frontend/src/views/setting/system/user/locale/zh-CN.ts +++ b/frontend/src/views/setting/system/user/locale/zh-CN.ts @@ -31,6 +31,7 @@ export default { 'system.user.resetPswTip': '是否将 {name} 的密码重置为初始密码?', 'system.user.batchResetPswTip': '是否将选中的 {count} 个用户的密码重置为初始密码?', 'system.user.resetPswContent': '初始的密码为用户邮箱,下次登录时生效', + 'system.user.resetAdminPswContent': '初始的密码为metersphere,下次登录时生效', 'system.user.resetPswConfirm': '确认重置', 'system.user.resetPswCancel': '取消', 'system.user.resetPswSuccess': '重置成功',