fix: narrow plugin tab cleanup matching

Author: wangle201210

apps/lina-vben/apps/web-antd/src/plugins/tabbar-cleanup.test.ts

@@ -13,13 +13,17 @@ vi.mock('./page-registry', () => ({
       pluginId: 'media',
       routePath: 'media',
     },
+    {
+      pluginId: 'media-library',
+      routePath: 'media-library',
+    },
   ],
 }));
 
 function tab(
   path: string,
   title: string,
-  meta: Partial<TabDefinition['meta']> = {},
+  meta: Record<string, unknown> = {},
 ) {
   const routeMeta = {
     ...meta,
@@ -46,6 +50,7 @@ describe('plugin tabbar cleanup', () => {
       tab('/dashboard/analytics', 'Analytics', { affixTab: true }),
       tab('/system/plugin', 'Plugin Management'),
       tab('/media', 'Media'),
+      tab('/media-library', 'Media Library'),
       tab('/watermark-service', 'Watermark', {
         authority: ['watermark-service:page'],
       }),
@@ -56,6 +61,7 @@ describe('plugin tabbar cleanup', () => {
     expect(tabbarStore.getTabs.map((item) => item.path)).toEqual([
       '/dashboard/analytics',
       '/system/plugin',
+      '/media-library',
       '/watermark-service',
     ]);
   });
@@ -77,4 +83,20 @@ describe('plugin tabbar cleanup', () => {
       '/system/plugin',
     ]);
   });
+
+  it('closes plugin tabs by string authority metadata', async () => {
+    const tabbarStore = useTabbarStore();
+    tabbarStore.tabs = [
+      tab('/system/plugin', 'Plugin Management'),
+      tab('/dynamic-media', 'Dynamic Media', {
+        authority: 'media:page',
+      }),
+    ];
+
+    await closePluginTabs('media');
+
+    expect(tabbarStore.getTabs.map((item) => item.path)).toEqual([
+      '/system/plugin',
+    ]);
+  });
 });

apps/lina-vben/apps/web-antd/src/plugins/tabbar-cleanup.ts

@@ -8,7 +8,8 @@ function normalizePath(value: unknown) {
   if (typeof value !== 'string') {
     return '';
   }
-  return value.trim().replace(/^\//, '');
+  const normalized = value.trim().replaceAll('\\', '/').split(/[?#]/u)[0] ?? '';
+  return normalized.replace(/^\/+/, '').replace(/\/+$/u, '');
 }
 
 function extractAssetPluginId(value: unknown) {
@@ -20,10 +21,13 @@ function extractAssetPluginId(value: unknown) {
 
 function authorityMatchesPlugin(tab: TabDefinition, pluginId: string) {
   const authority = tab.meta?.authority;
-  if (!Array.isArray(authority)) {
-    return false;
-  }
-  return authority.some(
+  const authorityItems =
+    typeof authority === 'string'
+      ? [authority]
+      : Array.isArray(authority)
+        ? authority
+        : [];
+  return authorityItems.some(
     (item) =>
       typeof item === 'string' &&
       (item === pluginId || item.startsWith(`${pluginId}:`)),
@@ -38,19 +42,22 @@ function pathMatchesPluginRoute(path: string, pluginId: string) {
   );
 }
 
-function pluginRoutePaths(pluginId: string) {
-  return new Set(
-    getPluginPages()
-      .filter((page) => page.pluginId === pluginId)
-      .map((page) => normalizePath(page.routePath))
-      .filter(Boolean),
-  );
+function pluginRoutePathOwners() {
+  const routePathOwners = new Map<string, string>();
+  for (const page of getPluginPages()) {
+    const routePath = normalizePath(page.routePath);
+    if (routePath) {
+      routePathOwners.set(routePath, page.pluginId);
+    }
+  }
+  return routePathOwners;
 }
 
 function tabMatchesPlugin(
   tab: TabDefinition,
   pluginId: string,
   registeredRoutePaths: Set<string>,
+  routePathOwners: Map<string, string>,
 ) {
   const tabPaths = [
     tab.path,
@@ -60,16 +67,6 @@ function tabMatchesPlugin(
     ...(tab.matched?.map((item) => item.path) ?? []),
   ].map((item) => normalizePath(item));
 
-  if (
-    tabPaths.some(
-      (path) =>
-        path &&
-        (registeredRoutePaths.has(path) || pathMatchesPluginRoute(path, pluginId)),
-    )
-  ) {
-    return true;
-  }
-
   if (
     [
       tab.fullPath,
@@ -81,6 +78,23 @@ function tabMatchesPlugin(
     return true;
   }
 
+  const registeredOwners = tabPaths
+    .map((path) => routePathOwners.get(path))
+    .filter((owner): owner is string => typeof owner === 'string' && !!owner);
+  if (registeredOwners.length > 0) {
+    return registeredOwners.includes(pluginId);
+  }
+
+  if (
+    tabPaths.some(
+      (path) =>
+        path &&
+        (registeredRoutePaths.has(path) || pathMatchesPluginRoute(path, pluginId)),
+    )
+  ) {
+    return true;
+  }
+
   return authorityMatchesPlugin(tab, pluginId);
 }
 
@@ -91,11 +105,21 @@ export async function closePluginTabs(pluginId: string) {
   }
 
   const tabbarStore = useTabbarStore();
-  const registeredRoutePaths = pluginRoutePaths(normalizedPluginId);
+  const routePathOwners = pluginRoutePathOwners();
+  const registeredRoutePaths = new Set(
+    [...routePathOwners.entries()]
+      .filter(([, pluginId]) => pluginId === normalizedPluginId)
+      .map(([routePath]) => routePath),
+  );
   const staleKeys = tabbarStore.getTabs
     .filter((tab) => !tab.meta?.affixTab)
     .filter((tab) =>
-      tabMatchesPlugin(tab, normalizedPluginId, registeredRoutePaths),
+      tabMatchesPlugin(
+        tab,
+        normalizedPluginId,
+        registeredRoutePaths,
+        routePathOwners,
+      ),
     )
     .map((tab) => tab.key)
     .filter((key): key is string => typeof key === 'string' && key !== '');