fanxb/bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

fix:修复弹窗问题

Browse Source
This commit is contained in:
fanxb 2022-03-30 16:44:43 +08:00
parent f048496d73
commit 91a78a8459
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bookmark_front/src/store/modules/treeData.js
View File

@ -2,6 +2,9 @@ import localforage from "localforage";
import { checkJwtValid } from "@/util/UserUtil"; import { checkJwtValid } from "@/util/UserUtil";
import HttpUtil from "../../util/HttpUtil"; import HttpUtil from "../../util/HttpUtil";
/**书签版本检查间隔 */
const CHECK_INTERVAL = 5 * 60 * 1000;
// const CHECK_INTERVAL = 5 * 1000;
export const TREE_DATA = "treeData"; export const TREE_DATA = "treeData";
export const TOTAL_TREE_DATA = "totalTreeData"; export const TOTAL_TREE_DATA = "totalTreeData";
export const VERSION = "version"; export const VERSION = "version";
@ -83,8 +86,7 @@ const actions = {
await treeDataCheck(context, true); await treeDataCheck(context, true);
context.commit(IS_INIT, true); context.commit(IS_INIT, true);
context.commit(IS_INITING, false); context.commit(IS_INITING, false);
timer = setInterval(() => treeDataCheck(context, false), 5 * 60 * 1000); timer = setInterval(() => treeDataCheck(context, false), CHECK_INTERVAL);
// timer = setInterval(() => treeDataCheck(context, false), 5 * 1000);
}, },
/** /**
* 确保数据加载完毕 * 确保数据加载完毕
@ -118,6 +120,7 @@ const actions = {
); );
let version = await HttpUtil.get("/user/version"); let version = await HttpUtil.get("/user/version");
await context.dispatch("updateVersion", version); await context.dispatch("updateVersion", version);
await context.dispatch(refreshHomePinList);
context.commit(TOTAL_TREE_DATA, treeData); context.commit(TOTAL_TREE_DATA, treeData);
await localforage.setItem(TOTAL_TREE_DATA, treeData); await localforage.setItem(TOTAL_TREE_DATA, treeData);
}, },
@ -325,7 +328,7 @@ async function treeDataCheck (context, isFirst) {
} }
let realVersion = await HttpUtil.get("/user/version"); let realVersion = await HttpUtil.get("/user/version");
if (realVersion !== context.state[VERSION]) { if (realVersion !== context.state[VERSION]) {
if (SHOW_REFRESH_TOAST && !isFirst) { if (context.state[SHOW_REFRESH_TOAST] && !isFirst) {
//如果在书签管理页面需要弹窗提示 //如果在书签管理页面需要弹窗提示
window.vueInstance.$confirm({ window.vueInstance.$confirm({
title: "书签数据有更新，是否立即刷新？", title: "书签数据有更新，是否立即刷新？",
@ -336,7 +339,7 @@ async function treeDataCheck (context, isFirst) {
onOk () { onOk () {
toastShow = false; toastShow = false;
return new Promise(async (resolve) => { return new Promise(async (resolve) => {
await context.dispatch("refresh"); await context.dispatch(refresh);
resolve(); resolve();
}); });
}, },