ohos-router 1.2.2 → 1.2.4

package/package.json

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

package/router-plugin.ts

@@ -5,7 +5,19 @@ export function abnerRouter(isExecute: boolean = true): HvigorPlugin {
     return {
         pluginId: 'abnerRouter',
         apply(node: HvigorNode) {
-            pluginStart(node, isExecute)
+            pluginStart(node, isExecute, [])
         }
     }
 }
+
+//路由过滤
+export function abnerRouterFilter(isExecute: boolean = true, filterModule: string[] = []): HvigorPlugin {
+    return {
+        pluginId: 'abnerRouter',
+        apply(node: HvigorNode) {
+            pluginStart(node, isExecute, filterModule)
+        }
+    }
+}
+
+

package/router.ts

@@ -4,7 +4,7 @@ let entryModulePath = ""
 let entryUpperCaseNameArray: string[] = []
 let entryIsHsp: boolean[] = []
 
-export function pluginStart(node: HvigorNode, isExecute: boolean) {
+export function pluginStart(node: HvigorNode, isExecute: boolean, filterModule: string[]) {
     if (!isExecute) {
         return
     }
@@ -25,7 +25,9 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
             }
             let configPath = FileUtil.pathResolve(childNode.getNodePath(), upperCaseName + "RouterConfig.ets")
 
-            if (!FileUtil.exist(configPath)) {
+            let isFilter = filterModule.includes(nodeName)//是否包含
+
+            if (!FileUtil.exist(configPath) && !isFilter) {
                 FileUtil.ensureFileSync(configPath)
                 FileUtil.writeFileSync(configPath, getRouterConfig(upperCaseName, nodeName, isHsp))
                 if (!isHap) {
@@ -41,7 +43,7 @@ export function pluginStart(node: HvigorNode, isExecute: boolean) {
                 }
             }
 
-            if (isHap) {
+            if (isHap && !isFilter) {
                 entryModulePath = childNode.getNodePath()
                 writeBuildProfile(childNode)
             }
@@ -158,12 +160,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 +226,7 @@ function moduleJson5JSONParse(json: string) {
         let module = moduleJsonBean.module
         moduleSrcEntry = module.srcEntry
     } catch (error) {
-        console.log("moduleJson5JSONParse:"+error)
+        console.log("moduleJson5JSONParse:" + error)
     }
 }
 
@@ -333,7 +340,7 @@ function dependenciesJSONParse(json: string) {
             }
         }
     } catch (error) {
-        console.log("dependenciesJSONParse:"+error)
+        console.log("dependenciesJSONParse:" + error)
     }
 }
 
@@ -361,7 +368,7 @@ function buildProfileJSONParse(json: string) {
             }
         }
     } catch (error) {
-        console.log("buildProfileJSONParse:"+error)
+        console.log("buildProfileJSONParse:" + error)
     }
 }
 
@@ -412,7 +419,7 @@ function printBuildProFile(buildProfileData: string, type: number) {
             endArray +
             "        ]\n" +
             "      }\n" +
-            "    }"
+            "    }\n,"
 
         buildProfileContent = insertString(buildProfileData, buildProfilePosition, buildProfileBuilder)
     } else if (type == 1) {