@lcap/nasl 4.4.0-beta.1 → 4.4.0-beta.3

package/out/generator/genBundleFiles.d.ts

@@ -9,10 +9,10 @@ export interface Route {
     component?: RawOptions;
     children?: Array<Route>;
     redirect?: string;
-    lazyPath?: string;
     meta?: {
         [key: string]: any;
     };
+    fullPath?: string;
 }
 export declare function stringifyMetaData(obj: any): string;
 export declare function genBundleFiles(app: App, frontend: Frontend, config: Config): Promise<any[]>;
@@ -22,7 +22,7 @@ export declare function getOneFiles(options: {
     frontend: Frontend;
     view: View;
     action: 'current' | 'all';
-    cacheRouters: Route[];
+    cacheRouters: string;
     config: Config;
 }): Promise<any[]>;
 //# sourceMappingURL=genBundleFiles.d.ts.map

package/out/generator/genBundleFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"genBundleFiles.d.ts","sourceRoot":"","sources":["../../src/generator/genBundleFiles.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,GAAG,EAAU,IAAI,EAAE,QAAQ,EAAmG,MAAM,aAAa,CAAC;AAC3J,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAM/B,OAAO,KAAK,EAAE,yBAAyB,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAqBhF,eAAO,IAAI,UAAU,UAAgC,CAAA;AACrD,eAAO,IAAI,mBAAmB,UAAyD,CAAA;AAEvF,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,GAAG,WAanD;AACD,MAAM,WAAW,KAAK;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,QAAQ,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE;QACL,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAA;CACF;AAGD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,UA8BzC;AA+JD,wBAAsB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kBAmhChF;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,kBA2ChG;AA+BD,wBAAsB,WAAW,CAAC,OAAO,EAAE;IACzC,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,EAAE,SAAS,GAAG,KAAK,CAAC;IAC1B,YAAY,EAAE,KAAK,EAAE,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,kBA2IA"}
+{"version":3,"file":"genBundleFiles.d.ts","sourceRoot":"","sources":["../../src/generator/genBundleFiles.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,GAAG,EAAU,IAAI,EAAE,QAAQ,EAAmG,MAAM,aAAa,CAAC;AAC3J,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAM/B,OAAO,KAAK,EAAE,yBAAyB,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAsBhF,eAAO,IAAI,UAAU,UAAgC,CAAA;AACrD,eAAO,IAAI,mBAAmB,UAAyD,CAAA;AAEvF,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,GAAG,WAanD;AACD,MAAM,WAAW,KAAK;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,QAAQ,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE;QACL,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAA;IACD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAGD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,UA8BzC;AAsOD,wBAAsB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kBA2+BhF;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,kBA2ChG;AA+BD,wBAAsB,WAAW,CAAC,OAAO,EAAE;IACzC,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,EAAE,SAAS,GAAG,KAAK,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,kBAwKA"}

package/out/generator/genBundleFiles.js

@@ -43,6 +43,8 @@ const microApp_1 = require("./microApp");
 // @ts-ignore FIXME 类型在构建前找不到的问题
 const nasl_unified_frontend_generator_2 = require("@lcap/nasl-unified-frontend-generator");
 const axios_1 = __importDefault(require("axios"));
+const runtime_1 = require("./templates/runtime");
+const chunk_1 = require("./templates/chunk");
 const officalEntityMap = {
     LCAPUser: ['id', 'createdTime', 'updatedTime', 'userId', 'userName', 'password', 'phone', 'email', 'displayName', 'status', 'source'],
     LCAPLogicViewMapping: ['id', 'logicIdentifier', 'resourceName', 'resourceType', 'group', 'changeTime'],
@@ -140,8 +142,8 @@ function genComponentCode(component) {
   })()`;
 }
 // 生成导入组件代码
-function genImportComponetCode(componentPath) {
-    return `() => importComponent('${componentPath}')`;
+function genImportComponetCode(chunkId) {
+    return `() => __webpack_require__.e("${chunkId}").then(__webpack_require__.bind(__webpack_require__, "./${chunkId}.js"))`;
 }
 // 生成导出组件代码
 function genExportComponetCode(component) {
@@ -149,12 +151,13 @@ function genExportComponetCode(component) {
     const optionCode = renderCode
         ? `render: __render__,\n staticRenderFns: __staticRenderFns__,`
         : `template: \`${component.template.replace(/[`$]/g, (m) => `\\${m}`)}\`,`;
-    return `var componentOptions = ${component.script ? `(function(){\n${component.script.trim().replace(/export default |module\.exports +=/, 'return ')}\n})()` : '{}'};
+    let code = `var componentOptions = ${component.script ? `(function(){\n${component.script.trim().replace(/export default |module\.exports +=/, 'return ')}\n})()` : '{}'};
   ${renderCode}
   Object.assign(componentOptions, {
     ${optionCode}
   });
-  return componentOptions;`;
+  `;
+    return code;
 }
 // 获取文件路径
 // name 或者 文件 至少有一个必填
@@ -167,27 +170,44 @@ const getCompletePath = (name, fileContent, config) => {
         fileName += `${(0, nasl_utils_1.genHash)(fileContent)}.`;
     }
     fileName += `min.js`;
-    // if(config?.isExport && !fileName.includes('bundle')&& !fileName.includes('router')){
-    //   fileName =`${config.sysPrefixPath}/${fileName}`
-    // }
     return fileName;
 };
-function genRouterFileContent(routes, defaultRoute) {
+function genRouterFileContent(routes, defaultRoute, config) {
+    // 单页面发布
+    if (config.isOneFile) {
+        let code = config?.cacheRouters;
+        const changedChunks = config?.asyncChunksMap;
+        let newRoutesCode = 'window.lcap_routes = [\n';
+        routes.forEach((route) => {
+            newRoutesCode += `${routeToString(route)},\n`;
+        });
+        newRoutesCode += '];\n';
+        const [start, end] = ['// lcap_routes start', '// lcap_routes end'];
+        // 将start和end之间的代码替换掉
+        code = code.slice(0, code.indexOf(start) + start.length) + '\n' + newRoutesCode + code.slice(code.indexOf(end));
+        const placeholderIdx = code.indexOf('// lcap_changed_chunks placeholder');
+        // 前面插入代码
+        if (placeholderIdx !== -1) {
+            code = code.slice(0, placeholderIdx) + `Object.assign(lcap_changed_chunks, ${JSON.stringify(changedChunks)});\n` + code.slice(placeholderIdx);
+        }
+        return code;
+    }
     function routeToString(route) {
         let content = `{
         path: '${route.path}',\n`;
-        if (route?.lazyPath) {
-            const routeLazyPath = route.lazyPath;
-            content += `lazyPath: '${routeLazyPath}',\n`;
-            content += `component: ${genImportComponetCode(route.lazyPath)},\n`;
+        if (route?.fullPath) {
+            // 单页面发布时需要
+            content += `fullPath: '${route.fullPath}',\n`;
+            const chunkId = (0, nasl_utils_1.genHash)(route.fullPath);
+            content += `component: ${genImportComponetCode(chunkId)},\n`;
         }
         if (route?.meta) {
             content += `meta: ${stringifyMetaData(route.meta)},`;
         }
-        if (route?.children?.length) {
+        if (route.children?.length) {
             content += `children: [
-            ${route.children.map(routeToString).join(',\n')}
-        ],\n`;
+      ${route.children?.map?.(routeToString)?.join(',\n')}
+      ],\n`;
         }
         if (route?.redirect) {
             content += `redirect: '${route?.redirect}',\n`;
@@ -195,35 +215,64 @@ function genRouterFileContent(routes, defaultRoute) {
         content += '}';
         return content;
     }
+    // 生成异步块映射表
+    const name = config?.app?.name;
+    let code = `window["${name}LcapChunksMap"] = ${JSON5.stringify(config?.asyncChunksMap || {})};\n`;
     // 生成路由配置
-    let routesStr = `const routers = [`;
+    code += `// lcap_routes start
+  window.lcap_routes = [\n`;
     routes.forEach((route) => {
-        routesStr += `${routeToString(route)},\n`;
+        code += `${routeToString(route)},\n`;
     });
     if (defaultRoute) {
-        routesStr += `{
+        code += `{
           path: '*',
           redirect: '${defaultRoute}',
       }\n`;
     }
-    routesStr += `];
-  return routers;`;
-    return routesStr;
+    code += `];
+  // lcap_routes end\n`;
+    // changedChunk
+    code += `var lcap_changed_chunks = {};
+
+// lcap_changed_chunks placeholder
+
+Object.keys(lcap_changed_chunks).forEach(function(chunkId) {
+    window["${name}LcapChunksMap"][chunkId] = lcap_changed_chunks[chunkId];
+});`;
+    return (0, chunk_1.generate)({
+        name: config?.app?.name,
+        chunkId: 'router',
+        moduleId: 'router',
+        content: code,
+        exports: [],
+        exec: false,
+    });
 }
 // 生成路由文件
 function genRouteFiles(routes, defaultRoute, config) {
     // 生成路由文件列表
     const routeFiles = [];
+    const asyncChunksMap = {};
     function routeToFile(route) {
         if (route?.component?.script) {
             const content = genExportComponetCode(route.component);
-            const lazyPath = getCompletePath(null, content, config);
-            route.lazyPath = lazyPath;
-            // let outFilePath =`${config?.sysPrefixPath? config?.sysPrefixPath +'/' :''}${lazyPath}`;
+            const chunkId = (0, nasl_utils_1.genHash)(route.fullPath);
+            const contentHash = (0, nasl_utils_1.genHash)(content);
             routeFiles.push({
-                name: lazyPath,
-                content,
+                name: chunkId + '.' + contentHash + '.js',
+                content: (0, chunk_1.generate)({
+                    name: config?.app?.name,
+                    chunkId,
+                    moduleId: chunkId,
+                    content,
+                    exports: [
+                        ['componentOptions', 'default'],
+                    ],
+                    exec: false,
+                }),
             });
+            asyncChunksMap[chunkId] = contentHash;
         }
         if (route?.children?.length) {
             route.children.map(routeToFile);
@@ -232,13 +281,16 @@ function genRouteFiles(routes, defaultRoute, config) {
     routes.forEach((route) => {
         routeToFile(route);
     });
-    let routerPath = getCompletePath('router', null, config);
     routeFiles.push({
-        name: routerPath,
+        name: getCompletePath('router', null, config),
         isRouterFile: true,
-        content: genRouterFileContent(routes, defaultRoute),
+        content: genRouterFileContent(routes, defaultRoute, Object.assign({}, config, { asyncChunksMap })),
     });
-    return routeFiles;
+    const { publicPath } = config;
+    return routeFiles.map(file => ({
+        ...file,
+        name: publicPath + file.name,
+    }));
 }
 async function genBundleFiles(app, frontend, config) {
     config.sysPrefixPath = app?.sysPrefixPath;
@@ -323,24 +375,8 @@ async function genBundleFiles(app, frontend, config) {
             (0, nasl_log_1.clearLogs)(app);
         }
     }
-    const getBundleFileName = () => {
-        if (config.isPreviewFe && config.previewVersion) {
-            return `mockBundle-${config.previewVersion}`;
-        }
-        else {
-            return 'bundle';
-        }
-    };
-    let baseUrl = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}`;
-    let { basePath } = frontend;
-    // isPreviewFe 资产中心的预览模式，优先级最高
-    if (config.isPreviewFe) {
-        baseUrl = `${config.USER_STATIC_URL}/asset-center/preview/${config.tenant}/${app.id}/${config.env}`;
-    }
-    else if (config.isExport) {
-        baseUrl = '';
-    }
-    let completePath = `${baseUrl}${basePath || ''}/`;
+    // @ts-expect-error
+    const publicPath = (0, nasl_unified_frontend_generator_2.getPublicPath)(app, config, frontend);
     /**
      * vue.config.js page options
      */
@@ -380,11 +416,18 @@ async function genBundleFiles(app, frontend, config) {
                 }
             }
         }
+        let fullPath = `/${viewName}`;
+        let parent = view.parentNode;
+        while (parent?.concept === 'View') {
+            fullPath = `/${parent.name}${fullPath}`;
+            parent = parent.parentNode;
+        }
         const route = {
             path: routePath,
             component: (0, compileComponent_1.compileComponent)(componentMap[view.id]),
             children: [],
             meta: view.getRouteMeta(),
+            fullPath,
         };
         const viewChildren = view.children;
         if (Array.isArray(viewChildren) && viewChildren.length) {
@@ -459,15 +502,7 @@ async function genBundleFiles(app, frontend, config) {
         // authResourcePathMap={}
     }
     const authResourcePaths = Object.keys(authResourcePathMap);
-    const routerFiles = genRouteFiles(routes, defaultRoute, config);
-    routerFiles.forEach(item => {
-        let temp = completePath;
-        // if(completePath=='/'){temp=''}else{temp = `${completePath}/`}
-        if (config?.isExport && config?.sysPrefixPath?.length > 0) {
-            temp = config?.sysPrefixPath + temp;
-        }
-        item.name = temp + item.name;
-    });
+    const routerFiles = genRouteFiles(routes, defaultRoute, Object.assign({}, config, { app, publicPath }));
     let fileI18nInfo = {
         enabled: false,
         locale: 'zh-CN',
@@ -582,8 +617,6 @@ async function genBundleFiles(app, frontend, config) {
     }
     const assetsInfo = app.genAllAssetsInfo(STATIC_URL, frontend.type, frontendType.frameworkKind);
     const customNames = JSON5.stringify(assetsInfo.custom.names);
-    let content1 = `(async function(){
-        `;
     let contentScale = '';
     if (frontend.globalScaleEnabled)
         contentScale = `{
@@ -693,67 +726,6 @@ async function genBundleFiles(app, frontend, config) {
     let contentImport = `
         var platformConfig = ${platformConfig};
         var metaData = ${metaDataStr};
-
-        var getCompletePath = (path) => {
-          return '${config?.isExport ? config.sysPrefixPath : ''}${completePath}' + path;
-        }
-
-        // 低版本
-        function importXMLHttpRequestComponent (scriptUrl) {
-          return new Promise(function(resolve, reject) {
-            var xhr = new XMLHttpRequest();
-            xhr.open('GET', scriptUrl, true);
-            xhr.onreadystatechange = function() {
-              if (xhr.readyState === 4) {
-                if (xhr.status === 200) {
-                  var scriptContent = xhr.responseText;
-                  try {
-                    var func = new Function('importComponent', 'window', scriptContent + '\\n//# sourceURL=' + scriptUrl);
-                    var result = func(window.importComponent, window);
-                    resolve(result);
-                  } catch (error) {
-                    if (typeof window.$appUtils.createErrorLayout === 'function') {
-                      window.$appUtils.createErrorLayout(error);
-                    }
-                    reject(error);
-                  }
-                } else {
-                  reject(new Error('Failed to fetch script'));
-                }
-              }
-            };
-            xhr.send();
-          });
-        };
-        function importFetchComponent(scriptUrl) {
-          return fetch(scriptUrl)
-            .then(function(response) {
-              if (!response.ok) {
-                throw new Error('Network response was not ok');
-              }
-              return response.text();
-            }).then(function(scriptText) {
-              var func = new Function('importComponent', 'window', scriptText + '\\n//# sourceURL=' + scriptUrl);
-              var result = func(window.importComponent, window);
-              return result;
-            })
-            .catch(error => {
-              console.error('Error loading script:', error);
-              if (typeof window.$appUtils.createErrorLayout === 'function') {
-                window.$appUtils.createErrorLayout(error);
-              }
-            });
-        }
-        window.importComponent = (scriptUrl) => {
-          scriptUrl = getCompletePath(scriptUrl);
-          // 浏览器支持fetch，直接使用fetch
-          if (window.fetch) {
-            return importFetchComponent(scriptUrl);
-          }
-          return importXMLHttpRequestComponent(scriptUrl);
-        }
-
-        var routes = await importComponent('${getCompletePath('router', null, config)}?t=' + Date.now());
       `;
     // 按页面维度发布先不考虑鉴权，页面维度新增的页面都算是不鉴权的数组中
     // 只有完全页面维度新增的才会进入到这个数组中
@@ -772,11 +744,11 @@ async function genBundleFiles(app, frontend, config) {
           }
         });
       }
-      iterateRouters(routes);` : '';
+      iterateRouters(window.lcap_routes);` : '';
     let contentCreateLCAPApp = `
     window.createLcapApp = () => {
         ${compRegStr}
-        appVM = window.cloudAdminDesigner.init(platformConfig.appConfig, platformConfig, routes, metaData);
+        var appVM = window.cloudAdminDesigner.init(platformConfig.appConfig, platformConfig, window.lcap_routes, metaData);
         try {
             var push = appVM.$router.history.push;
             appVM.$router.history.push = function (a, b) {
@@ -855,8 +827,6 @@ async function genBundleFiles(app, frontend, config) {
         if(shortcutIconLink) parent.document.head.appendChild(shortcutIconLink);
       }
         ` : '';
-    let content10 = `
-    })();`;
     let contentDevOnly = config.env === 'dev' ? `
             var _div = document.createElement('div');
             _div.classList = "div-load"
@@ -972,10 +942,21 @@ async function genBundleFiles(app, frontend, config) {
     };
     fetchAnnoData();
     ` : '';
-    let content = [content1, contentScale, contentStyleCss, contentDocIcon, contentCustomNames, contentImport,
-        contentLogReportCode, contentRouter, contentCreateLCAPApp, contentPCIframe, content10,
-        contentDevOnly, contentVueDirectives.join(''), contentViewElemAnno].join('');
-    content1 = null;
+    let content = [
+        `__webpack_require__('./router.js');`,
+        contentScale,
+        contentStyleCss,
+        contentDocIcon,
+        contentCustomNames,
+        contentImport,
+        contentLogReportCode,
+        contentRouter,
+        contentCreateLCAPApp,
+        contentPCIframe,
+        contentDevOnly,
+        contentVueDirectives.join(''),
+        contentViewElemAnno
+    ].join('');
     contentScale = null;
     contentStyleCss = null;
     contentDocIcon = null;
@@ -985,19 +966,29 @@ async function genBundleFiles(app, frontend, config) {
     contentRouter = null;
     contentCreateLCAPApp = null;
     contentPCIframe = null;
-    content10 = null;
     contentDevOnly = null;
     contentVueDirectives = null;
     contentViewElemAnno = null;
     const timestamp = Date.now();
     utils.delay(100);
-    let bundleMinPath = completePath + getCompletePath(getBundleFileName(), content, config);
+    content = (0, chunk_1.generate)({
+        name: app.name,
+        chunkId: 'bundle',
+        moduleId: 'bundle',
+        content,
+        exports: [],
+        exec: true,
+    });
+    let clientPath = publicPath + 'client.js';
+    let runtimePath = publicPath + 'runtime.js';
+    let routerPath = publicPath + getCompletePath('router', null, config);
+    let bundleMinPath = publicPath + getCompletePath(getBundleFileName(config), content, config);
     const otherJsList = frontend?.appletsConfig?.enable ? ['//res.wx.qq.com/open/js/jweixin-1.3.2.js'] : [];
     const microAppIntegration = (0, microApp_1.integrateMicroApp)(frontend);
     if (config?.debug) {
         otherJsList.push(`${STATIC_URL}/packages/@lcap/breakpoint-client@1.0.0/dist/index.js?time=${timestamp}`);
     }
-    let jsAssetsList = assetsInfo.basic.js.concat(assetsInfo.custom.js, otherJsList).concat([bundleMinPath]);
+    let jsAssetsList = assetsInfo.basic.js.concat(assetsInfo.custom.js, otherJsList).concat([runtimePath, routerPath, bundleMinPath]);
     let cssAssetsList = assetsInfo.basic.css.concat(assetsInfo.custom.css);
     if (config.isPreviewFe) {
         const changeToRelativePath = (str) => {
@@ -1108,6 +1099,11 @@ async function genBundleFiles(app, frontend, config) {
             refresh: config.refresh,
         }));
     }
+    // encode url
+    if ((0, nasl_unified_frontend_generator_2.isEnabledEncode)()) {
+        jsAssetsList = jsAssetsList.map(nasl_unified_frontend_generator_2.encodeFetchFileURL);
+        cssAssetsList = cssAssetsList.map(nasl_unified_frontend_generator_2.encodeFetchFileURL);
+    }
     const dynamicAssets = optimizeAssetClassification(jsAssetsList);
     // CSS 资源默认最后
     if (cssAssetsList.length > 0) {
@@ -1188,18 +1184,26 @@ async function genBundleFiles(app, frontend, config) {
 `;
     const outputs = [
         {
-            name: bundleMinPath,
-            content,
+            name: clientPath,
+            content: assetsContent,
         },
         {
-            name: basePath ? `${baseUrl}${basePath}/client.js` : `${baseUrl}/client.js`,
-            content: assetsContent,
+            name: runtimePath,
+            content: (0, runtime_1.generate)({
+                name: app.name,
+                publicPath: JSON.stringify(publicPath),
+            }),
+        },
+        {
+            name: bundleMinPath,
+            content,
         },
         ...routerFiles,
     ];
     assetsContent = null;
     content = null;
     processAssetsInOutputs(outputs, frontend, config);
+    console.info('编译结果', outputs.map((x) => x.name));
     return outputs;
 }
 exports.genBundleFiles = genBundleFiles;
@@ -1332,16 +1336,23 @@ async function getOneFiles(options) {
         if (isRootView) {
             routePath = `${frontend.prefixPath}/${viewName}`;
         }
+        let fullPath = `/${viewName}`;
+        let parent = view.parentNode;
+        while (parent?.concept === 'View') {
+            fullPath = `/${parent.name}${fullPath}`;
+            parent = parent.parentNode;
+        }
         const route = {
             path: routePath,
             component: (0, compileComponent_1.compileComponent)(viewOption),
             children: [],
             meta: view.getRouteMeta(),
+            fullPath,
         };
         return route;
     }
-    let currentView = view;
     let currentRoute = null;
+    let currentView = view;
     while (currentView?.concept === 'View') {
         if (currentRoute) {
             const child = currentRoute;
@@ -1375,6 +1386,7 @@ async function getOneFiles(options) {
             // 如果找到了现有路由，更新 component 和 meta
             existingRoute.component = newRoute.component;
             existingRoute.meta = newRoute.meta;
+            existingRoute.fullPath = newRoute.fullPath;
             // 递归合并子路由
             if (newRoute.children) {
                 existingRoute.children = existingRoute.children || [];
@@ -1391,9 +1403,25 @@ async function getOneFiles(options) {
             routes.unshift(newRoute);
         }
     }
+    let existingRoutes = [];
+    try {
+        // 获取// lcap_routes start 到 // lcap_routes end 之间的代码
+        const [start, end] = ['// lcap_routes start', '// lcap_routes end'];
+        const routesCode = cacheRouters
+            .substring(cacheRouters.indexOf(start) + start.length, cacheRouters.indexOf(end))
+            .replace('window.lcap_routes = ', 'return ');
+        const fn = new Function(`${routesCode}`);
+        existingRoutes = fn();
+    }
+    catch (error) {
+        console.error('路由代码 eval 失败:', error);
+    }
     // Bug-3156542745982976: 原本直接找到顶层直接删除，在新增节点，遗漏处理中间层也有节点的情况，单页发布就直接增量合并，为了性能，暂时不考虑删除节点
-    addOrUpdateRoute(cacheRouters, currentRoute);
-    const routerFiles = genRouteFiles(cacheRouters, null);
+    addOrUpdateRoute(existingRoutes, currentRoute);
+    // @ts-expect-error
+    const publicPath = (0, nasl_unified_frontend_generator_2.getPublicPath)(app, config, frontend);
+    const routerFiles = genRouteFiles(existingRoutes, null, Object.assign({}, config, { app, cacheRouters, isOneFile: true, publicPath }));
+    console.info('编译结果', routerFiles.map((x) => x.name));
     return routerFiles;
 }
 exports.getOneFiles = getOneFiles;
@@ -1487,4 +1515,13 @@ function processAssetsInOutputs(outputs, frontend, config) {
         });
     }
 }
+function getBundleFileName(config) {
+    if (config.isPreviewFe && config.previewVersion) {
+        return `mockBundle-${config.previewVersion}`;
+    }
+    else {
+        return 'bundle';
+    }
+}
+;
 //# sourceMappingURL=genBundleFiles.js.map