fix4375 解决快应用中路由跳转API不支持相对路径的问题

NervJS · Mar 26, 2020 · de01a70 · de01a70
1 parent 6204995
commit de01a70
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/packages/taro-quickapp/src/api/router/index.js b/packages/taro-quickapp/src/api/router/index.js
@@ -1,5 +1,5 @@
 import router from '@system.router'
-
+import * as path from 'path'
 import appGlobal from '../../global'
 import { addLeadingSlash, getUniqueKey } from '../../util'
 import { cacheDataGet, cacheDataSet } from '../../data-cache'
@@ -47,7 +47,12 @@ function qappNavigate (options = {}, method = 'push') {
     }
     params = getUrlParams(url)
     const markIndex = url.indexOf('?')
-    const parseUrl = addLeadingSlash(url.substr(0, markIndex >= 0 ? markIndex : url.length))
+    const componentPath = appGlobal.componentPath || ''
+    const parseUrl = url.substr(0, markIndex >= 0 ? markIndex : url.length).replace(/^(.\/)/g, '')
+    if (componentPath && /^(..\/)/g.test(parseUrl)) {
+      parseUrl = path.join(componentPath, parseUrl)
+    }
+    parseUrl = addLeadingSlash(parseUrl)
     appGlobal.taroRouterParamsCache = appGlobal.taroRouterParamsCache || {}
     appGlobal.taroRouterParamsCache[parseUrl] = params
 
@@ -65,7 +70,7 @@ function qappNavigate (options = {}, method = 'push') {
     }
     try {
       router[method]({
-        uri: url.substr(0, url.lastIndexOf('/')),
+        uri: parseUrl.substr(0, parseUrl.lastIndexOf('/')),
         params
       })
       success && success(res)

diff --git a/packages/taro-quickapp/src/create-component.js b/packages/taro-quickapp/src/create-component.js
@@ -384,6 +384,7 @@ export default function createComponent (ComponentClass, isPage) {
         }
       }
     })
+    appGlobal.componentPath = isPage
     addLeadingSlash(isPage) && cacheDataSet(addLeadingSlash(isPage), ComponentClass)
   }
   bindStaticFns(componentConf, ComponentClass)
-Original file line number
+Diff line change
@@ Expand Up @@
             }
           }
         })
+        appGlobal.componentPath = isPage
         addLeadingSlash(isPage) && cacheDataSet(addLeadingSlash(isPage), ComponentClass)
       }
       bindStaticFns(componentConf, ComponentClass)
@@ Expand Down @@