From dcadeaeeeedd862db8fb1c5944f80f690c0e9966 Mon Sep 17 00:00:00 2001 From: Ryan Su Date: Sun, 5 Nov 2023 10:03:34 +0800 Subject: [PATCH 1/5] fix(user): error msg notice --- src/api/sys/user.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts index 343e4cee..1f2be539 100644 --- a/src/api/sys/user.ts +++ b/src/api/sys/user.ts @@ -204,16 +204,19 @@ export function registerBySms(params: RegisterBySmsReq, mode: ErrorMessageMode = export function getUserInfo() { return defHttp.get>( { url: Api.GetUserInfo }, - { errorMessageMode: 'none' }, + { errorMessageMode: 'notice' }, ); } export function getPermCode() { - return defHttp.get>({ url: Api.GetPermCode }); + return defHttp.get>( + { url: Api.GetPermCode }, + { errorMessageMode: 'notice' }, + ); } export function doLogout() { - return defHttp.get({ url: Api.Logout }); + return defHttp.get({ url: Api.Logout }, { errorMessageMode: 'notice' }); } /** @@ -223,7 +226,7 @@ export function doLogout() { export function getUserProfile() { return defHttp.get>( { url: Api.Profile }, - { errorMessageMode: 'message' }, + { errorMessageMode: 'notice' }, ); } @@ -231,7 +234,7 @@ export function getUserProfile() { * author: Ryan Su * @description: update user profile */ -export function updateProfile(params: UserProfile, mode: ErrorMessageMode = 'message') { +export function updateProfile(params: UserProfile, mode: ErrorMessageMode = 'notice') { return defHttp.post( { url: Api.Profile, params }, { errorMessageMode: mode, successMessageMode: mode }, @@ -246,7 +249,7 @@ export function updateProfile(params: UserProfile, mode: ErrorMessageMode = 'mes export function changePassword(params: ChangePasswordReq) { return defHttp.post( { url: Api.ChangePassword, params }, - { errorMessageMode: 'message' }, + { errorMessageMode: 'notice' }, ); } From d0d078c0dbbd8171c3a8690c03e6cdc8d3b37582 Mon Sep 17 00:00:00 2001 From: Ryan SU Date: Mon, 6 Nov 2023 21:41:25 +0800 Subject: [PATCH 2/5] fix: optimize i18n trans --- src/locales/lang/en/layout.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/locales/lang/en/layout.ts b/src/locales/lang/en/layout.ts index b5de5843..ebd8119e 100644 --- a/src/locales/lang/en/layout.ts +++ b/src/locales/lang/en/layout.ts @@ -7,22 +7,22 @@ export default { profile: 'Profile', tooltipErrorLog: 'Error log', - tooltipLock: 'Lock screen', + tooltipLock: 'Lock Screen', tooltipNotify: 'Notification', tooltipEntryFull: 'Full Screen', tooltipExitFull: 'Exit Full Screen', // lock - lockScreenPassword: 'Lock screen password', - lockScreen: 'Lock screen', + lockScreenPassword: 'Lock Screen With Password', + lockScreen: 'Lock Screen', lockScreenBtn: 'Locking', home: 'Home', }, multipleTab: { - reload: 'Refresh current', - close: 'Close current', + reload: 'Refresh Current', + close: 'Close Current', closeLeft: 'Close Left', closeRight: 'Close Right', closeOther: 'Close Other', @@ -37,13 +37,13 @@ export default { topMenuAlignRight: 'Center', topMenuAlignCenter: 'Right', // menu trigger - menuTriggerNone: 'Not Show', + menuTriggerNone: 'Not show', menuTriggerBottom: 'Bottom', menuTriggerTop: 'Top', // menu type menuTypeSidebar: 'Left menu mode', menuTypeMixSidebar: 'Left menu mixed mode', - menuTypeMix: 'Top Menu Mix mode', + menuTypeMix: 'Top menu mixed mode', menuTypeTopMenu: 'Top menu mode', on: 'On', @@ -57,7 +57,7 @@ export default { copyBtn: 'Copy', clearBtn: 'Clear cache and to the login page', - clearDictionaryCache: 'Clear dictionary caches', + clearDictionaryCache: 'Clear dictionary cache', drawerTitle: 'Configuration', From bd707b4a0ea15f47d59f56d6e478d7b27958ed1d Mon Sep 17 00:00:00 2001 From: Ryan SU Date: Mon, 6 Nov 2023 23:32:16 +0800 Subject: [PATCH 3/5] fix: optimize i18n trans --- src/locales/lang/en/layout.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/lang/en/layout.ts b/src/locales/lang/en/layout.ts index ebd8119e..fbf5d6da 100644 --- a/src/locales/lang/en/layout.ts +++ b/src/locales/lang/en/layout.ts @@ -106,7 +106,7 @@ export default { notAutoScreenLock: 'Not auto lock', fixedHeader: 'Fixed header', - fixedSideBar: 'Fixed Sidebar', + fixedSideBar: 'Fixed sidebar', mixSidebarTrigger: 'Mixed menu trigger', triggerHover: 'Hover', From 9db117e77289a1374184ec07bf0a712b82e1118c Mon Sep 17 00:00:00 2001 From: Ryan SU Date: Mon, 6 Nov 2023 23:34:24 +0800 Subject: [PATCH 4/5] fix: disable commit lint --- .husky/commit-msg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.husky/commit-msg b/.husky/commit-msg index 274d2d8b..260e10b8 100755 --- a/.husky/commit-msg +++ b/.husky/commit-msg @@ -5,4 +5,4 @@ PATH="/usr/local/bin:$PATH" -npx --no-install commitlint --edit "$1" +# npx --no-install commitlint --edit "$1" From f0b778d4d5bd1e7219baad7acb41b63d6bbc9004 Mon Sep 17 00:00:00 2001 From: Ryan SU Date: Tue, 7 Nov 2023 00:03:53 +0800 Subject: [PATCH 5/5] fix: auto refresh list in tree select --- src/components/Form/src/components/ApiMultipleSelect.vue | 2 +- src/components/Form/src/components/ApiSelect.vue | 2 +- src/components/Form/src/components/ApiTreeSelect.vue | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Form/src/components/ApiMultipleSelect.vue b/src/components/Form/src/components/ApiMultipleSelect.vue index c2b0d1fb..0e41e95f 100644 --- a/src/components/Form/src/components/ApiMultipleSelect.vue +++ b/src/components/Form/src/components/ApiMultipleSelect.vue @@ -1,6 +1,6 @@