@mpxjs/api-proxy 2.9.41-react.0 → 2.9.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.41-react.0",
+  "version": "2.9.43",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -63,5 +63,5 @@
       "optional": true
     }
   },
-  "gitHead": "1c9ae7527a257fad98f5536114e63415cea54271"
+  "gitHead": "92a347518d15400f87c380bc7248b8b6254631cf"
 }

package/src/platform/api/route/index.ios.js

@@ -2,11 +2,6 @@ import { webHandleSuccess, webHandleFail } from '../../../common/js'
 import { parseQuery } from '@mpxjs/utils'
 
 function parseUrl (url) {
-  if (url.startsWith('/')) {
-    url = url.slice(1)
-  } else {
-    // todo 处理相对路径
-  }
   let path = url
   let query = ''
   const queryIndex = url.indexOf('?')
@@ -21,12 +16,46 @@ function parseUrl (url) {
   }
 }
 
+function getBasePath (navigation) {
+  if (navigation) {
+    const state = navigation.getState()
+    return '/' + state.routes[state.index].name
+  }
+  return '/'
+}
+
+function resolvePath (relative, base) {
+  const firstChar = relative.charAt(0)
+  if (firstChar === '/') {
+    return relative
+  }
+  const stack = base.split('/')
+  stack.pop()
+  // resolve relative path
+  const segments = relative.replace(/^\//, '').split('/')
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i]
+    if (segment === '..') {
+      stack.pop()
+    } else if (segment !== '.') {
+      stack.push(segment)
+    }
+  }
+  // ensure leading slash
+  if (stack[0] !== '') {
+    stack.unshift('')
+  }
+  return stack.join('/')
+}
+
 function navigateTo (options = {}) {
-  const navigationRef = global.__navigationRef
+  const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   const navigationHelper = global.__navigationHelper
-  if (navigationHelper && navigationRef && navigationRef.isReady()) {
+  if (navigation && navigationHelper) {
     const { path, queryObj } = parseUrl(options.url)
-    navigationRef.dispatch(navigationHelper.StackActions.push(path, queryObj))
+    const basePath = getBasePath(navigation)
+    const finalPath = resolvePath(path, basePath).slice(1)
+    navigation.push(finalPath, queryObj)
     navigationHelper.lastSuccessCallback = () => {
       const res = { errMsg: 'navigateTo:ok' }
       webHandleSuccess(res, options.success, options.complete)
@@ -39,11 +68,13 @@ function navigateTo (options = {}) {
 }
 
 function redirectTo (options = {}) {
-  const navigationRef = global.__navigationRef
+  const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   const navigationHelper = global.__navigationHelper
-  if (navigationHelper && navigationRef && navigationRef.isReady()) {
+  if (navigation && navigationHelper) {
     const { path, queryObj } = parseUrl(options.url)
-    navigationRef.dispatch(navigationHelper.StackActions.replace(path, queryObj))
+    const basePath = getBasePath(navigation)
+    const finalPath = resolvePath(path, basePath).slice(1)
+    navigation.replace(finalPath, queryObj)
     navigationHelper.lastSuccessCallback = () => {
       const res = { errMsg: 'redirectTo:ok' }
       webHandleSuccess(res, options.success, options.complete)
@@ -56,10 +87,10 @@ function redirectTo (options = {}) {
 }
 
 function navigateBack (options = {}) {
-  const navigationRef = global.__navigationRef
+  const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   const navigationHelper = global.__navigationHelper
-  if (navigationHelper && navigationRef && navigationRef.isReady()) {
-    navigationRef.dispatch(navigationHelper.StackActions.pop(options.delta || 1))
+  if (navigation && navigationHelper) {
+    navigation.pop(options.delta || 1)
     navigationHelper.lastSuccessCallback = () => {
       const res = { errMsg: 'navigateBack:ok' }
       webHandleSuccess(res, options.success, options.complete)
@@ -72,15 +103,17 @@ function navigateBack (options = {}) {
 }
 
 function reLaunch (options = {}) {
-  const navigationRef = global.__navigationRef
+  const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   const navigationHelper = global.__navigationHelper
-  if (navigationHelper && navigationRef && navigationRef.isReady()) {
+  if (navigation && navigationHelper) {
     const { path, queryObj } = parseUrl(options.url)
-    navigationRef.reset({
+    const basePath = getBasePath(navigation)
+    const finalPath = resolvePath(path, basePath).slice(1)
+    navigation.reset({
       index: 0,
       routes: [
         {
-          name: path,
+          name: finalPath,
           params: queryObj
         }
       ]