9/28
1. 修改登录页面中:星期展示方法 2. 登录页面 3.
This commit is contained in:
@@ -1,9 +1,13 @@
|
||||
import type { LocationQuery, RouteLocationNormalized, RouteMeta } from 'vue-router';
|
||||
import { defineStore } from 'pinia';
|
||||
import { ref } from 'vue';
|
||||
import { useSettingsStore } from './settings';
|
||||
import type {
|
||||
LocationQuery,
|
||||
RouteLocationNormalized,
|
||||
RouteMeta,
|
||||
} from "vue-router";
|
||||
import { defineStore } from "pinia";
|
||||
import { ref } from "vue";
|
||||
import { useSettingsStore } from "./settings";
|
||||
|
||||
const PERSIST_KEY = 'tags-view-visited';
|
||||
const PERSIST_KEY = "tags-view-visited";
|
||||
|
||||
type PersistedTagView = {
|
||||
path: string;
|
||||
@@ -24,7 +28,7 @@ const isPersistEnabled = () => {
|
||||
|
||||
const normalizeVisitedView = (view: RouteLocationNormalized): TagView => {
|
||||
return Object.assign({}, view, {
|
||||
title: view.meta?.title || 'no-name'
|
||||
title: view.meta?.title || "no-name",
|
||||
});
|
||||
};
|
||||
|
||||
@@ -34,14 +38,14 @@ const saveVisitedViews = (views: any[]) => {
|
||||
}
|
||||
|
||||
const payload: PersistedTagView[] = (views as TagView[])
|
||||
.filter(view => !view.meta?.affix)
|
||||
.map(view => ({
|
||||
.filter((view) => !view.meta?.affix)
|
||||
.map((view) => ({
|
||||
path: view.path,
|
||||
fullPath: view.fullPath,
|
||||
name: view.name,
|
||||
title: (view as any).title || view.meta?.title || 'no-name',
|
||||
title: (view as any).title || view.meta?.title || "no-name",
|
||||
query: view.query,
|
||||
meta: view.meta
|
||||
meta: view.meta,
|
||||
}));
|
||||
|
||||
localStorage.setItem(PERSIST_KEY, JSON.stringify(payload));
|
||||
@@ -65,7 +69,7 @@ const clearVisitedViews = () => {
|
||||
localStorage.removeItem(PERSIST_KEY);
|
||||
};
|
||||
|
||||
export const useTagsViewStore = defineStore('tagsView', () => {
|
||||
export const useTagsViewStore = defineStore("tagsView", () => {
|
||||
const visitedViews = ref<TagView[]>([]);
|
||||
const cachedViews = ref<string[]>([]);
|
||||
const iframeViews = ref<TagView[]>([]);
|
||||
@@ -86,26 +90,49 @@ export const useTagsViewStore = defineStore('tagsView', () => {
|
||||
};
|
||||
|
||||
const addIframeView = (view: RouteLocationNormalized): void => {
|
||||
if (iframeViews.value.some((v: RouteLocationNormalized) => v.path === view.path)) return;
|
||||
iframeViews.value.push(normalizeVisitedView(view) as RouteLocationNormalized);
|
||||
if (
|
||||
iframeViews.value.some(
|
||||
(v: RouteLocationNormalized) => v.path === view.path,
|
||||
)
|
||||
)
|
||||
return;
|
||||
iframeViews.value.push(
|
||||
normalizeVisitedView(view) as RouteLocationNormalized,
|
||||
);
|
||||
};
|
||||
|
||||
const delIframeView = (view: RouteLocationNormalized): Promise<RouteLocationNormalized[]> => {
|
||||
return new Promise(resolve => {
|
||||
iframeViews.value = iframeViews.value.filter((item: RouteLocationNormalized) => item.path !== view.path);
|
||||
const delIframeView = (
|
||||
view: RouteLocationNormalized,
|
||||
): Promise<RouteLocationNormalized[]> => {
|
||||
return new Promise((resolve) => {
|
||||
iframeViews.value = iframeViews.value.filter(
|
||||
(item: RouteLocationNormalized) => item.path !== view.path,
|
||||
);
|
||||
resolve(iframeViews.value.slice() as RouteLocationNormalized[]);
|
||||
});
|
||||
};
|
||||
|
||||
const addVisitedView = (view: RouteLocationNormalized): void => {
|
||||
if (visitedViews.value.some((v: RouteLocationNormalized) => v.path === view.path)) return;
|
||||
if (
|
||||
visitedViews.value.some(
|
||||
(v: RouteLocationNormalized) => v.path === view.path,
|
||||
)
|
||||
)
|
||||
return;
|
||||
visitedViews.value.push(normalizeVisitedView(view));
|
||||
saveVisitedViews(visitedViews.value);
|
||||
};
|
||||
|
||||
const addAffixView = (view: RouteLocationNormalized): void => {
|
||||
if (visitedViews.value.some((v: RouteLocationNormalized) => v.path === view.path)) return;
|
||||
const insertIndex = visitedViews.value.findIndex(item => !item.meta?.affix);
|
||||
if (
|
||||
visitedViews.value.some(
|
||||
(v: RouteLocationNormalized) => v.path === view.path,
|
||||
)
|
||||
)
|
||||
return;
|
||||
const insertIndex = visitedViews.value.findIndex(
|
||||
(item) => !item.meta?.affix,
|
||||
);
|
||||
const normalizedView = normalizeVisitedView(view);
|
||||
if (insertIndex === -1) {
|
||||
visitedViews.value.push(normalizedView);
|
||||
@@ -115,13 +142,13 @@ export const useTagsViewStore = defineStore('tagsView', () => {
|
||||
};
|
||||
|
||||
const loadPersistedViews = (): void => {
|
||||
loadVisitedViews().forEach(view => {
|
||||
if (visitedViews.value.some(item => item.path === view.path)) {
|
||||
loadVisitedViews().forEach((view) => {
|
||||
if (visitedViews.value.some((item) => item.path === view.path)) {
|
||||
return;
|
||||
}
|
||||
|
||||
visitedViews.value.push({
|
||||
hash: '',
|
||||
hash: "",
|
||||
matched: [],
|
||||
params: {},
|
||||
redirectedFrom: undefined,
|
||||
@@ -130,29 +157,31 @@ export const useTagsViewStore = defineStore('tagsView', () => {
|
||||
query: view.query || {},
|
||||
name: view.name || undefined,
|
||||
meta: view.meta || {},
|
||||
title: view.title || view.meta?.title || 'no-name'
|
||||
title: view.title || view.meta?.title || "no-name",
|
||||
} as TagView);
|
||||
});
|
||||
};
|
||||
|
||||
const delView = (
|
||||
view: RouteLocationNormalized
|
||||
view: RouteLocationNormalized,
|
||||
): Promise<{
|
||||
visitedViews: RouteLocationNormalized[];
|
||||
cachedViews: string[];
|
||||
}> => {
|
||||
return new Promise(resolve => {
|
||||
return new Promise((resolve) => {
|
||||
delVisitedView(view);
|
||||
delCachedView(view);
|
||||
resolve({
|
||||
visitedViews: visitedViews.value.slice() as RouteLocationNormalized[],
|
||||
cachedViews: [...cachedViews.value]
|
||||
cachedViews: [...cachedViews.value],
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
const delVisitedView = (view: RouteLocationNormalized): Promise<RouteLocationNormalized[]> => {
|
||||
return new Promise(resolve => {
|
||||
const delVisitedView = (
|
||||
view: RouteLocationNormalized,
|
||||
): Promise<RouteLocationNormalized[]> => {
|
||||
return new Promise((resolve) => {
|
||||
for (const [i, v] of visitedViews.value.entries()) {
|
||||
if (v.path === view.path) {
|
||||
visitedViews.value.splice(i, 1);
|
||||
@@ -165,11 +194,11 @@ export const useTagsViewStore = defineStore('tagsView', () => {
|
||||
};
|
||||
|
||||
const delCachedView = (view?: RouteLocationNormalized): Promise<string[]> => {
|
||||
let viewName = '';
|
||||
let viewName = "";
|
||||
if (view) {
|
||||
viewName = view.name as string;
|
||||
}
|
||||
return new Promise(resolve => {
|
||||
return new Promise((resolve) => {
|
||||
const index = cachedViews.value.indexOf(viewName);
|
||||
index > -1 && cachedViews.value.splice(index, 1);
|
||||
resolve([...cachedViews.value]);
|
||||
@@ -177,34 +206,40 @@ export const useTagsViewStore = defineStore('tagsView', () => {
|
||||
};
|
||||
|
||||
const delOthersViews = (
|
||||
view: RouteLocationNormalized
|
||||
view: RouteLocationNormalized,
|
||||
): Promise<{
|
||||
visitedViews: RouteLocationNormalized[];
|
||||
cachedViews: string[];
|
||||
}> => {
|
||||
return new Promise(resolve => {
|
||||
return new Promise((resolve) => {
|
||||
delOthersVisitedViews(view);
|
||||
delOthersCachedViews(view);
|
||||
resolve({
|
||||
visitedViews: visitedViews.value.slice() as RouteLocationNormalized[],
|
||||
cachedViews: [...cachedViews.value]
|
||||
cachedViews: [...cachedViews.value],
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
const delOthersVisitedViews = (view: RouteLocationNormalized): Promise<RouteLocationNormalized[]> => {
|
||||
return new Promise(resolve => {
|
||||
visitedViews.value = visitedViews.value.filter((v: RouteLocationNormalized) => {
|
||||
return v.meta?.affix || v.path === view.path;
|
||||
});
|
||||
const delOthersVisitedViews = (
|
||||
view: RouteLocationNormalized,
|
||||
): Promise<RouteLocationNormalized[]> => {
|
||||
return new Promise((resolve) => {
|
||||
visitedViews.value = visitedViews.value.filter(
|
||||
(v: RouteLocationNormalized) => {
|
||||
return v.meta?.affix || v.path === view.path;
|
||||
},
|
||||
);
|
||||
saveVisitedViews(visitedViews.value);
|
||||
resolve(visitedViews.value.slice() as RouteLocationNormalized[]);
|
||||
});
|
||||
};
|
||||
|
||||
const delOthersCachedViews = (view: RouteLocationNormalized): Promise<string[]> => {
|
||||
const delOthersCachedViews = (
|
||||
view: RouteLocationNormalized,
|
||||
): Promise<string[]> => {
|
||||
const viewName = view.name as string;
|
||||
return new Promise(resolve => {
|
||||
return new Promise((resolve) => {
|
||||
const index = cachedViews.value.indexOf(viewName);
|
||||
if (index > -1) {
|
||||
cachedViews.value = cachedViews.value.slice(index, index + 1);
|
||||
@@ -219,26 +254,28 @@ export const useTagsViewStore = defineStore('tagsView', () => {
|
||||
visitedViews: RouteLocationNormalized[];
|
||||
cachedViews: string[];
|
||||
}> => {
|
||||
return new Promise(resolve => {
|
||||
return new Promise((resolve) => {
|
||||
delAllVisitedViews();
|
||||
delAllCachedViews();
|
||||
resolve({
|
||||
visitedViews: visitedViews.value.slice() as RouteLocationNormalized[],
|
||||
cachedViews: [...cachedViews.value]
|
||||
cachedViews: [...cachedViews.value],
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
const delAllVisitedViews = (): Promise<RouteLocationNormalized[]> => {
|
||||
return new Promise(resolve => {
|
||||
visitedViews.value = visitedViews.value.filter((tag: RouteLocationNormalized) => tag.meta?.affix);
|
||||
return new Promise((resolve) => {
|
||||
visitedViews.value = visitedViews.value.filter(
|
||||
(tag: RouteLocationNormalized) => tag.meta?.affix,
|
||||
);
|
||||
clearVisitedViews();
|
||||
resolve(visitedViews.value.slice() as RouteLocationNormalized[]);
|
||||
});
|
||||
};
|
||||
|
||||
const delAllCachedViews = (): Promise<string[]> => {
|
||||
return new Promise(resolve => {
|
||||
return new Promise((resolve) => {
|
||||
cachedViews.value = [];
|
||||
resolve([...cachedViews.value]);
|
||||
});
|
||||
@@ -254,45 +291,57 @@ export const useTagsViewStore = defineStore('tagsView', () => {
|
||||
saveVisitedViews(visitedViews.value);
|
||||
};
|
||||
|
||||
const delRightTags = (view: RouteLocationNormalized): Promise<RouteLocationNormalized[]> => {
|
||||
return new Promise(resolve => {
|
||||
const index = visitedViews.value.findIndex((v: RouteLocationNormalized) => v.path === view.path);
|
||||
const delRightTags = (
|
||||
view: RouteLocationNormalized,
|
||||
): Promise<RouteLocationNormalized[]> => {
|
||||
return new Promise((resolve) => {
|
||||
const index = visitedViews.value.findIndex(
|
||||
(v: RouteLocationNormalized) => v.path === view.path,
|
||||
);
|
||||
if (index === -1) {
|
||||
resolve(visitedViews.value.slice() as RouteLocationNormalized[]);
|
||||
return;
|
||||
}
|
||||
visitedViews.value = visitedViews.value.filter((item: RouteLocationNormalized, idx: number) => {
|
||||
if (idx <= index || (item.meta && item.meta.affix)) {
|
||||
return true;
|
||||
}
|
||||
const i = cachedViews.value.indexOf(item.name as string);
|
||||
if (i > -1) {
|
||||
cachedViews.value.splice(i, 1);
|
||||
}
|
||||
return false;
|
||||
});
|
||||
visitedViews.value = visitedViews.value.filter(
|
||||
(item: RouteLocationNormalized, idx: number) => {
|
||||
if (idx <= index || (item.meta && item.meta.affix)) {
|
||||
return true;
|
||||
}
|
||||
const i = cachedViews.value.indexOf(item.name as string);
|
||||
if (i > -1) {
|
||||
cachedViews.value.splice(i, 1);
|
||||
}
|
||||
return false;
|
||||
},
|
||||
);
|
||||
saveVisitedViews(visitedViews.value);
|
||||
resolve(visitedViews.value.slice() as RouteLocationNormalized[]);
|
||||
});
|
||||
};
|
||||
|
||||
const delLeftTags = (view: RouteLocationNormalized): Promise<RouteLocationNormalized[]> => {
|
||||
return new Promise(resolve => {
|
||||
const index = visitedViews.value.findIndex((v: RouteLocationNormalized) => v.path === view.path);
|
||||
const delLeftTags = (
|
||||
view: RouteLocationNormalized,
|
||||
): Promise<RouteLocationNormalized[]> => {
|
||||
return new Promise((resolve) => {
|
||||
const index = visitedViews.value.findIndex(
|
||||
(v: RouteLocationNormalized) => v.path === view.path,
|
||||
);
|
||||
if (index === -1) {
|
||||
resolve(visitedViews.value.slice() as RouteLocationNormalized[]);
|
||||
return;
|
||||
}
|
||||
visitedViews.value = visitedViews.value.filter((item: RouteLocationNormalized, idx: number) => {
|
||||
if (idx >= index || (item.meta && item.meta.affix)) {
|
||||
return true;
|
||||
}
|
||||
const i = cachedViews.value.indexOf(item.name as string);
|
||||
if (i > -1) {
|
||||
cachedViews.value.splice(i, 1);
|
||||
}
|
||||
return false;
|
||||
});
|
||||
visitedViews.value = visitedViews.value.filter(
|
||||
(item: RouteLocationNormalized, idx: number) => {
|
||||
if (idx >= index || (item.meta && item.meta.affix)) {
|
||||
return true;
|
||||
}
|
||||
const i = cachedViews.value.indexOf(item.name as string);
|
||||
if (i > -1) {
|
||||
cachedViews.value.splice(i, 1);
|
||||
}
|
||||
return false;
|
||||
},
|
||||
);
|
||||
saveVisitedViews(visitedViews.value);
|
||||
resolve(visitedViews.value.slice() as RouteLocationNormalized[]);
|
||||
});
|
||||
@@ -332,6 +381,6 @@ export const useTagsViewStore = defineStore('tagsView', () => {
|
||||
delLeftTags,
|
||||
addIframeView,
|
||||
delIframeView,
|
||||
loadPersistedViews
|
||||
loadPersistedViews,
|
||||
};
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user