zuaa
/
vue-vben-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(lock-screen): ensure lock info is saved 

确保打开多个窗口锁屏时，其它窗口不会误覆盖锁屏状态
This commit is contained in:
无木 2021-06-29 20:23:47 +08:00
parent e5f37885ff
commit d38ff6670a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/utils/cache/persistent.ts vendored
View File

@ -16,7 +16,7 @@ import {
} from '/@/enums/cacheEnum'; } from '/@/enums/cacheEnum';
import { DEFAULT_CACHE_TIME } from '/@/settings/encryptionSetting'; import { DEFAULT_CACHE_TIME } from '/@/settings/encryptionSetting';
import { toRaw } from 'vue'; import { toRaw } from 'vue';
import { pick } from 'lodash-es'; import { pick, omit } from 'lodash-es';
interface BasicStore { interface BasicStore {
[TOKEN_KEY]: string | number | null | undefined; [TOKEN_KEY]: string | number | null | undefined;
@ -98,13 +98,14 @@ export class Persistent {
window.addEventListener('beforeunload', function () { window.addEventListener('beforeunload', function () {
// TOKEN_KEY 在登录或注销时已经写入到storage了，此处为了解决同时打开多个窗口时token不同步的问题 // TOKEN_KEY 在登录或注销时已经写入到storage了，此处为了解决同时打开多个窗口时token不同步的问题
// LOCK_INFO_KEY 在锁屏和解锁时写入，此处也不应修改
ls.set(APP_LOCAL_CACHE_KEY, { ls.set(APP_LOCAL_CACHE_KEY, {
...localMemory.getCache, ...omit(localMemory.getCache, LOCK_INFO_KEY),
...pick(ls.get(APP_LOCAL_CACHE_KEY), [TOKEN_KEY, USER_INFO_KEY]), ...pick(ls.get(APP_LOCAL_CACHE_KEY), [TOKEN_KEY, USER_INFO_KEY, LOCK_INFO_KEY]),
}); });
ss.set(APP_SESSION_CACHE_KEY, { ss.set(APP_SESSION_CACHE_KEY, {
...sessionMemory.getCache, ...omit(sessionMemory.getCache, LOCK_INFO_KEY),
...pick(sessionMemory.getCache, [TOKEN_KEY, USER_INFO_KEY]), ...pick(ss.get(APP_SESSION_CACHE_KEY), [TOKEN_KEY, USER_INFO_KEY, LOCK_INFO_KEY]),
}); });
}); });