@mpxjs/api-proxy 2.8.49 → 2.8.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.8.49",
+  "version": "2.8.61",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -39,5 +39,5 @@
   "dependencies": {
     "axios": "^0.21.1"
   },
-  "gitHead": "b399e81951df7094fb0a494ae877bcf4e6a2985b"
+  "gitHead": "f393ffc439f21b24f5f09a65ef99db20b145e19a"
 }

package/src/web/api/create-selector-query/SelectQuery.js

@@ -136,8 +136,16 @@ class SelectQuery {
       }
     }
     if (scrollOffset) {
-      res.scrollLeft = el.scrollLeft
-      res.scrollTop = el.scrollTop
+      if (el.isBScrollContainer) {
+        const bs = el?.__vue__?.bs
+        res.scrollLeft = -bs.x
+        res.scrollTop = -bs.y
+      } else {
+        res.scrollLeft = el.scrollLeft
+        res.scrollTop = el.scrollTop
+      }
+      res.scrollHeight = el.scrollHeight
+      res.scrollWidth = el.scrollWidth
     }
     properties.forEach(prop => {
       const attr = el.getAttribute(prop)

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

@@ -39,7 +39,17 @@ function request (options = { url: '' }) {
     headers: header,
     responseType,
     timeout,
-    cancelToken: source.token
+    cancelToken: source.token,
+    transitional: {
+      // silent JSON parsing mode
+      // `true`  - ignore JSON parsing errors and set response.data to null if parsing failed (old behaviour)
+      // `false` - throw SyntaxError if JSON parsing failed (Note: responseType must be set to 'json')
+      silentJSONParsing: true, // default value for the current Axios version
+      // try to parse the response string as JSON even if `responseType` is not 'json'
+      forcedJSONParsing: false,
+      // throw ETIMEDOUT error instead of generic ECONNABORTED on request timeouts
+      clarifyTimeoutError: false
+    }
   }
 
   if (method === 'GET') {
@@ -49,7 +59,7 @@ function request (options = { url: '' }) {
 
   const promise = axios(rOptions).then(res => {
     let data = res.data
-    if (responseType === 'text' && dataType === 'json') {
+    if (dataType === 'json' && typeof data === 'string') {
       try {
         data = JSON.parse(data)
       } catch (e) {

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

@@ -81,7 +81,11 @@ function navigateTo (options = {}) {
 function navigateBack (options = {}) {
   const router = global.__mpxRouter
   if (router) {
-    const delta = options.delta || 1
+    let delta = options.delta || 1
+    const stackLength = router.stack.length
+    if (stackLength > 1 && delta >= stackLength) {
+      delta = stackLength - 1
+    }
     router.__mpxAction = {
       type: 'back',
       delta