@tarojs/taro-h5 3.4.4 → 3.4.7

package/src/api/location/getLocation.ts

@@ -0,0 +1,80 @@
+import Taro from '@tarojs/api'
+import { processOpenApi, shouldBeObject } from '../utils'
+import { MethodHandler } from '../utils/handler'
+
+const getLocationByW3CApi: (options: Taro.getLocation.Option) => Promise<Taro.getLocation.SuccessCallbackResult> = (options: Taro.getLocation.Option): Promise<Taro.getLocation.SuccessCallbackResult> => {
+  // 断言 options 必须是 Object
+  const isObject = shouldBeObject(options)
+  if (!isObject.flag) {
+    const res = { errMsg: `getLocation:fail ${isObject.msg}` }
+    console.error(res.errMsg)
+    return Promise.reject(res)
+  }
+
+  // 解构回调函数
+  const { success, fail, complete } = options
+
+  const handle = new MethodHandler({ name: 'getLocation', success, fail, complete })
+
+  // const defaultMaximumAge = 5 * 1000
+
+  const positionOptions: PositionOptions = {
+    enableHighAccuracy: options.isHighAccuracy || (options.altitude != null), // 海拔定位需要高精度
+    // maximumAge: defaultMaximumAge, // 允许取多久以内的缓存位置
+    timeout: options.highAccuracyExpireTime // 高精度定位超时时间
+  }
+
+  // Web端API实现暂时仅支持GPS坐标系
+  if (options.type?.toUpperCase() !== 'WGS84') {
+    return handle.fail({
+      errMsg: 'This coordinate system type is not temporarily supported'
+    })
+  }
+
+  // 判断当前浏览器是否支持位置API
+  const geolocationSupported = navigator.geolocation
+
+  if (!geolocationSupported) {
+    return handle.fail({
+      errMsg: 'The current browser does not support this feature'
+    })
+  }
+
+  // 开始获取位置
+  return new Promise<Taro.getLocation.SuccessCallbackResult>(
+    (resolve, reject) => {
+      navigator.geolocation.getCurrentPosition(
+        (position) => {
+          const result: Taro.getLocation.SuccessCallbackResult = {
+            /** 位置的精确度 */
+            accuracy: position.coords.accuracy,
+            /** 高度，单位 m */
+            altitude: position.coords.altitude!,
+            /** 水平精度，单位 m */
+            horizontalAccuracy: position.coords.accuracy,
+            /** 纬度，范围为 -90~90，负数表示南纬 */
+            latitude: position.coords.latitude,
+            /** 经度，范围为 -180~180，负数表示西经 */
+            longitude: position.coords.longitude,
+            /** 速度，单位 m/s */
+            speed: position.coords.speed!,
+            /** 垂直精度，单位 m（Android 无法获取，返回 0） */
+            verticalAccuracy: position.coords.altitudeAccuracy || 0,
+            /** 调用结果,自动补充 */
+            errMsg: ''
+          }
+          handle.success(result, resolve)
+        },
+        (error) => {
+          handle.fail({ errMsg: error.message }, reject)
+        },
+        positionOptions
+      )
+    }
+  )
+}
+
+export const getLocation = processOpenApi({
+  name: 'getLocation',
+  standardMethod: getLocationByW3CApi
+})

package/src/api/location/index.ts

@@ -5,15 +5,18 @@ export const stopLocationUpdate = temporarilyNotSupport('stopLocationUpdate')
 export const startLocationUpdateBackground = temporarilyNotSupport('startLocationUpdateBackground')
 export const startLocationUpdate = temporarilyNotSupport('startLocationUpdate')
 
-export const openLocation = processOpenApi('openLocation', { scale: 18 })
+export const openLocation = processOpenApi({
+  name: 'openLocation',
+  defaultOptions: { scale: 18 }
+})
 
 export const onLocationChangeError = temporarilyNotSupport('onLocationChangeError')
 export const onLocationChange = temporarilyNotSupport('onLocationChange')
 export const offLocationChangeError = temporarilyNotSupport('offLocationChangeError')
 export const offLocationChange = temporarilyNotSupport('offLocationChange')
 
-export const getLocation = processOpenApi('getLocation')
+export { getLocation } from './getLocation'
 
 export const choosePoi = temporarilyNotSupport('choosePoi')
 
-export * from './chooseLocation'
+export { chooseLocation } from './chooseLocation'

package/src/api/media/image/chooseImage.ts

@@ -15,12 +15,21 @@ export const chooseImage: typeof Taro.chooseImage = function (options) {
     return Promise.reject(res)
   }
 
-  const { count = 1, success, fail, complete, imageId = 'taroChooseImage' } = options
+  const {
+    count = 1,
+    success,
+    fail,
+    complete,
+    imageId = 'taroChooseImage',
+    sourceType = ['album', 'camera']
+  } = options
   const handle = new MethodHandler({ name: 'chooseImage', success, fail, complete })
   const res: Partial<Taro.chooseImage.SuccessCallbackResult> = {
     tempFilePaths: [],
     tempFiles: []
   }
+  const sourceTypeString = sourceType && sourceType.toString()
+  const acceptableSourceType = ['user', 'environment', 'camera']
 
   if (count && typeof count !== 'number') {
     res.errMsg = getParameterError({
@@ -39,6 +48,9 @@ export const chooseImage: typeof Taro.chooseImage = function (options) {
     if (count > 1) {
       obj.setAttribute('multiple', 'multiple')
     }
+    if (acceptableSourceType.indexOf(sourceTypeString) > -1) {
+      obj.setAttribute('capture', sourceTypeString)
+    }
     obj.setAttribute('accept', 'image/*')
     obj.setAttribute('style', 'position: fixed; top: -4000px; left: -3000px; z-index: -300;')
     document.body.appendChild(obj)
@@ -49,6 +61,11 @@ export const chooseImage: typeof Taro.chooseImage = function (options) {
     } else {
       el.removeAttribute('multiple')
     }
+    if (acceptableSourceType.indexOf(sourceTypeString) > -1) {
+      el.setAttribute('capture', sourceTypeString)
+    } else {
+      el.removeAttribute('capture')
+    }
   }
 
   return new Promise(resolve => {

package/src/api/media/image/getImageInfo.ts

@@ -15,14 +15,29 @@ export const getImageInfo: typeof Taro.getImageInfo = (options) => {
     return Promise.reject(res)
   }
 
+  const getBase64Image = (image: HTMLImageElement) => {
+    try {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d')
+      ctx?.drawImage(image, 0, 0, image.width, image.height)
+      return canvas.toDataURL('image/png')
+    } catch (e) {
+      console.error('getImageInfo:get base64 fail', e)
+    }
+  }
+
   const { src, success, fail, complete } = options
   const handle = new MethodHandler({ name: 'getImageInfo', success, fail, complete })
   return new Promise((resolve, reject) => {
     const image = new Image()
+    image.crossOrigin = ''
     image.onload = () => {
       handle.success({
         width: image.naturalWidth,
-        height: image.naturalHeight
+        height: image.naturalHeight,
+        path: getBase64Image(image) || src
       }, resolve)
     }
     image.onerror = (e: any) => {

package/src/api/network/request/index.ts

@@ -86,6 +86,10 @@ function _request (options) {
   params.credentials = options.credentials
   return fetch(url, params)
     .then(response => {
+      if (!response) {
+        const errorResponse = { ok: false }
+        throw errorResponse
+      }
       res.statusCode = response.status
       res.header = {}
       for (const key of response.headers.keys()) {

package/src/api/utils/index.ts

@@ -104,7 +104,7 @@ export function temporarilyNotSupport (apiName) {
 
 export function weixinCorpSupport (apiName) {
   return () => {
-    const errMsg = `h5端仅在微信公众号中支持 API ${apiName}`
+    const errMsg = `h5端当前仅在微信公众号JS-SDK环境下支持此 API ${apiName}`
     if (process.env.NODE_ENV !== 'production') {
       console.error(errMsg)
       return Promise.reject({
@@ -146,30 +146,46 @@ export const isValidColor = (color) => {
   return VALID_COLOR_REG.test(color)
 }
 
-export function processOpenApi (apiName: string, defaultOptions?: Record<string, unknown>, formatResult = res => res, formatParams = options => options) {
-  // @ts-ignore
-  if (!window.wx) {
-    return weixinCorpSupport(apiName)
-  }
-  return options => {
-    options = options || {}
-    const obj = Object.assign({}, defaultOptions, options)
-    const p = new Promise((resolve, reject) => {
-      ['fail', 'success', 'complete'].forEach(k => {
-        obj[k] = oriRes => {
-          const res = formatResult(oriRes)
-          options[k] && options[k](res)
-          if (k === 'success') {
-            resolve(res)
-          } else if (k === 'fail') {
-            reject(res)
+interface IProcessOpenApi<TOptions = Record<string, unknown>, TResult extends TaroGeneral.CallbackResult = any> {
+  name: string
+  defaultOptions?: TOptions
+  standardMethod?: (opts: TOptions) => Promise<TResult>
+  formatOptions?: (opts: TOptions) => TOptions
+  formatResult?: (res: TResult) => TResult
+}
+
+export function processOpenApi<TOptions = Record<string, unknown>, TResult extends TaroGeneral.CallbackResult = any> ({
+  name,
+  defaultOptions,
+  standardMethod,
+  formatOptions = options => options,
+  formatResult = res => res
+}: IProcessOpenApi<TOptions, TResult>) {
+  const notSupported = weixinCorpSupport(name)
+  return (options: Partial<TOptions> = {}): Promise<TResult> => {
+    // @ts-ignore
+    const targetApi = window?.wx?.[name]
+    const opts = formatOptions(Object.assign({}, defaultOptions, options))
+    if (typeof targetApi === 'function') {
+      return new Promise<TResult>((resolve, reject) => {
+        ['fail', 'success', 'complete'].forEach(k => {
+          opts[k] = preRef => {
+            const res = formatResult(preRef)
+            options[k] && options[k](res)
+            if (k === 'success') {
+              resolve(res)
+            } else if (k === 'fail') {
+              reject(res)
+            }
           }
-        }
+          return targetApi(opts)
+        })
       })
-      // @ts-ignore
-      wx[apiName](formatParams(obj))
-    })
-    return p
+    } else if (typeof standardMethod === 'function') {
+      return standardMethod(opts)
+    } else {
+      return notSupported() as Promise<TResult>
+    }
   }
 }