fix(#15296): 修复路由有 basename 的情况下navigate 报错

NervJS · Mar 5, 2024 · 5898761 · 5898761
1 parent 5cd06ff
commit 5898761
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/taro-router/src/api.ts b/packages/taro-router/src/api.ts
@@ -57,9 +57,8 @@ async function navigate (option: Option | NavigateBackOption, method: MethodName
         const state = { timestamp: Date.now() }
         if (pathPieces.pathname) {
           const originPath = routesAlias.getOrigin(pathPieces.pathname)
-          const pagePath = originPath.startsWith('/') ? originPath.substring(1) : originPath
-          if (!RouterConfig.pages.includes(pagePath)) {
-            const res = { errMsg: `${method}:fail page ${pagePath} is not found` }
+          if (!RouterConfig.isPage(addLeadingSlash(originPath))) {
+            const res = { errMsg: `${method}:fail page ${originPath} is not found` }
             fail?.(res)
             complete?.(res)
             if (fail || complete) {

diff --git a/packages/taro-router/src/history.ts b/packages/taro-router/src/history.ts
@@ -1,5 +1,5 @@
 import { Action, createBrowserHistory, createHashHistory } from 'history'
-
+import { addLeadingSlash } from '@tarojs/runtime'
 import { RouterConfig } from './router'
 
 import type { IH5RouterConfig } from '@tarojs/taro/types/compile'
@@ -28,7 +28,7 @@ class MpaHistory implements History {
 
   parseUrl (to: Partial<Path>) {
     let url = to.pathname || ''
-    if (RouterConfig.isPage(url)) {
+    if (RouterConfig.isPage(addLeadingSlash(url))) {
       url += '.html'
     }
     if (to.search) {

diff --git a/packages/taro-router/src/router/index.ts b/packages/taro-router/src/router/index.ts
@@ -1,4 +1,4 @@
-import { addLeadingSlash } from '@tarojs/runtime'
+import { addLeadingSlash, stripBasename } from '@tarojs/runtime'
 
 import type { MpaRouterConfig, SpaRouterConfig } from '../../types/router'
 
@@ -28,6 +28,7 @@ export class RouterConfig {
   static get customRoutes () { return this.router.customRoutes || {} }
 
   static isPage (url = '') {
-    return this.pages.findIndex(e => addLeadingSlash(e) === url) !== -1
+    if (this.router.basename) url = stripBasename(url, this.router.basename)
+    return this.pages.findIndex(e => addLeadingSlash(e) === addLeadingSlash(url)) !== -1
   }
 }