@mpxjs/api-proxy 2.9.53 → 2.9.59

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

@@ -0,0 +1,43 @@
+import NodeRef from './rnNodesRef'
+import { warn, noop } from '@mpxjs/utils'
+
+export default class SelectorQuery {
+  constructor () {
+    this._component = null
+    this._queue = []
+    this._queueCb = []
+  }
+
+  // wx 目前 exec 方法返回 undefined，文档上标注的是 NodeRef 类型，按实际的返回值来实现
+  exec (cb = noop) {
+    Promise.all(this._queueCb.map((cb) => cb())).then((res) => cb(res))
+  }
+
+  in (component) {
+    this._component = component
+    return this
+  }
+
+  /**
+   * 目前支持的 selector
+   *
+   * 1. id 选择器：#the-id
+   * 2. class 选择器（可以连续指定多个）：.a-class.another-class
+   */
+  select (selector = '', all) {
+    if (!this._component) {
+      warn('Please use SelectorQuery.in method to set context')
+    }
+    const refs = this._component && this._component.__selectRef(selector, 'node', all)
+    return new NodeRef(refs, this, !all)
+  }
+
+  selectAll (selector) {
+    return this.select(selector, true)
+  }
+
+  selectViewport () {
+    // todo rn 这块实现不了
+    return this.select('')
+  }
+}

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

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail, isBrowser, throwSSRWarning } from '../../../../common/js'
+import { successHandle, failHandle, isBrowser, throwSSRWarning } from '../../../../common/js'
 
 export function getNetworkType ({ success, fail = () => {}, complete = () => {} } = {}) {
   if (!isBrowser) {
@@ -7,11 +7,11 @@ export function getNetworkType ({ success, fail = () => {}, complete = () => {}
   }
   try {
     if (navigator.connection) {
-      webHandleSuccess({ networkType: navigator.connection.effectiveType }, success, complete)
+      successHandle({ networkType: navigator.connection.effectiveType }, success, complete)
     } else {
-      webHandleSuccess({ networkType: 'unknown' }, success, complete)
+      successHandle({ networkType: 'unknown' }, success, complete)
     }
   } catch (err) {
-    webHandleFail(err, fail, complete)
+    failHandle(err, fail, complete)
   }
 }

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

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail, defineUnsupportedProps } from '../../../../common/js'
+import { successHandle, failHandle, defineUnsupportedProps } from '../../../../common/js'
 import NetInfo, { NetInfoStateType } from '@react-native-community/netinfo'
 
 let _unsubscribe = null
@@ -21,12 +21,12 @@ const getNetworkType = function (options) {
       errMsg: 'getNetworkType:ok'
     }
     defineUnsupportedProps(result, ['signalStrength', 'hasSystemProxy'])
-    webHandleSuccess(result, success, complete)
+    successHandle(result, success, complete)
   }).catch((err) => {
     const result = {
       errMsg: err.message
     }
-    webHandleFail(result, fail, complete)
+    failHandle(result, fail, complete)
   })
 }
 

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

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail, createDom, warn, bindTap, getRootElement } from '../../../common/js'
+import { successHandle, failHandle, createDom, warn, bindTap, getRootElement } from '../../../common/js'
 import '../../../common/stylus/Preview.styl'
 /**
  * Preview class for displaying images in a slideshow format.
@@ -67,9 +67,9 @@ export default class Preview {
       }))))
       this.maxIndex = urls.length
       this.updateTextTip()
-      webHandleSuccess({ errMsg: 'previewImage:ok' }, success, complete)
+      successHandle({ errMsg: 'previewImage:ok' }, success, complete)
     } catch (e) {
-      webHandleFail({ errMsg: 'previewImage:fail', err: e }, fail, complete)
+      failHandle({ errMsg: 'previewImage:fail', err: e }, fail, complete)
     }
   }
 

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

@@ -0,0 +1,31 @@
+import { ENV_OBJ, changeOpts, handleSuccess, defineUnsupportedProps } from '../../../common/js'
+
+function getLocation (options = {}) {
+  const opts = Object.assign(options, {
+    type: 0 // 只获取经纬与微信拉齐
+  })
+  handleSuccess(opts, res => {
+    const result = changeOpts(
+      res,
+      { errMsg: 'getLocation:ok' }
+    )
+    defineUnsupportedProps(result, ['speed'])
+    return result
+  })
+  return ENV_OBJ.getLocation(opts)
+}
+
+function openLocation (options = {}) {
+  const opts = Object.assign({
+    scale: 15 // 地图缩放比例兜底值
+  }, options)
+  return ENV_OBJ.openLocation(opts)
+}
+
+const chooseLocation = ENV_OBJ.chooseLocation
+
+export {
+  getLocation,
+  openLocation,
+  chooseLocation
+}

package/src/platform/api/location/index.android.js

@@ -0,0 +1 @@
+export * from './index.ios'

package/src/platform/api/location/index.ios.js

@@ -0,0 +1,31 @@
+import GetLocation from 'react-native-get-location'
+import { envError, successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
+
+const getLocation = function (options) {
+  const { isHighAccuracy = false, success, fail, complete } = options
+  GetLocation.getCurrentPosition({
+    enableHighAccuracy: isHighAccuracy
+  }).then(location => {
+    Object.assign(location, {
+      errMsg: 'getLocation:ok'
+    })
+    defineUnsupportedProps(location, ['horizontalAccuracy'])
+    successHandle(location, success, complete)
+  })
+  .catch(error => {
+    const result = {
+      errMsg: `getLocation:fail ${error}`
+    }
+    failHandle(result, fail, complete)
+  })
+}
+
+const openLocation = envError('openLocation')
+
+const chooseLocation = envError('chooseLocation')
+
+export {
+  getLocation,
+  openLocation,
+  chooseLocation
+}

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

@@ -0,0 +1,13 @@
+import { ENV_OBJ, envError } from '../../../common/js'
+
+const getLocation = ENV_OBJ.getLocation || envError('getLocation')
+
+const openLocation = ENV_OBJ.openLocation || envError('openLocation')
+
+const chooseLocation = ENV_OBJ.chooseLocation || envError('chooseLocation')
+
+export {
+  getLocation,
+  openLocation,
+  chooseLocation
+}

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

@@ -0,0 +1,36 @@
+import { envError, successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
+
+const getLocation = function (options) {
+  const { isHighAccuracy = false, success, fail, complete } = options
+  if (navigator.geolocation.getCurrentPosition) {
+    navigator.geolocation.getCurrentPosition((res = {}) => {
+      const coords = res.coords || {}
+      const result = {
+        accuracy: coords.accuracy,
+        errMsg: 'getLocation:ok',
+        latitude: coords.latitude,
+        longitude: coords.longitude,
+        speed: coords.accuracy
+      }
+      defineUnsupportedProps(result, ['horizontalAccuracy', 'verticalAccuracy'])
+      successHandle(result, success, complete)
+    }, (err) => {
+      const result = {
+        errMsg: `getLocation:fail ${err}`
+      }
+      failHandle(result, fail, complete)
+    }, {
+      enableHighAccuracy: isHighAccuracy
+    })
+  }
+}
+
+const openLocation = envError('openLocation')
+
+const chooseLocation = envError('chooseLocation')
+
+export {
+  getLocation,
+  openLocation,
+  chooseLocation
+}

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

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { successHandle, failHandle } from '../../../common/js'
 import { Linking } from 'react-native'
 
 const makePhoneCall = function (options) {
@@ -13,12 +13,12 @@ const makePhoneCall = function (options) {
     const result = {
       errMsg: 'makePhoneCall:ok'
     }
-    webHandleSuccess(result, success, complete)
+    successHandle(result, success, complete)
   }).catch(() => {
     const result = {
       errMsg: 'makePhoneCall:fail cancel'
     }
-    webHandleFail(result, fail, complete)
+    failHandle(result, fail, complete)
   })
 }
 

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

@@ -1,4 +1,4 @@
-import { createDom, getRootElement, webHandleSuccess } from '../../../common/js'
+import { createDom, getRootElement, successHandle, failHandle } from '../../../common/js'
 import '../../../common/stylus/Modal.styl'
 // import { forEach } from '@didi/mpx-fetch/src/util'
 // 汉字为两个字符，字母/数字为一个字符
@@ -23,9 +23,9 @@ export default class Modal {
       cancelColor: '#000000',
       confirmText: '确定',
       confirmColor: '#576B95',
-      success: (...args) => {},
-      fail: (...args) => {},
-      complete: (...args) => {}
+      success: (...args) => { },
+      fail: (...args) => { },
+      complete: (...args) => { }
     }
 
     this.hideTimer = null
@@ -44,21 +44,18 @@ export default class Modal {
   }
 
   show (options = {}) {
-    getRootElement().appendChild(this.modal)
-    if (options.confirmText && _getLength(options.confirmText) > 8) {
-      // eslint-disable-next-line
-      return Promise.reject({errMsg: 'showModal:fail confirmText length should not larger than 4 Chinese characters'})
+    const opts = Object.assign({}, this.defaultOpts, options)
+    if (opts.confirmText && _getLength(opts.confirmText) > 8) {
+      return failHandle({ errMsg: 'showModal:fail confirmText length should not larger than 4 Chinese characters' }, opts.fail, opts.complete)
     }
-    if (options.cancelText && _getLength(options.cancelText) > 8) {
-      // eslint-disable-next-line
-      return Promise.reject({errMsg: 'showModal:fail cancelText length should not larger than 4 Chinese characters'})
+    if (opts.cancelText && _getLength(opts.cancelText) > 8) {
+      return failHandle({ errMsg: 'showModal:fail cancelText length should not larger than 4 Chinese characters' }, opts.fail, opts.complete)
     }
+    getRootElement().appendChild(this.modal)
     if (this.hideTimer) {
       clearTimeout(this.hideTimer)
       this.hideTimer = null
     }
-    const opts = Object.assign({}, this.defaultOpts, options)
-
     this.title.textContent = opts.title
     this.content.textContent = opts.content
 
@@ -80,7 +77,7 @@ export default class Modal {
         cancel: true,
         confirm: false
       }
-      webHandleSuccess(result, opts.success, opts.complete)
+      successHandle(result, opts.success, opts.complete)
     }
     this.confirmBtn.onclick = () => {
       this.hide()
@@ -89,7 +86,7 @@ export default class Modal {
         cancel: false,
         confirm: true
       }
-      webHandleSuccess(result, opts.success, opts.complete)
+      successHandle(result, opts.success, opts.complete)
     }
 
     this.modal.classList.add('show')

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

@@ -0,0 +1 @@
+export * from './rnModal'

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

@@ -0,0 +1 @@
+export * from './rnModal'

package/src/platform/api/modal/rnModal.jsx

@@ -0,0 +1,149 @@
+import { View, Dimensions, Text, StyleSheet, TouchableOpacity, ScrollView } from 'react-native'
+import { successHandle, failHandle } from '../../../common/js'
+import { Portal } from '@ant-design/react-native'
+const { width, height } = Dimensions.get('window')
+const showModal = function (options) {
+  const {
+    title,
+    content,
+    showCancel = true,
+    cancelText = '取消',
+    cancelColor = '#000000',
+    confirmText = '确定',
+    confirmColor = '#576B95',
+    editable = false,
+    placeholderText,
+    success,
+    fail,
+    complete
+  } = options
+  const modalWidth = width - 60
+  const styles = StyleSheet.create({
+    modalTask: {
+      width,
+      height,
+      justifyContent: 'center',
+      alignItems: 'center',
+      backgroundColor: 'rgba(0,0,0,0.6)',
+      position: 'absolute'
+    },
+    modalContent: {
+      paddingTop: 20,
+      width: modalWidth,
+      backgroundColor: '#ffffff',
+      borderRadius: 15,
+      justifyContent: 'center',
+      alignItems: 'center'
+    },
+    modalTitleText: {
+      fontSize: 18,
+      fontWeight: 'bold',
+      paddingLeft: 20,
+      paddingRight: 20
+    },
+    contentBox: {
+      maxHeight: height * 0.45,
+      marginTop: 10
+    },
+    modalContentText: {
+      fontSize: 16,
+      lineHeight: 26,
+      color: '#808080',
+      paddingLeft: 20,
+      paddingRight: 20
+    },
+    modalBtnBox: {
+      borderTopWidth: StyleSheet.hairlineWidth,
+      borderTopColor: 'rgba(0,0,0,0.2)',
+      borderStyle: 'solid',
+      marginTop: 25,
+      width: '100%',
+      display: 'flex',
+      flexDirection: 'row'
+    },
+    modalBtn: {
+      flex: 1,
+      textAlign: 'center',
+      paddingTop: 10,
+      paddingBottom: 10,
+    },
+    modalButton: {
+      width: '100%',
+      fontWeight: 'bold',
+      textAlign: 'center'
+    },
+    cancelStyle: {
+      borderRightWidth: StyleSheet.hairlineWidth,
+      borderRightColor: 'rgba(0,0,0,0.2)',
+      borderStyle: 'solid',
+    }
+  })
+  let modalKey
+  let ModalView
+  let modalTitle = []
+  let modalContent = []
+  let modalButton = [{
+    text: confirmText,
+    confirmColor,
+    type: 'confirm',
+    color: 'rgb(87, 107, 149)'
+  }]
+  const closeModal = function (buttonInfo) {
+    Portal.remove(modalKey)
+    modalKey = null
+    const result = {
+      errMsg: 'showModal:ok'
+    }
+    if (buttonInfo.type === 'confirm') {
+      Object.assign(result, {
+        confirm: true,
+        cancel: false,
+        content: null
+      })
+    } else {
+      Object.assign(result, {
+        confirm: false,
+        cancel: true
+      })
+    }
+    successHandle(result, success, complete)
+  }
+  if (title) {
+    modalTitle.push(title)
+  }
+  if (!editable && content) {
+    modalContent.push(content)
+  }
+  if (showCancel) {
+    modalButton.unshift({
+      text: cancelText,
+      cancelColor,
+      type: 'cancel',
+      style: styles.cancelStyle,
+      color: '#000000'
+    })
+  }
+  if (!editable) {
+    ModalView = <View style={styles.modalTask}>
+      <View style={styles.modalContent}>
+        {modalTitle.map((item, index) => <View key={index}><Text style={styles.modalTitleText}>{item}</Text></View>)}
+        {modalContent.map((item, index) => <ScrollView key={index} style={styles.contentBox}><Text style={styles.modalContentText}>{item}</Text></ScrollView>)}
+        <View style={styles.modalBtnBox}>
+          {modalButton.map((item, index) => <TouchableOpacity key={index} style={[ styles.modalBtn, item.style ]} onPress={() => closeModal(item)}><Text style={[styles.modalButton, { color: item.color }]}>{item.text}</Text></TouchableOpacity>)}
+        </View>
+      </View>
+    </View>
+  }
+  try {
+    modalKey = Portal.add(ModalView)
+  } catch (e) {
+    const result = {
+      errMsg: `showModal:fail invalid ${e}`
+    }
+    failHandle(result, fail, complete)
+  }
+}
+
+export {
+  showModal
+}

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

@@ -0,0 +1 @@
+export * from './index.ali'

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

@@ -0,0 +1 @@
+export * from './index.ali'

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

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail, isBrowser, throwSSRWarning } from '../../../common/js'
+import { successHandle, failHandle, isBrowser, throwSSRWarning } from '../../../common/js'
 import { nextTick } from '../next-tick'
 
 export function pageScrollTo (options) {
@@ -11,13 +11,13 @@ export function pageScrollTo (options) {
     const { success, fail, complete } = options
 
     if (!ms) {
-      return webHandleFail({
+      return failHandle({
         errMsg: 'pageScrollTo:fail'
       }, fail, complete)
     }
 
     ms.pageScrollTo(options)
-    webHandleSuccess({
+    successHandle({
       errMsg: 'pageScrollTo:ok'
     }, success, complete)
   })

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

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail, throwSSRWarning, isBrowser } from '../../../common/js'
+import { successHandle, failHandle, throwSSRWarning, isBrowser } from '../../../common/js'
 
 function stopPullDownRefresh (options = {}) {
   if (!isBrowser) {
@@ -22,10 +22,10 @@ function stopPullDownRefresh (options = {}) {
     }
     if (err) {
       const res = { errMsg: `stopPullDownRefresh:fail ${err}` }
-      webHandleFail(res, options.fail, options.complete)
+      failHandle(res, options.fail, options.complete)
     } else {
       const res = { errMsg: 'stopPullDownRefresh:ok' }
-      webHandleSuccess(res, options.success, options.complete)
+      successHandle(res, options.success, options.complete)
     }
   }
 }
@@ -52,10 +52,10 @@ function startPullDownRefresh (options = {}) {
     }
     if (err) {
       const res = { errMsg: `startPullDownRefresh:fail ${err}` }
-      webHandleFail(res, options.fail, options.complete)
+      failHandle(res, options.fail, options.complete)
     } else {
       const res = { errMsg: 'startPullDownRefresh:ok' }
-      webHandleSuccess(res, options.success, options.complete)
+      successHandle(res, options.success, options.complete)
     }
   }
 }

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

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { webHandleSuccess, webHandleFail, defineUnsupportedProps } from '../../../common/js'
+import { successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
 import RequestTask from './RequestTask'
 
 function request (options = { url: '' }) {
@@ -70,7 +70,7 @@ function request (options = { url: '' }) {
       header: res.headers
     }
     defineUnsupportedProps(result, ['cookies', 'profile', 'exception'])
-    webHandleSuccess(result, success, complete)
+    successHandle(result, success, complete)
     return result
   }).catch(err => {
     const response = err?.response || {}
@@ -80,10 +80,7 @@ function request (options = { url: '' }) {
       header: response.headers,
       data: response.data
     }
-    webHandleFail(res, fail, complete)
-    if (!fail) {
-      return Promise.reject(res)
-    }
+    failHandle(res, fail, complete)
   })
 
   return requestTask

package/src/platform/api/route/index.ios.js

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { successHandle, failHandle } from '../../../common/js'
 import { parseQuery } from '@mpxjs/utils'
 
 function parseUrl (url) {
@@ -58,11 +58,11 @@ function navigateTo (options = {}) {
     navigation.push(finalPath, queryObj)
     navigationHelper.lastSuccessCallback = () => {
       const res = { errMsg: 'navigateTo:ok' }
-      webHandleSuccess(res, options.success, options.complete)
+      successHandle(res, options.success, options.complete)
     }
     navigationHelper.lastFailCallback = (msg) => {
       const res = { errMsg: `navigateTo:fail ${msg}` }
-      webHandleFail(res, options.fail, options.complete)
+      failHandle(res, options.fail, options.complete)
     }
   }
 }
@@ -77,11 +77,11 @@ function redirectTo (options = {}) {
     navigation.replace(finalPath, queryObj)
     navigationHelper.lastSuccessCallback = () => {
       const res = { errMsg: 'redirectTo:ok' }
-      webHandleSuccess(res, options.success, options.complete)
+      successHandle(res, options.success, options.complete)
     }
     navigationHelper.lastFailCallback = (msg) => {
       const res = { errMsg: `redirectTo:fail ${msg}` }
-      webHandleFail(res, options.fail, options.complete)
+      failHandle(res, options.fail, options.complete)
     }
   }
 }
@@ -93,11 +93,11 @@ function navigateBack (options = {}) {
     navigation.pop(options.delta || 1)
     navigationHelper.lastSuccessCallback = () => {
       const res = { errMsg: 'navigateBack:ok' }
-      webHandleSuccess(res, options.success, options.complete)
+      successHandle(res, options.success, options.complete)
     }
     navigationHelper.lastFailCallback = (msg) => {
       const res = { errMsg: `navigateBack:fail ${msg}` }
-      webHandleFail(res, options.fail, options.complete)
+      failHandle(res, options.fail, options.complete)
     }
   }
 }
@@ -120,11 +120,11 @@ function reLaunch (options = {}) {
     })
     navigationHelper.lastSuccessCallback = () => {
       const res = { errMsg: 'redirectTo:ok' }
-      webHandleSuccess(res, options.success, options.complete)
+      successHandle(res, options.success, options.complete)
     }
     navigationHelper.lastFailCallback = (msg) => {
       const res = { errMsg: `redirectTo:fail ${msg}` }
-      webHandleFail(res, options.fail, options.complete)
+      failHandle(res, options.fail, options.complete)
     }
   }
 }