native jump relative path is available

SilurianYang · SilurianYang · commit f3865a6831bf · 2020-12-21T20:45:38.000+08:00
diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts
@@ -425,3 +425,24 @@ export function assertParentChild(
     }
     return false
 }
+
+export function resolveAbsolutePath(
+    path:string,
+    router:Router
+):string|never {
+    const reg = /^\/?([^\?]+)(\?.+)?/;
+    if (!reg.test(path)) {
+        throw new Error(`${path} 路径错误，请提供完整的路径(10001)。`);
+    }
+    const paramsArray = path.match(reg);
+    if (paramsArray == null) {
+        throw new Error(`${path} 路径错误，请提供完整的路径(10002)。`);
+    }
+    const relative = paramsArray[1].replace(/\//g, `\\/`).replace(/\.\./g, `[^\\/]+`);
+    const relativeReg = new RegExp(`^\\/${relative}$`);
+    const route = router.options.routes.filter(it => relativeReg.test(it.path));
+    if (route.length !== 1) {
+        throw new Error(`${path} 路径错误，尝试转成绝对路径失败，请手动转成绝对路径(10003)。`);
+    }
+    return route[0].path + paramsArray[2];
+}
diff --git a/src/public/rewrite.ts b/src/public/rewrite.ts
@@ -14,7 +14,8 @@ import {
     routesForMapRoute,
     getRoutePath,
     getDataType,
-    notDeepClearNull
+    notDeepClearNull,
+    resolveAbsolutePath
 } from '../helpers/utils'
 
 import {
@@ -98,11 +99,9 @@ function callRouterMethod(
         const routerMethodName = rewriteMethodToggle[(funName as reNavMethodRule)]
         let path = (option as uniNavApiRule).url;
         if (!path.startsWith('/')) {
-            warn(
-                `uni-app 原生方法被重写时，只能使用绝对路径进行跳转。${JSON.stringify(option)}`,
-                router,
-                true
-            );
+            const absolutePath = resolveAbsolutePath(path, router);
+            path = absolutePath;
+            (option as uniNavApiRule).url = absolutePath;
         }
         if (funName === 'switchTab') {
             const route = routesForMapRoute(router, path, ['pathMap', 'finallyPathList'])
