github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-09 23:18:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复偶现的是子窗口出现身份丢失的情况

Browse Source
This commit is contained in:
kuaifan 2025-02-12 21:09:54 +08:00
parent 15370a93c7
commit f8b69df955
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
resources/assets/js/store/actions.js vendored
View File

@ -75,14 +75,28 @@ export default {
userid: '__system:userId__',
token: '__system:userToken__'
};
const paramUser = {
userid: 0,
token: null
}
Object.entries(paramMap).forEach(([param, key]) => {
urlParams[param] && window.localStorage.setItem(key, urlParams[param]);
if (urlParams[param]) {
window.localStorage.setItem(key, urlParams[param]);
param === 'userid' && (paramUser.userid = $A.runNum(urlParams[param]))
param === 'token' && (paramUser.token = urlParams[param])
}
});
if (Object.keys(paramMap).some(param => urlParams[param])) {
const newUrl = $A.removeURLParameter(window.location.href, Object.keys(paramMap));
window.history.replaceState(null, '', newUrl);
}
// 处理用户身份信息
if (paramUser.userid > 0 && paramUser.token) {
const userInfo = await $A.IDBJson('userInfo')
await $A.IDBSet("userInfo", Object.assign(userInfo, paramUser));
}
// 清理缓存、读取缓存
let action = null
const clearCache = await $A.IDBString("clearCache")
@ -995,14 +1009,6 @@ export default {
state.userIsAdmin = $A.inArray("admin", state.userInfo.identity);
}
// 处理本地存储的用户信息
const localId = $A.runNum(window.localStorage.getItem("__system:userId__"));
const localToken = window.localStorage.getItem("__system:userToken__") || "";
if (state.userId === 0 && localId && localToken) {
state.userId = localId;
state.userToken = localToken;
}
// 处理ServerUrl
if (state.cacheServerUrl) {
window.systemInfo.apiUrl = state.cacheServerUrl