ohos-router 1.2.1 → 1.2.3

package/package.json

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

package/router.ts

@@ -158,12 +158,17 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
                         endHsp = "getARouter()"
                     }
 
-                    if(appFileDataString.indexOf("new "+name+"RouterConfig(") == -1){
-                        isHaveConfig=true;
+                    if (appFileDataString.indexOf("new " + name + "RouterConfig(") == -1) {
+                        isHaveConfig = true;
                         initHaveConfig = initHaveConfig + ("      new " + name + "RouterConfig(" + endHsp + "),\n")
                     }
-                    if(appFileDataString.indexOf("import { "+name+"RouterConfig }") == -1){
-                        isHaveConfig=true;
+
+                    //这个必须要带
+                    let exportClassIndex = appFileDataString.indexOf("export class");
+                    let exportContent = appFileDataString.substring(0, exportClassIndex);
+
+                    if (exportContent.indexOf(name + "RouterConfig") == -1) {
+                        isHaveConfig = true;
                         importHaveConfig = importHaveConfig + "\nimport { " + name + "RouterConfig } from '" + name.toLowerCase() + "';\n"
                     }
                 })
@@ -219,7 +224,7 @@ function moduleJson5JSONParse(json: string) {
         let module = moduleJsonBean.module
         moduleSrcEntry = module.srcEntry
     } catch (error) {
-        console.log("moduleJson5JSONParse:"+error)
+        console.log("moduleJson5JSONParse:" + error)
     }
 }
 
@@ -257,7 +262,7 @@ function getRouterConfig(upperCaseName: string, nodeName: string, isHsp: boolean
         " * INTRODUCE:动态配置组件\n" +
         " * */\n" +
         "@Builder\n" +
-        "export function viewBuilder() {\n" +
+        "export function viewBuilder(params?:Object) {\n" +
         "  NavDestinationView() {\n" +
         "\n" +
         "  }\n" +
@@ -333,7 +338,7 @@ function dependenciesJSONParse(json: string) {
             }
         }
     } catch (error) {
-        console.log("dependenciesJSONParse:"+error)
+        console.log("dependenciesJSONParse:" + error)
     }
 }
 
@@ -361,7 +366,7 @@ function buildProfileJSONParse(json: string) {
             }
         }
     } catch (error) {
-        console.log("buildProfileJSONParse:"+error)
+        console.log("buildProfileJSONParse:" + error)
     }
 }