bmp-layout 0.0.25-beta.5 → 0.0.25-beta.7

package/bmp-layout.es.js

@@ -1214,7 +1214,31 @@ function buildChildPaths(router) {
   const parentPath = router.path ? router.path.startsWith("/") ? router.path : `/${router.path}` : "";
   return (router.children || []).map((child) => {
     const childPath = child.path ? parentPath.endsWith("/") ? child.path.startsWith("/") ? child.path.substring(1) : child.path : child.path.startsWith("/") ? child.path : `/${child.path}` : "";
-    return { ...child, path: `${parentPath}${childPath}` };
+    let fullPath = `${parentPath}${childPath}`;
+    if (fullPath.length > 1 && fullPath.endsWith("/")) {
+      fullPath = fullPath.slice(0, -1);
+    }
+    return { ...child, path: fullPath };
+  });
+}
+function prependPathToRoutes(routes, parentPath) {
+  if (!parentPath || !routes)
+    return routes;
+  return routes.map((route) => {
+    let newPath;
+    if (!route.path) {
+      newPath = parentPath;
+    } else {
+      newPath = parentPath + (route.path.startsWith("/") ? route.path : `/${route.path}`);
+    }
+    if (newPath.length > 1 && newPath.endsWith("/")) {
+      newPath = newPath.slice(0, -1);
+    }
+    return {
+      ...route,
+      path: newPath,
+      children: route.children ? prependPathToRoutes(route.children, newPath) : route.children
+    };
   });
 }
 function mergeExampleRoutes(targetModule, exampleRoutes, position = "start") {
@@ -1303,14 +1327,19 @@ const usePermissionStore = defineStore("layout-permission", {
       this.leftMenuRouters = routers;
     },
     // 处理模块对应菜单
+    // 返回修改后的 exampleRoutes（已拼接模块路径前缀），供路由注册使用
     setModuleRouters(menuId, exampleRoutes = [], examplePosition = "start") {
       const findRouter = findRouterBy(this.getRoleRouters, "id", menuId);
       if (findRouter) {
         this.moduleId = findRouter.id;
         this.moduleName = findRouter.name;
         this.moduleRouters = buildChildPaths(findRouter);
-        mergeExampleRoutes(findRouter, exampleRoutes, examplePosition);
+        const parentPath = findRouter.path || "";
+        const prefixedExampleRoutes = prependPathToRoutes(exampleRoutes, parentPath);
+        mergeExampleRoutes(findRouter, prefixedExampleRoutes, examplePosition);
+        return prefixedExampleRoutes;
       }
+      return exampleRoutes;
     },
     resetState() {
       this.routers = [];
@@ -1323,14 +1352,19 @@ const usePermissionStore = defineStore("layout-permission", {
       this.roleRouters = [];
     },
     // 处理模块对应菜单（通过模块code）
+    // 返回修改后的 exampleRoutes（已拼接模块路径前缀），供路由注册使用
     setModuleRoutersByCode(moduleCode, exampleRoutes = [], examplePosition = "start") {
       const findRouter = findRouterBy(this.getRoleRouters, "moduleCode", moduleCode);
       if (findRouter) {
         this.moduleId = findRouter.id;
         this.moduleName = findRouter.name;
         this.moduleRouters = buildChildPaths(findRouter);
-        mergeExampleRoutes(findRouter, exampleRoutes, examplePosition);
+        const parentPath = findRouter.path || "";
+        const prefixedExampleRoutes = prependPathToRoutes(exampleRoutes, parentPath);
+        mergeExampleRoutes(findRouter, prefixedExampleRoutes, examplePosition);
+        return prefixedExampleRoutes;
       }
+      return exampleRoutes;
     }
   },
   persist: false
@@ -8711,7 +8745,8 @@ const _sfc_main$r = /* @__PURE__ */ Object.assign({ name: "ProductServicePanel"
         } else {
           const currentOrigin = window.location.origin;
           const modulePath = ((_d = (_c = productList.value[activeProductIndex.value]) == null ? void 0 : _c.children[activeModuleIndex.value]) == null ? void 0 : _d.modulePath) || "";
-          const finalPath = modulePath && !fullPath.startsWith(modulePath) ? `${modulePath}${fullPath.startsWith("/") ? fullPath : `/${fullPath}`}` : normalizedPath;
+          const hasModulePrefix = modulePath && (fullPath === modulePath || fullPath.startsWith(modulePath + "/"));
+          const finalPath = hasModulePrefix ? normalizedPath : `${modulePath}${normalizedPath}`;
           const targetUrl = `${currentOrigin}${finalPath.startsWith("/") ? finalPath : `/${finalPath}`}`;
           window.location.href = targetUrl;
         }
@@ -8968,7 +9003,7 @@ const _sfc_main$r = /* @__PURE__ */ Object.assign({ name: "ProductServicePanel"
     };
   }
 });
-const ProductServicePanel = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__scopeId", "data-v-47667fb6"]]);
+const ProductServicePanel = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__scopeId", "data-v-808cd98e"]]);
 const _sfc_main$q = /* @__PURE__ */ Object.assign({ name: "Logo" }, {
   __name: "Logo",
   emits: ["logo-click"],