abu/wzj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	.prettierrc
#	package.json
#	src/components/BuildCode/render.vue
#	src/components/IconSelect/index.vue
#	src/components/ImagePreview/index.vue
#	src/components/SizeSelect/index.vue
#	src/layout/components/Settings/index.vue
#	src/store/modules/settings.ts
#	src/types/global.d.ts
#	src/views/system/user/index.vue
#	src/views/system/user/profile/userInfo.vue
This commit is contained in:
ahao 2023-12-13 18:35:03 +08:00
commit 856c5f4ef2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/store/modules/tagsView.ts
View File

@ -123,7 +123,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
}); });
}; };
const updateVisitedView = (view: TagView): void => { const updateVisitedView = (view: TagView | RouteLocationNormalized): void => {
for (let v of visitedViews.value) { for (let v of visitedViews.value) {
if (v.path === view.path) { if (v.path === view.path) {
v = Object.assign(v, view); v = Object.assign(v, view);
@ -170,7 +170,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
}); });
}; };
const addCachedView = (view: TagView): void => { const addCachedView = (view: TagView | RouteLocationNormalized): void => {
const viewName = view.name as string; const viewName = view.name as string;
if (!viewName) return; if (!viewName) return;
if (cachedViews.value.includes(viewName)) return; if (cachedViews.value.includes(viewName)) return;