From 5b00e299c6d44be3e80487bc93c418f3d39d2291 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Sun, 9 Jun 2024 01:36:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E6=94=AF=E6=8C=81=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/iconify/ph.json | 3 + .../components/change-password.vue | 102 ++++++++++++++++++ .../global-header/components/user-avatar.vue | 19 +++- src/locales/langs/en-us.ts | 7 +- src/locales/langs/zh-cn.ts | 7 +- src/service/api/user.ts | 9 ++ src/typings/api.d.ts | 9 ++ src/typings/app.d.ts | 5 + 8 files changed, 155 insertions(+), 6 deletions(-) create mode 100644 src/layouts/modules/global-header/components/change-password.vue diff --git a/public/iconify/ph.json b/public/iconify/ph.json index cf6e6f1..505da3b 100644 --- a/public/iconify/ph.json +++ b/public/iconify/ph.json @@ -10,6 +10,9 @@ }, "sign-out": { "body": "" + }, + "password": { + "body": "" } } } diff --git a/src/layouts/modules/global-header/components/change-password.vue b/src/layouts/modules/global-header/components/change-password.vue new file mode 100644 index 0000000..dd5a4db --- /dev/null +++ b/src/layouts/modules/global-header/components/change-password.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/src/layouts/modules/global-header/components/user-avatar.vue b/src/layouts/modules/global-header/components/user-avatar.vue index 24ef989..91fa477 100644 --- a/src/layouts/modules/global-header/components/user-avatar.vue +++ b/src/layouts/modules/global-header/components/user-avatar.vue @@ -1,10 +1,12 @@ diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index b875ce4..bacd932 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -41,6 +41,7 @@ const local: App.I18n.Schema = { keywordSearch: 'Please enter keyword', logout: 'Logout', logoutConfirm: 'Are you sure you want to log out?', + updatePassword: 'Update password', lookForward: 'Coming soon', modify: 'Modify', modifySuccess: 'Modify Success', @@ -830,13 +831,17 @@ const local: App.I18n.Schema = { password: 'Password', updatePassword: 'Update Password', permissionList: 'Permission List', + oldPassword: 'Old Password', + newPassword: 'New Password', form: { role: 'Please enter Role', password: 'Please enter Password', username: 'Please enter Username', checkPassword: 'Please enter Confirm Password', permissions: 'Please select Group', - namespaceIds: 'Please select Namespaces' + namespaceIds: 'Please select Namespaces', + oldPassword: 'Please enter old password', + newPassword: 'Please enter new password' }, addUser: 'Add User', editUser: 'Add User', diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index 4beaa8a..ef3f8c9 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -41,6 +41,7 @@ const local: App.I18n.Schema = { keywordSearch: '请输入关键词搜索', logout: '退出登录', logoutConfirm: '确认退出登录吗?', + updatePassword: '修改密码', lookForward: '敬请期待', modify: '修改', modifySuccess: '修改成功', @@ -838,13 +839,17 @@ const local: App.I18n.Schema = { password: '密码', updatePassword: '更新密码', permissionList: '权限列表', + oldPassword: '旧密码', + newPassword: '新密码', form: { role: '请输入角色', password: '请输入密码', username: '请输入用户名', checkPassword: '请输入确认密码', permissions: '请选择组', - namespaceIds: '请选择命名空间' + namespaceIds: '请选择命名空间', + oldPassword: '请输入旧密码', + newPassword: '请输入新密码' }, addUser: '新增用户', editUser: '编辑用户', diff --git a/src/service/api/user.ts b/src/service/api/user.ts index a50a2ef..296c0de 100644 --- a/src/service/api/user.ts +++ b/src/service/api/user.ts @@ -34,3 +34,12 @@ export function fetchDelUser(id: number) { method: 'delete' }); } + +/** update user password */ +export function fetchUpdateUserPassword(data: Api.UserManager.UpdateUserPassword) { + return request({ + url: '/update-user-password', + method: 'put', + data + }); +} diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts index 66a55f7..0a8350e 100644 --- a/src/typings/api.d.ts +++ b/src/typings/api.d.ts @@ -1209,6 +1209,15 @@ declare namespace Api { /** 1、user 2、admin */ type Role = 1 | 2; + + type UpdateUserPassword = Common.CommonRecord<{ + /** 旧密码 */ + oldPassword: string; + /** 新密码 */ + newPassword: string; + /** 确认密码 */ + checkPassword?: string; + }>; } /** diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts index f9787c2..f814984 100644 --- a/src/typings/app.d.ts +++ b/src/typings/app.d.ts @@ -291,6 +291,7 @@ declare namespace App { keywordSearch: string; logout: string; logoutConfirm: string; + updatePassword: string; lookForward: string; modify: string; modifySuccess: string; @@ -997,6 +998,8 @@ declare namespace App { permissions: string; updatePassword: string; permissionList: string; + oldPassword: string; + newPassword: string; form: { role: string; password: string; @@ -1004,6 +1007,8 @@ declare namespace App { checkPassword: string; permissions: string; namespaceIds: string; + oldPassword: string; + newPassword: string; }; addUser: string; editUser: string;