@mpxjs/api-proxy 2.7.0-alpha.0 → 2.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.7.0-alpha.0",
+  "version": "2.7.0",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -15,6 +15,7 @@
     "@types",
     "README.md"
   ],
+  "main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "git@github.com/didi/mpx.git"
@@ -35,11 +36,8 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "homepage": "https://github.com/didi/mpx#readme",
-  "peerDependencies": {
-    "@mpxjs/core": "^2.6.95-alpha.0"
-  },
   "dependencies": {
     "axios": "^0.21.1"
   },
-  "gitHead": "43fe072e744b33b841b8e396677711e414bcca8b"
+  "gitHead": "0f2454782bfca526bd281618b99b9aacb1ca2a75"
 }

package/src/common/js/web.js

@@ -8,7 +8,15 @@ function webHandleFail (result, fail, complete) {
   typeof complete === 'function' && complete(result)
 }
 
+function isTabBarPage (url, router) {
+  const tabBarPagesMap = global.__tabBarPagesMap
+  if (!tabBarPagesMap || !url) return false
+  const path = router.match(url, router.history.current).path
+  return !!tabBarPagesMap[path.slice(1)]
+}
+
 export {
   webHandleSuccess,
-  webHandleFail
+  webHandleFail,
+  isTabBarPage
 }

package/src/common/stylus/ActionSheet.styl

@@ -1,5 +1,5 @@
 .__mpx_actionsheet__
-    display none
+  display none
   &.show
     display block
   .__mpx_mask__
@@ -49,4 +49,4 @@
     color #000000
     background-color #FCFCFD
     padding 10px 0
-    margin-top 6px
+    margin-top 6px

package/src/web/api/route/index.js

@@ -1,9 +1,14 @@
-import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { webHandleSuccess, webHandleFail, isTabBarPage } from '../../../common/js'
 import { EventChannel } from '../event-channel'
 
 function redirectTo (options = {}) {
   const router = global.__mpxRouter
   if (router) {
+    if (isTabBarPage(options.url, router)) {
+      const res = { errMsg: 'redirectTo:fail can not redirectTo a tabBar page' }
+      webHandleFail(res, options.fail, options.complete)
+      return Promise.reject(res)
+    }
     router.__mpxAction = { type: 'redirect' }
     return new Promise((resolve, reject) => {
       router.replace(
@@ -28,6 +33,11 @@ function redirectTo (options = {}) {
 function navigateTo (options = {}) {
   const router = global.__mpxRouter
   if (router) {
+    if (isTabBarPage(options.url, router)) {
+      const res = { errMsg: 'navigateTo:fail can not navigateTo a tabBar page' }
+      webHandleFail(res, options.fail, options.complete)
+      return Promise.reject(res)
+    }
     const eventChannel = new EventChannel()
     router.__mpxAction = {
       type: 'to',
@@ -71,11 +81,13 @@ function navigateBack (options = {}) {
   }
 }
 
+let reLaunchCount = 0
+
 function reLaunch (options = {}) {
   const router = global.__mpxRouter
   if (router) {
+    if (reLaunchCount === 0 && router.currentRoute.query.reLaunchCount) reLaunchCount = router.currentRoute.query.reLaunchCount
     const delta = router.stack.length - 1
-    let reLaunchCount = router.currentRoute.query.reLaunchCount || 0
     router.__mpxAction = {
       type: 'reLaunch',
       path: options.url,
@@ -120,7 +132,7 @@ function switchTab (options = {}) {
     const toRoute = router.match(options.url, router.history.current)
     const currentRoute = router.currentRoute
     if (toRoute.path !== currentRoute.path) {
-      if (toRoute.redirectedFrom) {
+      if (!isTabBarPage(options.url, router)) {
         const res = { errMsg: 'switchTab:fail can not switch to no-tabBar page!' }
         webHandleFail(res, options.fail, options.complete)
         return Promise.reject(res)