fix:clear interval fail when close autoRefresh

This commit is contained in:
raymond.chen 2022-06-14 21:53:27 +08:00
parent b697fe4713
commit 5ddf764097
2 changed files with 14 additions and 9 deletions

View File

@ -34,6 +34,7 @@ interface AppState {
pageTitle: string;
version: string;
isMobile: boolean;
reloadTimer: Nullable<any>;
}
export const appStore = defineStore({
@ -53,8 +54,12 @@ export const appStore = defineStore({
pageTitle: "",
version: "",
isMobile: false,
reloadTimer: null,
}),
getters: {
_reloadTimer(): any {
return this.reloadTimer;
},
duration(): Duration {
return {
start: getLocalTime(this.utc, this.durationRow.start),
@ -173,6 +178,9 @@ export const appStore = defineStore({
this.version = res.data.data.version;
return res.data;
},
setReloadTimer(timer: any): void {
this.reloadTimer = timer;
},
},
});
export function useAppStoreWithOut(): any {

View File

@ -78,9 +78,6 @@ import Selector from "@/components/Selector.vue";
const { t, locale } = useI18n();
const appStore = useAppStoreWithOut();
const state = reactive<{ timer: ReturnType<typeof setInterval> | null }>({
timer: null,
});
const lang = ref<string>(locale.value || "en");
const autoTime = ref<number>(6);
const auto = ref<boolean>(appStore.autoRefresh || false);
@ -101,10 +98,10 @@ const handleAuto = () => {
appStore.setAutoRefresh(auto.value);
if (auto.value) {
handleReload();
state.timer = setInterval(handleReload, autoTime.value * 1000);
appStore.setReloadTimer(setInterval(handleReload, autoTime.value * 1000));
} else {
if (state.timer) {
clearInterval(state.timer);
if (appStore._reloadTimer) {
clearInterval(appStore._reloadTimer);
}
}
};
@ -112,12 +109,12 @@ const changeAutoTime = () => {
if (autoTime.value < 1) {
return;
}
if (state.timer) {
clearInterval(state.timer);
if (appStore._reloadTimer) {
clearInterval(appStore._reloadTimer);
}
if (auto.value) {
handleReload();
state.timer = setInterval(handleReload, autoTime.value * 1000);
appStore.setReloadTimer(setInterval(handleReload, autoTime.value * 1000));
}
};
const setLang = (): void => {