@lcap/nasl-unified-frontend-generator 3.13.2-beta.13 → 3.13.2-beta.14

package/dist/index.d.mts

@@ -1139,7 +1139,7 @@ declare class ReactCodegenPlugin implements JavaScriptDomain.FrontendApplication
      * @returns 生成的React文件描述列表
      */
     recursivelyGenReactComponent(c: GeneralComponentIR, dict: ComponentIRToPathDict, folder?: FolderPath, irConfig?: NASLAppIR['configs']): ReactFileDescription[];
-    buildRoutes(views: ViewComponentIR[], componentIRToPathDict: ComponentIRToPathDict): ReactFileDescription;
+    buildRoutes(views: ViewComponentIR[], componentIRToPathDict: ComponentIRToPathDict, basePath: string): ReactFileDescription;
     /**
      * 构建平台配置文件
      * @param ir - NASL应用中间表示
@@ -1197,7 +1197,7 @@ declare class NameMangler {
 declare const reactRouterPlugin: {
     name: string;
     functions: {
-        routeToCode(routes: RouteIR[], componentIRToPathDict: ComponentIRToPathDict): {
+        routeToCode(routes: RouteIR[], componentIRToPathDict: ComponentIRToPathDict, basePath: string): {
             code: string;
             imports: ImportIR[];
         };
@@ -1578,7 +1578,7 @@ declare namespace JavaScriptDomain {
                  * @param componentIRToPathDict - 组件
                  * @returns 路由文件
                  */
-                buildRoutes(views: GeneralComponentIR[], componentIRToPathDict: ComponentIRToPathDict): ReactFileDescription;
+                buildRoutes(views: GeneralComponentIR[], componentIRToPathDict: ComponentIRToPathDict, basePath: string): ReactFileDescription;
                 /**
                  * 构建主CSS入口文件
                  * @param packages - 包信息

package/dist/index.d.ts

@@ -1139,7 +1139,7 @@ declare class ReactCodegenPlugin implements JavaScriptDomain.FrontendApplication
      * @returns 生成的React文件描述列表
      */
     recursivelyGenReactComponent(c: GeneralComponentIR, dict: ComponentIRToPathDict, folder?: FolderPath, irConfig?: NASLAppIR['configs']): ReactFileDescription[];
-    buildRoutes(views: ViewComponentIR[], componentIRToPathDict: ComponentIRToPathDict): ReactFileDescription;
+    buildRoutes(views: ViewComponentIR[], componentIRToPathDict: ComponentIRToPathDict, basePath: string): ReactFileDescription;
     /**
      * 构建平台配置文件
      * @param ir - NASL应用中间表示
@@ -1197,7 +1197,7 @@ declare class NameMangler {
 declare const reactRouterPlugin: {
     name: string;
     functions: {
-        routeToCode(routes: RouteIR[], componentIRToPathDict: ComponentIRToPathDict): {
+        routeToCode(routes: RouteIR[], componentIRToPathDict: ComponentIRToPathDict, basePath: string): {
             code: string;
             imports: ImportIR[];
         };
@@ -1578,7 +1578,7 @@ declare namespace JavaScriptDomain {
                  * @param componentIRToPathDict - 组件
                  * @returns 路由文件
                  */
-                buildRoutes(views: GeneralComponentIR[], componentIRToPathDict: ComponentIRToPathDict): ReactFileDescription;
+                buildRoutes(views: GeneralComponentIR[], componentIRToPathDict: ComponentIRToPathDict, basePath: string): ReactFileDescription;
                 /**
                  * 构建主CSS入口文件
                  * @param packages - 包信息

package/dist/index.js

@@ -967,7 +967,7 @@ var routesExtractionPlugin = makePlugin({
                 return {
                   accumulativePath: `${path}/`,
                   thisLevelPath: ``,
-                  redirect: `${path}/${child.elementTemplate.identifier}`,
+                  redirect: `${child.elementTemplate.identifier}`,
                   kind: "redirect"
                 };
               }
@@ -985,8 +985,8 @@ var routesExtractionPlugin = makePlugin({
       if (possibleIndexComponent) {
         routes.push({
           accumulativePath: "/",
-          thisLevelPath: `/`,
-          redirect: `${routePrefix}${possibleIndexComponent.identifier}`,
+          thisLevelPath: ``,
+          redirect: `${possibleIndexComponent.identifier}`,
           kind: "redirect"
         });
       }
@@ -995,7 +995,7 @@ var routesExtractionPlugin = makePlugin({
         routes.push({
           accumulativePath: "*",
           thisLevelPath: "*",
-          redirect: `${routePrefix}${fallbackComponent.identifier}`,
+          redirect: `${fallbackComponent.identifier}`,
           kind: "redirect"
         });
       }
@@ -2146,7 +2146,8 @@ query: {`;
         let url2 = "`";
         const viewArr = s3.genViewArr();
         if (Array.isArray(viewArr) && viewArr.length) {
-          url2 += `/${viewArr.join("/")}`;
+          const prefixPath = s3.frontend?.prefixPath;
+          url2 += `${prefixPath}/${viewArr.join("/")}`;
           const { completeArguments } = s3;
           if (completeArguments.length) {
             const node = s3.viewNode;
@@ -2690,7 +2691,7 @@ var NameMangler = class {
 var reactRouterPlugin = makePlugin({
   name: "ReactRouter",
   functions: {
-    routeToCode(routes, componentIRToPathDict) {
+    routeToCode(routes, componentIRToPathDict, basePath) {
       const self = { ...jsxCodeGenPlugin.functions, ...javaScriptCodeGenPlugin.functions };
       const nameMangler = new NameMangler();
       const importConfigMap = /* @__PURE__ */ new WeakMap();
@@ -2759,7 +2760,7 @@ var reactRouterPlugin = makePlugin({
       ];
       const routesConfig = routes.map(serializeReactRoute).filter(isNotNil).join(",\n");
       const routerConfigStr = `const defaultRoutes = [{
-        path: '/',
+        path: '${basePath || "/"}',
         children: [
           ${routesConfig}
         ],
@@ -2793,7 +2794,7 @@ var reactRouterPlugin = makePlugin({
           const basename =
             window.LcapMicro?.routePrefix
             ? ensureStartsWithSlash(window.LcapMicro?.routePrefix)
-            : platformConfig.appConfig.basePath;
+            : undefined;
 
           const router = createRouter(routes, { resources, userInfo, basename, beforeEach: ({meta})=>{
             window?.beforeRouter?.({meta});
@@ -3651,16 +3652,16 @@ var ReactCodegenPlugin = class {
       }) : []
     ]);
   }
-  buildRoutes(views, componentIRToPathDict) {
+  buildRoutes(views, componentIRToPathDict, basePath) {
     const self = {
       ...routesExtractionPlugin.functions,
       ...reactRouterPlugin.functions
     };
-    const { routes: routeIRs } = self.extractRoute(views, "/", {
+    const { routes: routeIRs } = self.extractRoute(views, basePath, {
       lazy: this.frontendPerformance?.performanceOptions?.lazy ?? true,
       frameworkKind: "react"
     });
-    const { code, imports } = self.routeToCode(routeIRs, componentIRToPathDict);
+    const { code, imports } = self.routeToCode(routeIRs, componentIRToPathDict, basePath);
     return new ReactFileDescription("Router", [...imports], [], [code]);
   }
   /**
@@ -3672,7 +3673,8 @@ var ReactCodegenPlugin = class {
     const self = {
       ...routesExtractionPlugin.functions
     };
-    const { authResourcePaths, baseResourcePaths } = self.extractRoute(ir.views, "/", {
+    const basePath = ir.configs.basePlatformConfig.basePath + "/";
+    const { authResourcePaths, baseResourcePaths } = self.extractRoute(ir.views, basePath, {
       lazy: false,
       frameworkKind: "react"
     });
@@ -3928,7 +3930,8 @@ var ReactCodegenPlugin = class {
     const bizComponents = ir.bizComponents.flatMap(
       (x) => this.recursivelyGenReactComponent(x, componentIRToPathDict, void 0, ir.configs)
     );
-    const routes = this.buildRoutes(ir.views, componentIRToPathDict);
+    const basePath = ir.configs.basePlatformConfig.basePath + "/";
+    const routes = this.buildRoutes(ir.views, componentIRToPathDict, basePath);
     const masterCss = await this.buildMasterCss(ir.configs.themeCSS, ir.packages);
     const globalVariables = await this.buildGlobalFrontendVariableFile(
       ir.configs.globalVariables,
@@ -4159,7 +4162,7 @@ var materials = {
         frameworkVersion: "vue@3.5.13",
         libName: "ElementPlus",
         name: "@lcap/element-plus",
-        version: "1.0.0-beta.1"
+        version: "1.0.0"
       }
     ],
     h5: [
@@ -7114,23 +7117,28 @@ var VueRouterPlugin = class {
   }
   routeToCode(routes, componentPathManager, config) {
     function serializeVueRoute(r, isRoot = false) {
-      const path = r.thisLevelPath ?? "/";
+      const { accumulativePath, thisLevelPath } = r;
+      const path = isRoot ? accumulativePath : thisLevelPath ?? "/";
+      const basePath = config.basePath;
       if (r.kind === "normal") {
         const children = r.children?.map((i) => serializeVueRoute(i)).filter(isNotNil) ?? [];
         const childrenStr = children.join(",\n");
         const componentCode = `component: ${r.elementMangledName ?? r.elementTemplate.identifier}`;
-        return `{path: "${isRoot ? r.accumulativePath : path}", meta: ${JSON.stringify(
+        return `{path: "${path}", meta: ${JSON.stringify(
           r.meta
         )}, children: [${childrenStr}], ${componentCode} }`;
       } else if (r.kind === "redirect") {
-        const replaceWildCardForVue3 = (frameworkKind, path2) => {
-          if (frameworkKind === "vue3" && path2 === "*") {
-            return "/:pathMatch(.*)*";
+        if (["vue3"].includes(config.frameworkKind) && path === "*") {
+          return `{ path: "/:pathMatch(.*)*", redirect: ${JSON.stringify(basePath + r.redirect)} }`;
+        }
+        if (["vue3"].includes(config.frameworkKind) && path === "/") {
+          let result = `{ path: "/", redirect: ${JSON.stringify(basePath + r.redirect)} }`;
+          if (basePath !== "/") {
+            result += `, { path: "${basePath}", redirect: ${JSON.stringify(basePath + r.redirect)} }`;
           }
-          return path2;
-        };
-        const processedPath = replaceWildCardForVue3(config.frameworkKind, path);
-        return `{path: "${processedPath}", redirect: ${JSON.stringify(r.redirect)}}`;
+          return result;
+        }
+        return `{ path: "${path}", redirect: to => to.path.replace(/\\/$/, '') + '/' + ${JSON.stringify(r.redirect)} }`;
       }
       notImplemented(r);
     }
@@ -7531,15 +7539,16 @@ var Vue3ApplicationAssemblerPlugin = class {
     const bizComponents = ir.bizComponents.flatMap((x) => {
       return this.vue3CodegenPlugin.genFiles(x, manager);
     });
-    let routePrefix = ir.configs.frontendDesc.path;
-    if (!/\/$/.test(routePrefix)) {
-      routePrefix += "/";
+    let basePath = ir.configs.basePlatformConfig.basePath;
+    if (!/\/$/.test(basePath)) {
+      basePath += "/";
     }
-    const routesObjects = this.routesExtactor.extractRoute(ir.views, routePrefix, {
+    const routesObjects = this.routesExtactor.extractRoute(ir.views, basePath, {
       lazy: true
     });
     const router = this.routerBuilder.routeToCode(routesObjects.routes, manager, {
-      frameworkKind: "vue3"
+      frameworkKind: "vue3",
+      basePath
     });
     const routerFile = new ReactFileDescription("router.ts", router.imports, [], [router.code]);
     const libraries = await this.librariesBuilder.buildLibrariesImport(ir, config);