From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 09:01:52 +0800
Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/plugins/tab.ts | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/plugins/tab.ts b/src/plugins/tab.ts
index 1c0ab7a..259dfa5 100644
--- a/src/plugins/tab.ts
+++ b/src/plugins/tab.ts
@@ -1,13 +1,16 @@
import { useTagsViewStore } from '@/store/modules/tagsView';
import router from '@/router';
-import { TagView, RouteLocationRaw } from 'vue-router';
+import { TagView, RouteLocationMatched } from 'vue-router';
export default {
- // 鍒锋柊褰撳墠tab椤电
- async refreshPage(obj: TagView): Promise<void> {
+ /**
+ * 鍒锋柊褰撳墠tab椤电
+ * @param obj 鏍囩瀵硅薄
+ */
+ async refreshPage(obj?: TagView): Promise<void> {
const { path, query, matched } = router.currentRoute.value;
if (obj === undefined) {
- matched.forEach((m) => {
+ matched.forEach((m: RouteLocationMatched) => {
if (m.components && m.components.default && m.components.default.name) {
if (!['Layout', 'ParentView'].includes(m.components.default.name)) {
obj = { name: m.components.default.name, path: path, query: query };
@@ -15,16 +18,21 @@
}
});
}
- // prettier-ignore
- await useTagsViewStore().delCachedView(obj)
+ let query1: undefined | {} = {};
+ let path1: undefined | string = '';
+ if (obj) {
+ query1 = obj.query;
+ path1 = obj.path;
+ }
+ await useTagsViewStore().delCachedView(obj);
await router.replace({
- path: '/redirect' + obj.path,
- query: obj.query
+ path: '/redirect' + path1,
+ query: query1
});
},
// 鍏抽棴褰撳墠tab椤电锛屾墦寮�鏂伴〉绛�
- closeOpenPage(obj: RouteLocationRaw): void {
- useTagsViewStore().delView(router.currentRoute.value);
+ closeOpenPage(obj: TagView): void {
+ useTagsViewStore().delView(router.currentRoute.value as any);
if (obj !== undefined) {
router.push(obj);
}
@@ -33,10 +41,10 @@
async closePage(obj?: TagView): Promise<{ visitedViews: TagView[]; cachedViews: string[] } | any> {
if (obj === undefined) {
// prettier-ignore
- const { visitedViews } = await useTagsViewStore().delView(router.currentRoute.value) as any
+ const { visitedViews } = await useTagsViewStore().delView(router.currentRoute.value as any)
const latestView = visitedViews.slice(-1)[0];
if (latestView) {
- return router.push(latestView.fullPath);
+ return router.push(latestView.fullPath as any);
}
return router.push('/');
}
@@ -47,16 +55,16 @@
return useTagsViewStore().delAllViews();
},
// 鍏抽棴宸︿晶tab椤电
- closeLeftPage(obj: TagView) {
- return useTagsViewStore().delLeftTags(obj || router.currentRoute.value);
+ closeLeftPage(obj?: TagView) {
+ return useTagsViewStore().delLeftTags(obj || (router.currentRoute.value as any));
},
// 鍏抽棴鍙充晶tab椤电
- closeRightPage(obj: TagView) {
- return useTagsViewStore().delRightTags(obj || router.currentRoute.value);
+ closeRightPage(obj?: TagView) {
+ return useTagsViewStore().delRightTags(obj || (router.currentRoute.value as any));
},
// 鍏抽棴鍏朵粬tab椤电
- closeOtherPage(obj: TagView) {
- return useTagsViewStore().delOthersViews(obj || router.currentRoute.value);
+ closeOtherPage(obj?: TagView) {
+ return useTagsViewStore().delOthersViews(obj || (router.currentRoute.value as any));
},
/**
* 鎵撳紑tab椤电
@@ -68,7 +76,10 @@
const obj = { path: url, query: { ...query, title } };
return router.push(obj);
},
- // 淇敼tab椤电
+ /**
+ * 淇敼tab椤电
+ * @param obj 鏍囩瀵硅薄
+ */
updatePage(obj: TagView) {
return useTagsViewStore().updateVisitedView(obj);
}
--
Gitblit v1.9.3