@mpxjs/api-proxy 2.8.39 → 2.8.40-test.1

package/src/platform/api/create-selector-query/index.ali.js

@@ -0,0 +1,35 @@
+import { noop } from '../../../common/js'
+
+function createSelectorQuery (options = {}) {
+  const selectorQuery = my.createSelectorQuery(options)
+  const proxyMethods = ['boundingClientRect', 'scrollOffset']
+  const cbs = []
+  proxyMethods.forEach((name) => {
+    const originalMethod = selectorQuery[name]
+    selectorQuery[name] = function (cb = noop) {
+      cbs.push(cb)
+      return originalMethod.call(this)
+    }
+  })
+
+  const originalExec = selectorQuery.exec
+  selectorQuery.exec = function (originalCb = noop) {
+    const cb = function (results) {
+      results.forEach((item, index) => {
+        cbs[index] && cbs[index](item)
+      })
+      originalCb(results)
+    }
+    return originalExec.call(this, cb)
+  }
+
+  selectorQuery.in = function () {
+    return this
+  }
+
+  return selectorQuery
+}
+
+export {
+  createSelectorQuery
+}

package/src/platform/api/create-selector-query/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const createSelectorQuery = ENV_OBJ.createSelectorQuery || envError('createSelectorQuery')
+
+export {
+  createSelectorQuery
+}

package/src/platform/api/device/network/index.js

@@ -0,0 +1,15 @@
+import { getEnvObj, envError } from '../../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const getNetworkType = ENV_OBJ.getNetworkType || envError('getNetworkType')
+
+const onNetworkStatusChange = ENV_OBJ.onNetworkStatusChange || envError('onNetworkStatusChange')
+
+const offNetworkStatusChange = ENV_OBJ.offNetworkStatusChange || envError('offNetworkStatusChange')
+
+export {
+  getNetworkType,
+  onNetworkStatusChange,
+  offNetworkStatusChange
+}

package/src/{web/api/event-channel/index.js → platform/api/event-channel/index.web.js}

@@ -19,13 +19,13 @@ class EventChannel {
     }
   }
 
-  off (eventName, EventCallback) {
-    if (EventCallback) {
+  off (eventName, listener) {
+    if (listener) {
       const cbs = this.listener[eventName]
       const copyCbs = []
       if (cbs) {
         cbs.forEach((item) => {
-          if (item.fn !== EventCallback) {
+          if (item.fn !== listener) {
             copyCbs.push(item)
           }
         })
@@ -36,26 +36,25 @@ class EventChannel {
     }
   }
 
-  on (eventName, EventCallback) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type: 'on' })
+  on (eventName, listener) {
+    this._addListener(eventName, listener, 'on')
   }
 
-  once (eventName, EventCallback) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type: 'once' })
+  once (eventName, listener) {
+    this._addListener(eventName, listener, 'once')
   }
 
-  _addListener (eventName, EventCallback, type) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type })
+  _addListener (eventName, listener, type) {
+    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: listener, type })
   }
 
   _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' })
-      })
-    }
+    Object.keys(events).forEach((eventName) => {
+      this.on(eventName, events[eventName])
+    })
   }
 }
+
 export {
   EventChannel
 }

package/src/platform/api/file/index.ali.js

@@ -0,0 +1,35 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function downloadFile (options = {}) {
+  const opts = changeOpts(options)
+
+  handleSuccess(opts, res => {
+    return changeOpts(res, { apFilePath: 'tempFilePath' })
+  })
+
+  return my.downloadFile(opts)
+}
+
+function uploadFile (options = {}) {
+  const opts = changeOpts(options, { name: 'fileName' })
+
+  return my.uploadFile(opts)
+}
+
+function saveFile (options = {}) {
+  const opts = changeOpts(options, {
+    tempFilePath: 'apFilePath'
+  })
+
+  handleSuccess(opts, res => {
+    return changeOpts(res, { apFilePath: 'savedFilePath' })
+  })
+
+  my.saveFile(opts)
+}
+
+export {
+  downloadFile,
+  uploadFile,
+  saveFile
+}

package/src/platform/api/file/index.js

@@ -0,0 +1,12 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const downloadFile = ENV_OBJ.downloadFile || envError('downloadFile')
+
+const uploadFile = ENV_OBJ.uploadFile || envError('uploadFile')
+
+export {
+  downloadFile,
+  uploadFile
+}

package/src/platform/api/get-user-info/index.ali.js

@@ -0,0 +1,18 @@
+import { warn } from '../../../common/js'
+
+const TIPS_NAME = '支付宝环境 mpx'
+
+function getUserInfo (options = {}) {
+  if (options.withCredentials === true) {
+    warn(`支付宝不支持在 ${TIPS_NAME}.getUserInfo 使用 withCredentials 参数中获取等敏感信息`)
+  }
+  if (options.lang) {
+    warn(`支付宝不支持在 ${TIPS_NAME}.getUserInfo 中使用 lang 参数`)
+  }
+
+  my.getOpenUserInfo(options)
+}
+
+export {
+  getUserInfo
+}

package/src/platform/api/get-user-info/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const getUserInfo = ENV_OBJ.getUserInfo || envError('getUserInfo')
+
+export {
+  getUserInfo
+}

package/src/platform/api/image/Preview.js

@@ -0,0 +1,80 @@
+import { webHandleSuccess, webHandleFail, createDom, warn } from '../../../common/js'
+import '../../../common/stylus/Preview.styl'
+/**
+ * Preview class for displaying images in a slideshow format.
+ * todo: unit test
+ */
+export default class Preview {
+  constructor () {
+    this.currentIndex = 0
+    this.maxIndex = 0
+    this.minDistance = 30
+    this.preview = createDom('div', { class: '__mpx_preview__' }, [
+      this.textTip = createDom('div', { class: '__mpx_preview_tip__' })
+    ])
+    document.body.appendChild(this.preview)
+    this.initEvent()
+  }
+
+  /**
+   * Initializes the event listeners for the preview image feature.
+   */
+  initEvent () {
+    // swipe to change image
+    let startX = 0
+    this.preview.addEventListener('touchstart', (e) => {
+      startX = e.touches[0].pageX
+    })
+    this.preview.addEventListener('touchend', (e) => {
+      const endX = e.changedTouches[0].pageX
+      const distance = endX - startX
+      if (Math.abs(distance) < this.minDistance) {
+        return
+      }
+      if (distance > 0) {
+        this.currentIndex = Math.max(0, this.currentIndex - 1)
+      }
+      if (distance < 0) {
+        this.currentIndex = Math.min(this.maxIndex - 1, this.currentIndex + 1)
+      }
+      this.preview.querySelector('.__mpx_preview_images__').style.transform = `translateX(-${this.currentIndex * 100}%)`
+      this.updateTextTip()
+    })
+    // click to close
+    this.preview.addEventListener('click', () => {
+      this.preview.style.display = 'none'
+      this.preview.querySelector('.__mpx_preview_images__').remove()
+    })
+  }
+
+  /**
+   * 显示预览图片
+   * @param {Object} options - 选项对象
+   * @param {string[]} options.urls - 图片地址数组
+   */
+  show (options) {
+    const supported = ['urls', 'success', 'fail', 'complete']
+    Object.keys(options).forEach(key => !supported.includes(key) && warn(`previewImage: 暂不支持选项 ${key} ！`))
+    const { urls, success, fail, complete } = options
+    try {
+      this.preview.style.display = 'block'
+      // create images with urls
+      // append to preview
+      this.preview.appendChild(createDom('div', { class: '__mpx_preview_images__' }, urls.map(url => createDom('div', {
+        style: `background-image: url(${url})`
+      }))))
+      this.maxIndex = urls.length
+      this.updateTextTip()
+      webHandleSuccess({ errMsg: 'previewImage:ok' }, success, complete)
+    } catch (e) {
+      webHandleFail({ errMsg: 'previewImage:fail', err: e }, fail, complete)
+    }
+  }
+
+  /**
+   * 更新文本提示
+   */
+  updateTextTip () {
+    this.textTip.textContent = `${this.currentIndex + 1}/${this.maxIndex}`
+  }
+}

package/src/platform/api/image/index.ali.js

@@ -0,0 +1,36 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function previewImage (options = {}) {
+  const opts = changeOpts(options)
+
+  if (opts.current) {
+    const idx = options.urls.indexOf(opts.current)
+    opts.current = idx !== -1 ? idx : 0
+  }
+
+  my.previewImage(opts)
+}
+
+function compressImage (options = {}) {
+  const opts = changeOpts(options, {
+    quality: ''
+  }, {
+    compressLevel: Math.round(options.quality / 100 * 4), // 支付宝图片压缩质量为 0 ~ 4，微信是 0 ~ 100
+    apFilePaths: [options.src]
+  })
+
+  handleSuccess(opts, res => {
+    return changeOpts(
+      res,
+      { apFilePaths: '' },
+      { tempFilePath: res.apFilePaths[0] }
+    )
+  })
+
+  my.compressImage(opts)
+}
+
+export {
+  previewImage,
+  compressImage
+}

package/src/platform/api/image/index.js

@@ -0,0 +1,12 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const previewImage = ENV_OBJ.previewImage || envError('previewImage')
+
+const compressImage = ENV_OBJ.compressImage || envError('compressImage')
+
+export {
+  previewImage,
+  compressImage
+}

package/src/platform/api/image/index.web.js

@@ -0,0 +1,12 @@
+import Preview from './Preview'
+
+let preview = null
+
+/**
+ * 预览图片
+ * @param {Object} options - 预览图片的配置项
+ */
+export const previewImage = (options) => {
+  if (!preview) preview = new Preview()
+  preview.show(options)
+}

package/src/platform/api/login/index.ali.js

@@ -0,0 +1,15 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function login (options = {}) {
+  const opts = changeOpts(options)
+
+  handleSuccess(opts, res => {
+    return changeOpts(res, { authCode: 'code' }, { errMsg: 'login:ok' })
+  })
+
+  my.getAuthCode(opts)
+}
+
+export {
+  login
+}

package/src/platform/api/login/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const login = ENV_OBJ.login || envError('login')
+
+export {
+  login
+}

package/src/platform/api/make-phone-call/index.ali.js

@@ -0,0 +1,12 @@
+import { changeOpts } from '../../../common/js'
+
+function makePhoneCall (options = {}) {
+  const opts = changeOpts(options, {
+    phoneNumber: 'number'
+  })
+  my.makePhoneCall(opts)
+}
+
+export {
+  makePhoneCall
+}

package/src/platform/api/make-phone-call/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const makePhoneCall = ENV_OBJ.makePhoneCall || envError('makePhoneCall')
+
+export {
+  makePhoneCall
+}

package/src/{web → platform}/api/modal/Modal.js

@@ -1,4 +1,4 @@
-import { ToPromise, webHandleSuccess } from '../../../common/js'
+import { webHandleSuccess } from '../../../common/js'
 import '../../../common/stylus/Modal.styl'
 // import { forEach } from '@didi/mpx-fetch/src/util'
 // 汉字为两个字符，字母/数字为一个字符
@@ -13,9 +13,8 @@ const _getLength = (t) => {
   }
   return len
 }
-export default class Modal extends ToPromise {
+export default class Modal {
   constructor () {
-    super()
     this.defaultOpts = {
       title: '',
       content: '',
@@ -110,7 +109,6 @@ export default class Modal extends ToPromise {
         confirm: false
       }
       webHandleSuccess(result, opts.success, opts.complete)
-      this.toPromiseResolve(result)
     }
     this.confirmBtn.onclick = () => {
       this.hide()
@@ -120,12 +118,9 @@ export default class Modal extends ToPromise {
         confirm: true
       }
       webHandleSuccess(result, opts.success, opts.complete)
-      this.toPromiseResolve(result)
     }
 
     this.modal.classList.add('show')
-
-    return this.toPromiseInitPromise()
   }
 
   hide () {

package/src/platform/api/modal/index.ali.js

@@ -0,0 +1,32 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function showModal (options = {}) {
+  let opts
+
+  if (options.showCancel === undefined || options.showCancel) {
+    opts = changeOpts(options, {
+      confirmText: 'confirmButtonText',
+      cancelText: 'cancelButtonText'
+    })
+
+    handleSuccess(opts, res => {
+      return changeOpts(res, undefined, { cancel: !res.confirm })
+    })
+
+    my.confirm(opts)
+  } else {
+    opts = changeOpts(options, {
+      confirmText: 'buttonText'
+    })
+
+    handleSuccess(opts, res => {
+      return changeOpts(res, undefined, { cancel: false, confirm: true })
+    })
+
+    my.alert(opts)
+  }
+}
+
+export {
+  showModal
+}

package/src/platform/api/modal/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const showModal = ENV_OBJ.showModal || envError('showModal')
+
+export {
+  showModal
+}

package/src/platform/api/next-tick/index.ali.js

@@ -0,0 +1,7 @@
+function nextTick (fn) {
+  Promise.resolve().then(fn)
+}
+
+export {
+  nextTick
+}

package/src/platform/api/next-tick/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const nextTick = ENV_OBJ.nextTick || envError('nextTick')
+
+export {
+  nextTick
+}

package/src/platform/api/next-tick/index.tt.js

@@ -0,0 +1,7 @@
+function nextTick (fn) {
+  Promise.resolve().then(fn)
+}
+
+export {
+  nextTick
+}

package/src/platform/api/page-scroll-to/index.js

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const pageScrollTo = ENV_OBJ.pageScrollTo || envError('pageScrollTo')
+
+export {
+  pageScrollTo
+}

package/src/platform/api/pull-down/index.js

@@ -0,0 +1,12 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const stopPullDownRefresh = ENV_OBJ.stopPullDownRefresh || envError('stopPullDownRefresh')
+
+const startPullDownRefresh = ENV_OBJ.startPullDownRefresh || envError('startPullDownRefresh')
+
+export {
+  stopPullDownRefresh,
+  startPullDownRefresh
+}

package/src/{web/api/pull-down/index.js → platform/api/pull-down/index.web.js}

@@ -16,17 +16,13 @@ function stopPullDownRefresh (options = {}) {
         }
       }
     }
-    return new Promise((resolve, reject) => {
-      if (err) {
-        const res = { errMsg: `stopPullDownRefresh:fail ${err}` }
-        webHandleFail(res, options.fail, options.complete)
-        reject(res)
-      } else {
-        const res = { errMsg: 'stopPullDownRefresh:ok' }
-        webHandleSuccess(res, options.success, options.complete)
-        resolve(res)
-      }
-    })
+    if (err) {
+      const res = { errMsg: `stopPullDownRefresh:fail ${err}` }
+      webHandleFail(res, options.fail, options.complete)
+    } else {
+      const res = { errMsg: 'stopPullDownRefresh:ok' }
+      webHandleSuccess(res, options.success, options.complete)
+    }
   }
 }
 
@@ -46,17 +42,13 @@ function startPullDownRefresh (options = {}) {
         }
       }
     }
-    return new Promise((resolve, reject) => {
-      if (err) {
-        const res = { errMsg: `startPullDownRefresh:fail ${err}` }
-        webHandleFail(res, options.fail, options.complete)
-        reject(res)
-      } else {
-        const res = { errMsg: 'startPullDownRefresh:ok' }
-        webHandleSuccess(res, options.success, options.complete)
-        resolve(res)
-      }
-    })
+    if (err) {
+      const res = { errMsg: `startPullDownRefresh:fail ${err}` }
+      webHandleFail(res, options.fail, options.complete)
+    } else {
+      const res = { errMsg: 'startPullDownRefresh:ok' }
+      webHandleSuccess(res, options.success, options.complete)
+    }
   }
 }
 

package/src/platform/api/request/index.ali.js

@@ -0,0 +1,26 @@
+import { changeOpts, handleSuccess } from '../../../common/js'
+
+function request (options = {}) {
+  const opts = changeOpts(options, {
+    header: 'headers'
+  })
+
+  handleSuccess(opts, res => {
+    return changeOpts(res, {
+      headers: 'header',
+      status: 'statusCode'
+    })
+  })
+
+  // request 在 1.11.0 以上版本才支持
+  // httpRequest 即将被废弃，钉钉端仍需要使用
+  if (my.canIUse('request')) {
+    return my.request(opts)
+  } else {
+    return my.httpRequest(opts)
+  }
+}
+
+export {
+  request
+}

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

@@ -0,0 +1,9 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const request = ENV_OBJ.request || envError('request')
+
+export {
+  request
+}

package/src/{web/api/request/index.js → platform/api/request/index.web.js}

@@ -39,17 +39,25 @@ 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') {
     rOptions.params = rOptions.data || {}
     delete rOptions.data
   }
-
-  const promise = axios(rOptions).then(res => {
+  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) {
@@ -71,8 +79,7 @@ function request (options = { url: '' }) {
     }
   })
 
-  promise.__returned = requestTask
-  return promise
+  return requestTask
 }
 
 export {