@mpxjs/api-proxy 2.8.28-beta.11 → 2.8.40-test

package/src/{web/api/tab-bar/index.js → platform/api/tab-bar/index.web.js}

@@ -21,10 +21,8 @@ function setTabBarStyle (options = {}) {
 
   if (resolved) {
     webHandleSuccess(resolved, options.success, options.complete)
-    return Promise.resolve(resolved)
   }
   webHandleFail(rejected, options.fail, options.complete)
-  return Promise.reject(rejected)
 }
 
 function setTabBarItem (options = {}) {
@@ -52,10 +50,8 @@ function setTabBarItem (options = {}) {
 
   if (resolved) {
     webHandleSuccess(resolved, options.success, options.complete)
-    return Promise.resolve(resolved)
   }
   webHandleFail(rejected, options.fail, options.complete)
-  return Promise.reject(rejected)
 }
 
 function showTabBar (options = {}) {
@@ -70,10 +66,8 @@ function showTabBar (options = {}) {
 
   if (resolved) {
     webHandleSuccess(resolved, options.success, options.complete)
-    return Promise.resolve(resolved)
   }
   webHandleFail(rejected, options.fail, options.complete)
-  return Promise.reject(rejected)
 }
 
 function hideTabBar (options = {}) {
@@ -88,10 +82,8 @@ function hideTabBar (options = {}) {
 
   if (resolved) {
     webHandleSuccess(resolved, options.success, options.complete)
-    return Promise.resolve(resolved)
   }
   webHandleFail(rejected, options.fail, options.complete)
-  return Promise.reject(rejected)
 }
 
 export {

package/src/{web → platform}/api/toast/Toast.js

@@ -1,14 +1,7 @@
-import { webHandleSuccess } from '../../../common/js'
+import { webHandleSuccess, createDom } from '../../../common/js'
 import '../../../common/stylus/Toast.styl'
 import '../../../common/stylus/Loading.styl'
 
-function createDom (tag, attrs = {}, children = []) {
-  const dom = document.createElement(tag)
-  Object.keys(attrs).forEach(k => dom.setAttribute(k, attrs[k]))
-  children.length && children.forEach(child => dom.appendChild(child))
-  return dom
-}
-
 export default class Toast {
   constructor () {
     this.defaultOpts = {
@@ -84,7 +77,6 @@ export default class Toast {
 
     const errMsg = type === 'loading' ? 'showLoading:ok' : 'showToast:ok'
     webHandleSuccess({ errMsg }, opts.success, opts.complete)
-    return Promise.resolve({ errMsg })
   }
 
   hide (options = {}, type) {
@@ -100,6 +92,5 @@ export default class Toast {
     }
 
     this.hideTimer = setTimeout(() => { this.toast.classList.remove('show') }, duration)
-    return Promise.resolve({ errMsg })
   }
 }

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

@@ -0,0 +1,39 @@
+import { changeOpts, warn } from '../../../common/js'
+
+const TIPS_NAME = '支付宝环境 mpx'
+
+function showToast (options = {}) {
+  const opts = changeOpts(options, {
+    title: 'content',
+    icon: 'type'
+  })
+  my.showToast(opts)
+}
+
+function hideToast (options = {}) {
+  if (options.success || options.fail || options.complete) {
+    warn(`${TIPS_NAME}.hideToast 不支持 success/fail/complete 参数`)
+  }
+  my.hideToast(options)
+}
+
+function showLoading (options = {}) {
+  const opts = changeOpts(options, {
+    title: 'content'
+  })
+  my.showLoading(opts)
+}
+
+function hideLoading (options = {}) {
+  if (options.success || options.fail || options.complete) {
+    warn(`${TIPS_NAME}.hideLoading 不支持 success/fail/complete 参数`)
+  }
+  my.hideLoading(options)
+}
+
+export {
+  showToast,
+  hideToast,
+  showLoading,
+  hideLoading
+}

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

@@ -0,0 +1,18 @@
+import { getEnvObj, envError } from '../../../common/js'
+
+const ENV_OBJ = getEnvObj()
+
+const showToast = ENV_OBJ.showToast || envError('showToast')
+
+const hideToast = ENV_OBJ.hideToast || envError('hideToast')
+
+const showLoading = ENV_OBJ.showLoading || envError('showLoading')
+
+const hideLoading = ENV_OBJ.hideLoading || envError('hideLoading')
+
+export {
+  showToast,
+  hideToast,
+  showLoading,
+  hideLoading
+}

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

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

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

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

package/src/platform/index.js

@@ -0,0 +1,106 @@
+// showActionSheet
+export * from './api/action-sheet'
+
+// addPhoneContact
+export * from './api/add-phone-contact'
+
+// createAnimation
+export * from './api/animation'
+
+// onAppShow, onAppHide, offAppShow, offAppHide, onError, offError
+export * from './api/app'
+
+// createInnerAudioContext
+export * from './api/audio'
+
+// base64ToArrayBuffer, arrayBufferToBase64
+export * from './api/base'
+
+// closeBLEConnection, createBLEConnection, onBLEConnectionStateChange
+export * from './api/ble-connection'
+
+// createCanvasContext, canvasToTempFilePath, canvasGetImageData
+export * from './api/canvas'
+
+// checkSession
+export * from './api/check-session'
+
+// setClipboardData, getClipboardData
+export * from './api/clipboard-data'
+
+// createIntersectionObserver
+export * from './api/create-intersection-observer'
+
+// createSelectorQuery
+export * from './api/create-selector-query'
+
+// getNetworkType, onNetworkStatusChange, offNetworkStatusChange
+export * from './api/device/network'
+
+// downloadFile, uploadFile
+export * from './api/file'
+
+// getUserInfo
+export * from './api/get-user-info'
+
+// previewImage, compressImage
+export * from './api/image'
+
+// login
+export * from './api/login'
+
+// makePhoneCall
+export * from './api/make-phone-call'
+
+// showModal
+export * from './api/modal'
+
+// nextTick
+export * from './api/next-tick'
+
+// pageScrollTo
+export * from './api/page-scroll-to'
+
+// stopPullDownRefresh
+export * from './api/pull-down'
+
+// request
+export * from './api/request'
+
+// requestPayment
+export * from './api/request-payment'
+
+// redirectTo, navigateTo, navigateBack, reLaunch, switchTab
+export * from './api/route'
+
+// scanCode
+export * from './api/scan-code'
+
+// setScreenBrightness, getScreenBrightness
+export * from './api/screen-brightness'
+
+// setNavigationBarTitle, setNavigationBarColor
+export * from './api/set-navigation-bar'
+
+// connectSocket
+export * from './api/socket'
+
+// setStorage, setStorageSync, getStorage, getStorageSync
+// getStorageInfo, getStorageInfoSync, removeStorage, removeStorageSync
+// clearStorage, clearStorageSync
+export * from './api/storage'
+
+// getSystemInfo, getSystemInfoSync
+export * from './api/system'
+
+// setTabBarItem, setTabBarStyle, showTabBar, hideTabBar
+export * from './api/tab-bar'
+
+// showToast, hideToast, showLoading, hideLoading
+export * from './api/toast'
+
+// createVideoContext
+export * from './api/video'
+
+// onWindowResize, offWindowResize
+export * from './api/window'

package/src/web/api/index.js

@@ -10,6 +10,9 @@ export * from './action-sheet'
 // showToast, hideToast, showLoading, hideLoading
 export * from './toast'
 
+// previewImage
+export * from './preview-image'
+
 // showModal
 export * from './modal'
 

package/src/common/js/ToPromise.js

@@ -1,25 +0,0 @@
-class ToPromise {
-  constructor () {
-    this._resolve = null
-    this._reject = null
-  }
-
-  toPromiseInitPromise () {
-    return new Promise((resolve, reject) => {
-      this._resolve = resolve
-      this._reject = reject
-    })
-  }
-
-  toPromiseResolve (res) {
-    this._resolve(res)
-  }
-
-  toPromiseReject (err) {
-    this._reject(err)
-  }
-}
-
-export {
-  ToPromise
-}

package/src/index.web.js

@@ -1,27 +0,0 @@
-import * as allApi from './web/api'
-import { EventChannel } from './web/api/event-channel'
-import { genFromMap } from './common/js'
-
-export default function install (target) {
-  const fromMap = genFromMap()
-
-  global.EventChannel = new EventChannel()
-
-  Object.keys(allApi).forEach(api => {
-    target[api] = function (...args) {
-      if (args.length > 0) {
-        const from = args.pop()
-        if (typeof from !== 'string' || !fromMap[from]) {
-          args.push(from)
-        }
-      }
-
-      return allApi[api].apply(target, args)
-    }
-  })
-}
-export function getProxy () {
-  const apiProxy = {}
-  install(apiProxy)
-  return apiProxy
-}