@mpxjs/api-proxy 2.8.23-alpha → 2.8.25-alpha.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.8.23-alpha",
+  "version": "2.8.25-alpha.18",
   "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": "3a6dff432fd46bab36a9866f92cffb6501e69909"
+  "gitHead": "14a16b3d7995ce01989d2b516038b381678006b3"
 }

package/src/tenon/api/event-channel/index.js

@@ -1,57 +1,48 @@
+const notifyCenter = Hummer.notifyCenter
+const { Memory } = __GLOBAL__
+// 通过Memory 和 notifyCenter实现跨页面事件通道
+// FIXME:可能存在的问题once订阅的移除   emit事件传参数量
 class EventChannel {
-  constructor () {
-    this.listener = {}
-  }
-
   emit (eventName, ...args) {
-    const cbs = this.listener[eventName]
-    if (cbs) {
-      cbs.forEach((item, index) => {
-        try {
-          item.fn.apply(this, args)
-        } catch (e) {
-          console.log(`event "${eventName}" error ${e}`)
-        }
-        if (item.type === 'once') {
-          cbs.splice(index, 1)
-        }
-      })
+    notifyCenter.triggerEvent(eventName, args)
+    if (Memory.exist(`_ENENT_ONCE_${eventName}`)) {
+      // 订阅和发送可能不是一个上下文 暂时只能全部移除
+      this.off(eventName)
+      Memory.remove(`_ENENT_ONCE_${eventName}`)
     }
   }
 
   off (eventName, EventCallback) {
-    if (EventCallback) {
-      const cbs = this.listener[eventName]
-      const copyCbs = []
-      if (cbs) {
-        cbs.forEach((item, index) => {
-          if (item.fn !== EventCallback) {
-            copyCbs.push(item)
-          }
-        })
-      }
-      this.listener[eventName] = copyCbs
-    } else {
-      this.listener[eventName] && (this.listener[eventName].length = 0)
-    }
+    notifyCenter.removeEventListener(eventName, EventCallback)
   }
 
   on (eventName, EventCallback) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type: 'on' })
+    notifyCenter.addEventListener(eventName, EventCallback)
   }
 
   once (eventName, EventCallback) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type: 'once' })
+    notifyCenter.addEventListener(eventName, EventCallback)
+    Memory.set(`_ENENT_ONCE_${eventName}`, 1)
   }
 
   _addListener (eventName, EventCallback, type) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type })
+    switch (type) {
+      case 'on':
+        this.on(eventName, EventCallback)
+        break
+      case 'once':
+        this.once(eventName, EventCallback)
+        break
+      default:
+        this.on(eventName, EventCallback)
+        break
+    }
   }
 
   _addListeners (events) {
     if (Object.prototype.toString.call(events) === '[object Object]') {
       Object.keys(events).forEach((eventName) => {
-        (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: events[eventName], type: 'on' })
+        this.on(eventName, events[eventName])
       })
     }
   }

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

@@ -38,7 +38,7 @@ function request (options = { url: '' }) {
   requestFn.method = method
   requestFn.timeout = timeout
   requestFn.header = header
-  requestFn.params = data
+  requestFn.param = data
   requestFn.send((response) => {
     let { status, header: resHeader, data: resData, error } = response
     // 返回的数据处理

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

@@ -2,14 +2,39 @@ import { webHandleSuccess } from '../../../common/js'
 import { EventChannel } from '../event-channel'
 const { Navigator } = __GLOBAL__
 
+function handleUrl (url) {
+  const [urlString, queryString] = url.split('?')
+  const queryObj = {}
+
+  if (!queryString) {
+    return {
+      query: queryObj,
+      url: urlString
+    }
+  }
+
+  const paramsArray = queryString.split('&')
+  for (const pair of paramsArray) {
+    const [key, value] = pair.split('=')
+    queryObj[key] = decodeURIComponent(value)
+  }
+
+  return {
+    query: queryObj,
+    url: urlString
+  }
+}
+
 function redirectTo (options = {}) {
+  const { url, query } = handleUrl(options.url || '')
   if (Navigator) {
-    Navigator.__mpxAction = { type: 'redirect' }
     return new Promise((resolve, reject) => {
       // 关闭本页面的跳转
       Navigator.openPage(
         {
-          url: options.url,
+          url,
+          animated: false,
+          params: query,
           closeSelf: true
         },
         // 执行环境变了 得不到执行的机会 故回调无效
@@ -23,25 +48,22 @@ function redirectTo (options = {}) {
 }
 
 function navigateTo (options = {}) {
+  const { url, query } = handleUrl(options.url || '')
+  const events = options.events
+
   if (Navigator) {
     const eventChannel = new EventChannel()
-    Navigator.__mpxAction = {
-      type: 'to',
-      eventChannel
-    }
-    if (options.events) {
-      eventChannel._addListeners(options.events)
+    if (events) {
+      eventChannel._addListeners(events)
     }
     return new Promise((resolve, reject) => {
       // 不关闭本页面的跳转
-      Navigator.openPage(
-        {
-          url: options.url
-        },
-        // 执行环境变了 得不到执行的机会 故回调无效
-        () => {}
-      )
-      const res = { errMsg: 'redirectTo:ok' }
+      Navigator.openPage({
+        url,
+        animated: true,
+        params: query
+      }, () => {})
+      const res = { errMsg: 'redirectTo:ok', eventChannel }
       webHandleSuccess(res, options.success, options.complete)
       resolve(res)
     })
@@ -51,12 +73,9 @@ function navigateTo (options = {}) {
 function navigateBack (options = {}) {
   if (Navigator) {
     const delta = options.delta || 1
-    Navigator.__mpxAction = {
-      type: 'back',
-      delta
-    }
-    // popBack方法
-    Navigator.popBack(delta, { animated: true })
+    Navigator.popBack(delta, {
+      animated: true
+    })
     const res = { errMsg: 'navigateBack:ok' }
     webHandleSuccess(res, options.success, options.complete)
     return Promise.resolve(res)

package/src/tenon/api/set-navigation-bar/index.js

@@ -0,0 +1,17 @@
+import { webHandleSuccess } from '../../../common/js'
+const {
+  Hummer
+} = __GLOBAL__
+
+function setNavigationBarTitle (options = {}) {
+  const { title, success, complete } = options
+  Hummer.setTitle(title)
+  webHandleSuccess({ errMsg: 'setTitle:ok' }, success, complete)
+}
+
+function setNavigationBarColor (options = {}) {}
+
+export {
+  setNavigationBarTitle,
+  setNavigationBarColor
+}