From 61417032b79f99ecb462f7f7f2263c2d98d1b558 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 20 四月 2023 18:45:29 +0800
Subject: [PATCH] fix 修复 代码生成菜单选项回显问题

---
 src/plugins/tab.ts |  122 +++++++++++++++++++++-------------------
 1 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/src/plugins/tab.ts b/src/plugins/tab.ts
index ad6f1c3..a310154 100644
--- a/src/plugins/tab.ts
+++ b/src/plugins/tab.ts
@@ -3,63 +3,67 @@
 import { TagView, RouteLocationRaw } from 'vue-router';
 
 export default {
-	// 鍒锋柊褰撳墠tab椤电
-	async refreshPage(obj: TagView): Promise<void> {
-		const { path, query, matched } = router.currentRoute.value;
-		if (obj === undefined) {
-			matched.forEach((m) => {
-				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 };
-					}
-				}
-			});
-		}
-		// prettier-ignore
-		await useTagsViewStore().delCachedView(obj)
-		router.replace({
-			path: '/redirect' + obj.path,
-			query: obj.query
-		});
-	},
-	// 鍏抽棴褰撳墠tab椤电锛屾墦寮�鏂伴〉绛�
-	closeOpenPage(obj: RouteLocationRaw): void {
-		useTagsViewStore().delView(router.currentRoute.value);
-		if (obj !== undefined) {
-			router.push(obj);
-		}
-	},
-	// 鍏抽棴鎸囧畾tab椤电
-	async closePage(obj?: TagView): Promise<{ visitedViews: TagView[]; cachedViews: string[] } | any> {
-		if (obj === undefined) {
-			// prettier-ignore
-			const { lastPath } = await useTagsViewStore().delView(router.currentRoute.value) as any
-			return router.push(lastPath || '/index');
-		}
-		return useTagsViewStore().delView(obj);
-	},
-	// 鍏抽棴鎵�鏈塼ab椤电
-	closeAllPage() {
-		return useTagsViewStore().delAllViews();
-	},
-	// 鍏抽棴宸︿晶tab椤电
-	closeLeftPage(obj: TagView) {
-		return useTagsViewStore().delLeftTags(obj || router.currentRoute.value);
-	},
-	// 鍏抽棴鍙充晶tab椤电
-	closeRightPage(obj: TagView) {
-		return useTagsViewStore().delRightTags(obj || router.currentRoute.value);
-	},
-	// 鍏抽棴鍏朵粬tab椤电
-	closeOtherPage(obj: TagView) {
-		return useTagsViewStore().delOthersViews(obj || router.currentRoute.value);
-	},
-	// 鎵撳紑tab椤电
-	openPage(url: RouteLocationRaw) {
-		return router.push(url);
-	},
-	// 淇敼tab椤电
-	updatePage(obj: TagView) {
-		return useTagsViewStore().updateVisitedView(obj);
-	}
+  // 鍒锋柊褰撳墠tab椤电
+  async refreshPage(obj: TagView): Promise<void> {
+    const { path, query, matched } = router.currentRoute.value;
+    if (obj === undefined) {
+      matched.forEach((m) => {
+        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 };
+          }
+        }
+      });
+    }
+    // prettier-ignore
+    await useTagsViewStore().delCachedView(obj)
+    router.replace({
+      path: '/redirect' + obj.path,
+      query: obj.query
+    });
+  },
+  // 鍏抽棴褰撳墠tab椤电锛屾墦寮�鏂伴〉绛�
+  closeOpenPage(obj: RouteLocationRaw): void {
+    useTagsViewStore().delView(router.currentRoute.value);
+    if (obj !== undefined) {
+      router.push(obj);
+    }
+  },
+  // 鍏抽棴鎸囧畾tab椤电
+  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 latestView = visitedViews.slice(-1)[0]
+      if (latestView) {
+        return router.push(latestView.fullPath)
+      }
+      return router.push('/');
+    }
+    return useTagsViewStore().delView(obj);
+  },
+  // 鍏抽棴鎵�鏈塼ab椤电
+  closeAllPage() {
+    return useTagsViewStore().delAllViews();
+  },
+  // 鍏抽棴宸︿晶tab椤电
+  closeLeftPage(obj: TagView) {
+    return useTagsViewStore().delLeftTags(obj || router.currentRoute.value);
+  },
+  // 鍏抽棴鍙充晶tab椤电
+  closeRightPage(obj: TagView) {
+    return useTagsViewStore().delRightTags(obj || router.currentRoute.value);
+  },
+  // 鍏抽棴鍏朵粬tab椤电
+  closeOtherPage(obj: TagView) {
+    return useTagsViewStore().delOthersViews(obj || router.currentRoute.value);
+  },
+  // 鎵撳紑tab椤电
+  openPage(url: RouteLocationRaw) {
+    return router.push(url);
+  },
+  // 淇敼tab椤电
+  updatePage(obj: TagView) {
+    return useTagsViewStore().updateVisitedView(obj);
+  }
 };

--
Gitblit v1.9.3