ohos-router 1.2.4 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohos-router",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "鸿蒙路由管理插件",
   "main": "main.js",
   "scripts": {

package/router.ts

@@ -19,13 +19,14 @@ export function pluginStart(node: HvigorNode, isExecute: boolean, filterModule:
             let nodeName = childNode.getNodeName()
             let upperCaseName = nodeName.substring(0, 1).toUpperCase() + nodeName.substring(1, nodeName.length)
             //默认Entry不追加
-            if ("Entry" != upperCaseName) {
+            let isFilter = filterModule.includes(nodeName)//是否包含
+
+            if ("Entry" != upperCaseName && !isFilter) {
                 entryUpperCaseNameArray.push(upperCaseName)
                 entryIsHsp.push(isHsp)
             }
-            let configPath = FileUtil.pathResolve(childNode.getNodePath(), upperCaseName + "RouterConfig.ets")
 
-            let isFilter = filterModule.includes(nodeName)//是否包含
+            let configPath = FileUtil.pathResolve(childNode.getNodePath(), upperCaseName + "RouterConfig.ets")
 
             if (!FileUtil.exist(configPath) && !isFilter) {
                 FileUtil.ensureFileSync(configPath)
@@ -167,6 +168,10 @@ export function pluginStart(node: HvigorNode, isExecute: boolean, filterModule:
 
                     //这个必须要带
                     let exportClassIndex = appFileDataString.indexOf("export class");
+
+                    if(exportClassIndex == -1){
+                      exportClassIndex = appFileDataString.indexOf("export default");
+                    }
                     let exportContent = appFileDataString.substring(0, exportClassIndex);
 
                     if (exportContent.indexOf(name + "RouterConfig") == -1) {
@@ -195,7 +200,8 @@ export function pluginStart(node: HvigorNode, isExecute: boolean, filterModule:
                     initNewConfig = initNewConfig + ("      new " + name + "RouterConfig(" + endHsp + "),\n")
                     importNewConfig = importNewConfig + "\nimport { " + name + "RouterConfig } from '" + name.toLowerCase() + "';\n"
                 })
-
+                const moduleSrcEntryCount = moduleSrcEntry.split("/").length;
+                const endSrcEntryString = "../".repeat(moduleSrcEntryCount);
                 let routerInitTag = "onCreate(): void {"
                 let routerInitPosition = appFileDataString.indexOf(routerInitTag) + routerInitTag.length
                 let routerJson = "\n    routerInitConfig([\n" +
@@ -204,7 +210,7 @@ export function pluginStart(node: HvigorNode, isExecute: boolean, filterModule:
                     "    ])\n"
                 let routerInitContent = insertString(appFileDataString, routerInitPosition, routerJson)
                 routerInitContent = "import { getARouter,routerInitConfig } from '@abner/router';\n" +
-                    "import { EntryRouterConfig } from '../../../EntryRouterConfig';\n"
+                    "import { EntryRouterConfig } from '"+endSrcEntryString+"EntryRouterConfig';\n"
                     + importNewConfig
                     + routerInitContent
                 FileUtil.writeFileSync(endAppPath, routerInitContent);