yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pre Merge pull request !742 from momo7/master

pull/742/MERGE
momo7 2025-04-12 02:29:48 +00:00 committed by Gitee
parent e804533dc9 e5240cbdc0
commit 70ee9f0a53
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 1397 additions and 1310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2692
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

7
src/config/axios/service.ts
View File

@ -190,6 +190,12 @@ service.interceptors.response.use(
message = t('sys.api.apiRequestFailed') + message.substr(message.length - 3) message = t('sys.api.apiRequestFailed') + message.substr(message.length - 3)
} }
ElMessage.error(message) ElMessage.error(message)
if (message) {
return {
message: '',
success: false,
}
}
return Promise.reject(error) return Promise.reject(error)
} }
) )
@ -224,4 +230,5 @@ const handleAuthorized = () => {
} }
return Promise.reject(t('sys.api.timeoutMessage')) return Promise.reject(t('sys.api.timeoutMessage'))
} }
export { service } export { service }

6
src/permission.ts
View File

@ -69,8 +69,14 @@ router.beforeEach(async (to, from, next) => {
const userStore = useUserStoreWithOut() const userStore = useUserStoreWithOut()
const permissionStore = usePermissionStoreWithOut() const permissionStore = usePermissionStoreWithOut()
if (!dictStore.getIsSetDict) { if (!dictStore.getIsSetDict) {
try {
await dictStore.setDictMap() await dictStore.setDictMap()
} }
// eslint-disable-next-line no-empty
catch (error) {
console.error(error)
}
}
if (!userStore.getIsSetUser) { if (!userStore.getIsSetUser) {
isRelogin.show = true isRelogin.show = true
await userStore.setUserInfoAction() await userStore.setUserInfoAction()