@tarojs/taro-h5 3.4.0-beta.2 → 3.4.2

package/src/api/location/chooseLocation.ts

@@ -28,13 +28,13 @@ function createLocationChooser (handler, key = LOCATION_APIKEY) {
   }
 
   function back () {
-    handler({ errMsg: 'cancel' })
     hide()
+    handler({ errMsg: 'cancel' })
   }
 
   function submit () {
-    handler()
     hide()
+    handler()
   }
 
   function remove () {

package/src/api/media/{editor.ts → EditorContext.ts}

@@ -11,6 +11,8 @@ export class EditorContext implements Taro.EditorContext {
 
   getContents = temporarilyNotSupport('EditorContext.getContents')
 
+  getSelectionText = temporarilyNotSupport('EditorContext.getSelectionText')
+
   insertDivider = temporarilyNotSupport('EditorContext.insertDivider')
 
   insertImage = temporarilyNotSupport('EditorContext.insertImage')

package/src/api/media/audio/InnerAudioContext.ts

@@ -0,0 +1,98 @@
+import Taro from '@tarojs/api'
+import { permanentlyNotSupport } from '../../utils'
+import { CallbackManager } from '../../utils/handler'
+
+export class InnerAudioContext implements Taro.InnerAudioContext {
+  Instance?: HTMLAudioElement
+  errorStack: CallbackManager
+  stopStack: CallbackManager
+  __startTime = 0
+
+  constructor () {
+    this.Instance = new Audio()
+    this.errorStack = new CallbackManager()
+    this.stopStack = new CallbackManager()
+
+    Taro.eventCenter.on('__taroRouterChange', () => { this.stop() })
+    this.onPlay(() => {
+      if (this.currentTime !== this.startTime) {
+        this.seek(this.startTime)
+      }
+    })
+  }
+
+  set autoplay (e) { this.setProperty('autoplay', e) }
+  get autoplay () { return this.Instance?.autoplay || false }
+  get buffered () { return this.Instance?.buffered.length || 0 }
+  get currentTime () { return this.Instance?.currentTime || 0 }
+  get duration () { return this.Instance?.duration || 0 }
+  set loop (e) { this.setProperty('loop', e) }
+  get loop () { return this.Instance?.loop || false }
+  get paused () { return this.Instance?.paused || true }
+  set src (e) { this.setProperty('src', e) }
+  get src () { return this.Instance?.src || '' }
+  set volume (e) { this.setProperty('volume', e) }
+  get volume () { return this.Instance?.volume || 0 }
+  set playbackRate (e) { this.setProperty('playbackRate', e) }
+  get playbackRate () { return this.Instance?.playbackRate || 0 }
+  set obeyMuteSwitch (_e) { permanentlyNotSupport('InnerAudioContext.obeyMuteSwitch')() }
+  get obeyMuteSwitch () { return true }
+  set startTime (e) { this.__startTime = e }
+  get startTime () { return this.__startTime || 0 }
+  set referrerPolicy (e) { this.Instance?.setAttribute('referrerpolicy', e) }
+  get referrerPolicy () { return this.Instance?.getAttribute('referrerpolicy') || 'origin' }
+
+  private setProperty (key: string, value: unknown) {
+    if (this.Instance) {
+      this.Instance[key] = value
+    }
+  }
+
+  play = () => this.Instance?.play()
+
+  pause = () => this.Instance?.pause()
+
+  stop = () => {
+    this.pause()
+    this.seek(0)
+    this.stopStack.trigger()
+  }
+
+  seek = (position: number) => {
+    if (this.Instance) {
+      this.Instance.currentTime = position
+    }
+  }
+
+  /**
+   * @TODO destroy得并不干净
+   */
+  destroy = () => {
+    this.stop()
+    if (this.Instance) {
+      document.body.removeChild(this.Instance)
+      this.Instance = undefined
+    }
+  }
+
+  onCanplay = (callback = () => {}) => this.Instance?.addEventListener('canplay', callback)
+  onPlay = (callback = () => {}) => this.Instance?.addEventListener('play', callback)
+  onPause = (callback = () => {}) => this.Instance?.addEventListener('pause', callback)
+  onStop = (callback = () => {}) => this.stopStack.add(callback)
+  onEnded = (callback = () => {}) => this.Instance?.addEventListener('ended', callback)
+  onTimeUpdate = (callback = () => {}) => this.Instance?.addEventListener('timeupdate', callback)
+  onError = (callback?: ((res: Taro.InnerAudioContext.onErrorDetail) => void)) => this.errorStack.add(callback)
+  onWaiting = (callback = () => {}) => this.Instance?.addEventListener('waiting', callback)
+  onSeeking = (callback = () => {}) => this.Instance?.addEventListener('seeking', callback)
+  onSeeked = (callback = () => {}) => this.Instance?.addEventListener('seeked', callback)
+  offCanplay = (callback = () => {}) => this.Instance?.removeEventListener('canplay', callback)
+  offPlay = (callback = () => {}) => this.Instance?.removeEventListener('play', callback)
+  offPause = (callback = () => {}) => this.Instance?.removeEventListener('pause', callback)
+  offStop = (callback = () => {}) => this.stopStack.remove(callback)
+  offEnded = (callback = () => {}) => this.Instance?.removeEventListener('ended', callback)
+  offTimeUpdate = (callback = () => {}) => this.Instance?.removeEventListener('timeupdate', callback)
+  offError = (callback = () => {}) => this.errorStack.remove(callback)
+  offWaiting = (callback = () => {}) => this.Instance?.removeEventListener('waiting', callback)
+  offSeeking = (callback = () => {}) => this.Instance?.removeEventListener('seeking', callback)
+  offSeeked = (callback = () => {}) => this.Instance?.removeEventListener('seeked', callback)
+}

package/src/api/media/audio/index.ts

@@ -1,93 +1,8 @@
 import Taro from '@tarojs/api'
 import { temporarilyNotSupport } from '../../utils'
-import { CallbackManager } from '../../utils/handler'
+import { InnerAudioContext } from './InnerAudioContext'
 
 // 音频
-class InnerAudioContext implements Taro.InnerAudioContext {
-  Instance?: HTMLAudioElement
-  errorStack: CallbackManager
-  stopStack: CallbackManager
-
-  constructor () {
-    this.Instance = new Audio()
-    this.errorStack = new CallbackManager()
-    this.stopStack = new CallbackManager()
-
-    Taro.eventCenter.on('__taroRouterChange', () => { this.stop() })
-  }
-
-  set autoplay (e) { this.setProperty('autoplay', e) }
-  get autoplay () { return this.Instance?.autoplay || false }
-  get buffered () { return this.Instance?.buffered.length || 0 }
-  get currentTime () { return this.Instance?.currentTime || 0 }
-  get duration () { return this.Instance?.duration || 0 }
-  set loop (e) { this.setProperty('loop', e) }
-  get loop () { return this.Instance?.loop || false }
-  get paused () { return this.Instance?.paused || true }
-  set src (e) { this.setProperty('src', e) }
-  get src () { return this.Instance?.src || '' }
-  set volume (e) { this.setProperty('volume', e) }
-  get volume () { return this.Instance?.volume || 0 }
-  set playbackRate (e) { this.setProperty('playbackRate', e) }
-  get playbackRate () { return this.Instance?.volume || 0 }
-  get obeyMuteSwitch () { return true }
-  set startTime (e) { this.setProperty('startTime', e) }
-  get startTime () { return this.Instance?.volume || 0 }
-
-  private setProperty (key: string, value: unknown) {
-    if (this.Instance) {
-      this.Instance[key] = value
-    }
-  }
-
-  play = () => this.Instance?.play()
-
-  pause = () => this.Instance?.pause()
-
-  stop = () => {
-    this.pause()
-    this.seek(0)
-    this.stopStack.trigger()
-  }
-
-  seek = (position: number) => {
-    if (this.Instance) {
-      this.Instance.currentTime = position
-    }
-  }
-
-  /**
-   * @TODO destroy得并不干净
-   */
-  destroy = () => {
-    this.stop()
-    if (this.Instance) {
-      document.body.removeChild(this.Instance)
-      this.Instance = undefined
-    }
-  }
-
-  onCanplay = (callback = () => {}) => this.Instance?.addEventListener('oncanplay', callback)
-  onPlay = (callback = () => {}) => this.Instance?.addEventListener('onplay', callback)
-  onPause = (callback = () => {}) => this.Instance?.addEventListener('onpause', callback)
-  onStop = (callback = () => {}) => this.stopStack.add(callback)
-  onEnded = (callback = () => {}) => this.Instance?.addEventListener('onended', callback)
-  onTimeUpdate = (callback = () => {}) => this.Instance?.addEventListener('ontimeUpdate', callback)
-  onError = (callback?: ((res: Taro.InnerAudioContext.onErrorDetail) => void)) => this.errorStack.add(callback)
-  onWaiting = (callback = () => {}) => this.Instance?.addEventListener('onwaiting', callback)
-  onSeeking = (callback = () => {}) => this.Instance?.addEventListener('onseeking', callback)
-  onSeeked = (callback = () => {}) => this.Instance?.addEventListener('onseeked', callback)
-  offCanplay = (callback = () => {}) => this.Instance?.removeEventListener('offcanplay', callback)
-  offPlay = (callback = () => {}) => this.Instance?.removeEventListener('offplay', callback)
-  offPause = (callback = () => {}) => this.Instance?.removeEventListener('offpause', callback)
-  offStop = (callback = () => {}) => this.stopStack.remove(callback)
-  offEnded = (callback = () => {}) => this.Instance?.removeEventListener('offended', callback)
-  offTimeUpdate = (callback = () => {}) => this.Instance?.removeEventListener('offtimeUpdate', callback)
-  offError = (callback = () => {}) => this.errorStack.remove(callback)
-  offWaiting = (callback = () => {}) => this.Instance?.removeEventListener('offwaiting', callback)
-  offSeeking = (callback = () => {}) => this.Instance?.removeEventListener('offseeking', callback)
-  offSeeked = (callback = () => {}) => this.Instance?.removeEventListener('offseeked', callback)
-}
 
 export const stopVoice = temporarilyNotSupport('stopVoice')
 export const setInnerAudioOption = temporarilyNotSupport('setInnerAudioOption')

package/src/api/media/background-audio/BackgroundAudioManager.ts

@@ -0,0 +1,103 @@
+import Taro from '@tarojs/api'
+import { permanentlyNotSupport } from '../../utils'
+import { CallbackManager } from '../../utils/handler'
+
+export class BackgroundAudioManager implements Taro.BackgroundAudioManager {
+  Instance?: HTMLAudioElement
+  errorStack: CallbackManager
+  stopStack: CallbackManager
+  __startTime = 0
+
+  constructor () {
+    this.Instance = new Audio()
+    this.errorStack = new CallbackManager()
+    this.stopStack = new CallbackManager()
+    this.Instance.autoplay = true
+    this.onPlay(() => {
+      if (this.currentTime !== this.startTime) {
+        this.seek(this.startTime)
+      }
+    })
+  }
+
+  set src (e) { this.setProperty('src', e) }
+  get src () { return this.Instance?.src || '' }
+  set startTime (e) { this.__startTime = e }
+  get startTime () { return this.__startTime || 0 }
+  set title (e) { this.dataset('title', e) }
+  get title () { return this.Instance?.dataset.title || '' }
+  set epname (e) { this.dataset('epname', e) }
+  get epname () { return this.Instance?.dataset.epname || '' }
+  set singer (e) { this.dataset('singer', e) }
+  get singer () { return this.Instance?.dataset.singer || '' }
+  set coverImgUrl (e) { this.dataset('coverImgUrl', e) }
+  get coverImgUrl () { return this.Instance?.dataset.coverImgUrl || '' }
+  set webUrl (e) { this.dataset('webUrl', e) }
+  get webUrl () { return this.Instance?.dataset.webUrl || '' }
+  set protocol (e) { this.dataset('protocol', e) }
+  get protocol () { return this.Instance?.dataset.protocol || '' }
+  set playbackRate (e) { this.setProperty('playbackRate', e) }
+  get playbackRate () { return this.Instance?.playbackRate || 0 }
+  get duration () { return this.Instance?.duration || 0 }
+  get currentTime () { return this.Instance?.currentTime || 0 }
+  get paused () { return this.Instance?.paused || false }
+  get buffered () { return this.Instance?.buffered.length || 0 }
+  set referrerPolicy (e) { this.Instance?.setAttribute('referrerpolicy', e) }
+  get referrerPolicy () { return this.Instance?.getAttribute('referrerpolicy') || 'origin' }
+
+  private setProperty (key: string, value: unknown) {
+    if (this.Instance) {
+      this.Instance[key] = value
+    }
+  }
+
+  private dataset (key: string, value: string) {
+    if (this.Instance) {
+      this.Instance.dataset[key] = value
+    }
+  }
+
+  play = () => this.Instance?.play()
+
+  pause = () => this.Instance?.pause()
+
+  seek = (position: number) => {
+    if (this.Instance) {
+      this.Instance.currentTime = position
+    }
+  }
+
+  stop = () => {
+    this.pause()
+    this.seek(0)
+    this.stopStack.trigger()
+  }
+
+  onCanplay = (callback = () => {}) => this.Instance?.addEventListener('canplay', callback)
+  onWaiting = (callback = () => {}) => this.Instance?.addEventListener('waiting', callback)
+  onError = (callback?: ((res: Taro.InnerAudioContext.onErrorDetail) => void)) => this.errorStack.add(callback)
+  onPlay = (callback = () => {}) => this.Instance?.addEventListener('play', callback)
+  onPause = (callback = () => {}) => this.Instance?.addEventListener('pause', callback)
+  onSeeking = (callback = () => {}) => this.Instance?.addEventListener('seeking', callback)
+  onSeeked = (callback = () => {}) => this.Instance?.addEventListener('seeked', callback)
+
+  onEnded = (callback = () => {}) => this.Instance?.addEventListener('ended', callback)
+  onStop = (callback = () => {}) => this.stopStack.add(callback)
+  onTimeUpdate = (callback = () => {}) => this.Instance?.addEventListener('timeupdate', callback)
+  onPrev = permanentlyNotSupport('BackgroundAudioManager.onPrev')
+  onNext = permanentlyNotSupport('BackgroundAudioManager.onNext')
+
+  offCanplay = (callback = () => {}) => this.Instance?.removeEventListener('canplay', callback)
+  offWaiting = (callback = () => {}) => this.Instance?.removeEventListener('waiting', callback)
+  offError = (callback = () => {}) => this.errorStack.remove(callback)
+  offPlay = (callback = () => {}) => this.Instance?.removeEventListener('play', callback)
+  offPause = (callback = () => {}) => this.Instance?.removeEventListener('pause', callback)
+  offSeeking = (callback = () => {}) => this.Instance?.removeEventListener('seeking', callback)
+  offSeeked = (callback = () => {}) => this.Instance?.removeEventListener('seeked', callback)
+
+  offEnded = (callback = () => {}) => this.Instance?.removeEventListener('ended', callback)
+  offStop = (callback = () => {}) => this.stopStack.remove(callback)
+  offTimeUpdate = (callback = () => {}) => this.Instance?.removeEventListener('timeupdate', callback)
+  offPrev = permanentlyNotSupport('BackgroundAudioManager.offPrev')
+  offNext = permanentlyNotSupport('BackgroundAudioManager.offNext')
+}

package/src/api/media/{background-audio.ts → background-audio/index.ts}

@@ -1,4 +1,5 @@
-import { temporarilyNotSupport } from '../utils'
+import { temporarilyNotSupport } from '../../utils'
+import { BackgroundAudioManager } from './BackgroundAudioManager'
 
 // 背景音频
 export const stopBackgroundAudio = temporarilyNotSupport('stopBackgroundAudio')
@@ -9,4 +10,8 @@ export const onBackgroundAudioStop = temporarilyNotSupport('onBackgroundAudioSto
 export const onBackgroundAudioPlay = temporarilyNotSupport('onBackgroundAudioPlay')
 export const onBackgroundAudioPause = temporarilyNotSupport('onBackgroundAudioPause')
 export const getBackgroundAudioPlayerState = temporarilyNotSupport('getBackgroundAudioPlayerState')
-export const getBackgroundAudioManager = temporarilyNotSupport('getBackgroundAudioManager')
+
+/**
+ * 获取全局唯一的背景音频管理器
+ */
+export const getBackgroundAudioManager = () => new BackgroundAudioManager()

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

@@ -1,4 +1,4 @@
-import Taro from '@tarojs/taro'
+import Taro from '@tarojs/api'
 
 import { shouldBeObject } from '../../utils'
 import { MethodHandler } from '../../utils/handler'
@@ -14,23 +14,12 @@ export const previewImage: typeof Taro.previewImage = async (options) => {
   function loadImage (url: string, loadFail: typeof fail): Promise<Node> {
     return new Promise((resolve) => {
       const item = document.createElement('taro-swiper-item-core')
-      item.style.cssText = `
-        display: flex;
-        align-items: start;
-        justify-content: center;
-        overflow-y: scroll;
-      `
+      item.style.cssText = 'display:flex;align-items:start;justify-content:center;overflow-y:scroll;'
       const image = new Image()
       image.style.maxWidth = '100%'
       image.src = url
       const div = document.createElement('div')
-      div.style.cssText = `
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        max-width: 100%;
-        min-height: 100%;
-      `
+      div.style.cssText = 'display:flex;align-items:center;justify-content:center;max-width:100%;min-height:100%;'
       div.appendChild(image)
       item.appendChild(div)
       // Note: 等待图片加载完后返回，会导致轮播被卡住
@@ -55,17 +44,7 @@ export const previewImage: typeof Taro.previewImage = async (options) => {
   const handle = new MethodHandler({ name: 'previewImage', success, fail, complete })
   const container = document.createElement('div')
   container.classList.add('preview-image')
-  container.style.cssText = `
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 1050;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    outline: 0;
-    background-color: #111;
-  `
+  container.style.cssText = 'position:fixed;top:0;left:0;z-index:1050;width:100%;height:100%;overflow:hidden;outline:0;background-color:#111;'
   container.addEventListener('click', () => {
     container.remove()
   })

package/src/api/media/index.ts

@@ -1,7 +1,6 @@
 export * from './audio'
 export * from './background-audio'
 export * from './camera'
-export * from './editor'
 export * from './image'
 export * from './live'
 export * from './map'

package/src/api/network/download.ts

@@ -114,7 +114,7 @@ const createDownloadTask = ({ url, header, success, error }): Taro.DownloadTask
  * 注意：请在服务端响应的 header 中指定合理的 Content-Type 字段，以保证客户端正确处理文件类型。
  */
 export const downloadFile: typeof Taro.downloadFile = ({ url, header, success, fail, complete }) => {
-  let task: Taro.DownloadTask
+  let task!: Taro.DownloadTask
   const result: ReturnType<typeof Taro.downloadFile> = new Promise((resolve, reject) => {
     task = createDownloadTask({
       url,
@@ -130,11 +130,11 @@ export const downloadFile: typeof Taro.downloadFile = ({ url, header, success, f
         reject(res)
       }
     })
-
-    result.headersReceive = task.onHeadersReceived
-    result.progress = task.onProgressUpdate
-    result.abort = task.abort
   }) as any
 
+  result.headersReceive = task.onHeadersReceived
+  result.progress = task.onProgressUpdate
+  result.abort = task.abort
+
   return result
 }

package/src/api/network/upload.ts

@@ -1,5 +1,4 @@
 import Taro from '@tarojs/api'
-import { temporarilyNotSupport } from '../utils'
 import { CallbackManager } from '../utils/handler'
 import {
   convertObjectUrlToBlob,
@@ -8,7 +7,7 @@ import {
   XHR_STATS
 } from './utils'
 
-const createUploadTask = ({ url, filePath, formData, name, header, timeout, fileName, success, error }): Taro.UploadTask => {
+const createUploadTask = ({ url, filePath, formData = {}, name, header, timeout, fileName, success, error }): Taro.UploadTask => {
   let timeoutInter
   let formKey
   const apiName = 'uploadFile'
@@ -125,17 +124,12 @@ const createUploadTask = ({ url, filePath, formData, name, header, timeout, file
    */
   const offProgressUpdate = callbackManager.progressUpdate.remove
 
-  const headersReceived = temporarilyNotSupport('UploadTask.headersReceived')
-  const progress = temporarilyNotSupport('UploadTask.progress')
-
   return {
     abort,
     onHeadersReceived,
     offHeadersReceived,
     onProgressUpdate,
-    offProgressUpdate,
-    headersReceived,
-    progress
+    offProgressUpdate
   }
 }
 
@@ -143,7 +137,7 @@ const createUploadTask = ({ url, filePath, formData, name, header, timeout, file
  * 将本地资源上传到服务器。客户端发起一个 HTTPS POST 请求，其中 content-type 为 multipart/form-data。使用前请注意阅读相关说明。
  */
 export const uploadFile: typeof Taro.uploadFile = ({ url, filePath, name, header, formData, timeout, fileName, success, fail, complete }) => {
-  let task: Taro.UploadTask
+  let task!: Taro.UploadTask
   const result: ReturnType<typeof Taro.uploadFile> = new Promise((resolve, reject) => {
     task = createUploadTask({
       url,
@@ -164,11 +158,11 @@ export const uploadFile: typeof Taro.uploadFile = ({ url, filePath, name, header
         reject(res)
       }
     })
-
-    result.headersReceive = task.onHeadersReceived
-    result.progress = task.onProgressUpdate
-    result.abort = task.abort
   }) as any
 
+  result.headersReceive = task.onHeadersReceived
+  result.progress = task.onProgressUpdate
+  result.abort = task.abort
+
   return result
 }

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

@@ -1,6 +1,6 @@
 import { SocketTask } from './socketTask'
 import { shouldBeObject, getParameterError } from '../../utils'
-import { MethodHandler } from 'src/api/utils/handler'
+import { MethodHandler } from '../../utils/handler'
 
 let socketTasks: SocketTask[] = []
 let socketsCounter = 1

package/src/api/ui/animation/index.ts

@@ -9,13 +9,17 @@ class StyleSheet {
     this.$style = document.createElement('style')
   }
 
-  $style: HTMLStyleElement
-  sheet?: CSSStyleSheet | null
+  $style?: HTMLStyleElement | null = null
+  sheet?: CSSStyleSheet | null = null
+
   appendStyleSheet = () => {
-    this.$style?.setAttribute('type', 'text/css')
-    this.$style?.setAttribute('data-type', 'Taro')
-    document.getElementsByTagName('head')[0].appendChild(this.$style)
-    this.sheet = this.$style?.sheet
+    if (this.$style) {
+      const head = document.getElementsByTagName('head')[0]
+      this.$style.setAttribute('type', 'text/css')
+      this.$style.setAttribute('data-type', 'Taro')
+      head.appendChild(this.$style)
+      this.sheet = this.$style.sheet
+    }
     if (this.sheet && !('insertRule' in this.sheet)) {
       console.warn('当前浏览器不支持 stylesheet.insertRule 接口')
     }
@@ -38,12 +42,7 @@ let TRANSITION_END = 'transitionend'
 let TRANSFORM = 'transform'
 
 const $detect = document.createElement('div')
-$detect.style.cssText = `
-  -webkit-animation-name: webkit;
-  -moz-animation-name: moz;
-  -ms-animation-name: ms;
-  animation-name: standard;
-`
+$detect.style.cssText = '-webkit-animation-name:webkit;-moz-animation-name:moz;-ms-animation-name:ms;animation-name:standard;'
 if ($detect.style['animation-name'] === 'standard') {
   // 支持标准写法
   TRANSITION_END = 'transitionend'

package/src/api/ui/fonts.ts

@@ -1,4 +1,63 @@
-import { temporarilyNotSupport } from '../utils'
+import Taro from '@tarojs/api'
+import { MethodHandler } from '../utils/handler'
 
 // 字体
-export const loadFontFace = temporarilyNotSupport('loadFontFace')
+export const loadFontFace: typeof Taro.loadFontFace = async options => {
+  options = Object.assign({ global: false }, options)
+  const { success, fail, complete, family, source, desc = {} } = options
+  const handle = new MethodHandler({ name: 'loadFontFace', success, fail, complete })
+  // @ts-ignore
+  const fonts = document.fonts
+  if (fonts) {
+    // @ts-ignore
+    const fontFace = new FontFace(family, source, desc)
+    try {
+      await fontFace.load()
+      fonts.add(fontFace)
+      return handle.success({})
+    } catch (error) {
+      return handle.fail({
+        errMsg: error.message || error
+      })
+    }
+  } else {
+    const style = document.createElement('style')
+    let innerText = `font-family:"${
+      family
+    }";src:${
+      source
+    };font-style:${
+      desc.style || 'normal'
+    };font-weight:${
+      desc.weight || 'normal'
+    };font-variant:${
+      desc.variant || 'normal'
+    };`
+
+    if (desc.ascentOverride) {
+      innerText += `ascent-override:${desc.ascentOverride};`
+    }
+    if (desc.descentOverride) {
+      innerText += `descent-override:${desc.descentOverride};`
+    }
+    if (desc.featureSettings) {
+      innerText += `font-feature-settings:${desc.featureSettings};`
+    }
+    if (desc.lineGapOverride) {
+      innerText += `line-gap-override:${desc.lineGapOverride};`
+    }
+    if (desc.stretch) {
+      innerText += `font-stretch:${desc.stretch};`
+    }
+    if (desc.unicodeRange) {
+      innerText += `unicode-range:${desc.unicodeRange};`
+    }
+    if (desc.variationSettings) {
+      innerText += `font-variation-settings:${desc.variationSettings};`
+    }
+
+    style.innerText = `@font-face{${innerText}}`
+    document.head.appendChild(style)
+    return handle.success()
+  }
+}

package/src/api/ui/interaction/index.ts

@@ -62,9 +62,9 @@ const showToast: typeof Taro.showToast = (options = { title: '' }) => {
 
   let errMsg = ''
   if (!toast.el) {
-    errMsg = toast.create(options, 'loading')
+    errMsg = toast.create(options, 'toast')
   } else {
-    errMsg = toast.show(options, 'loading')
+    errMsg = toast.show(options, 'toast')
   }
   return handle.success({ errMsg })
 }
@@ -167,7 +167,7 @@ const showModal: typeof Taro.showModal = async (options = {}) => {
 
   if (options.cancelText.replace(/[\u0391-\uFFE5]/g, 'aa').length > 8) {
     return handle.fail({
-      errMsg: 'showModal:fail cancelText length should not larger then 4 Chinese characters'
+      errMsg: 'cancelText length should not larger then 4 Chinese characters'
     })
   }
 
@@ -183,7 +183,7 @@ const showModal: typeof Taro.showModal = async (options = {}) => {
 
   if (options.confirmText.replace(/[\u0391-\uFFE5]/g, 'aa').length > 8) {
     return handle.fail({
-      errMsg: 'showModal:fail confirmText length should not larger then 4 Chinese characters'
+      errMsg: 'confirmText length should not larger then 4 Chinese characters'
     })
   }
 
@@ -209,13 +209,15 @@ const showModal: typeof Taro.showModal = async (options = {}) => {
 
   options.showCancel = !!options.showCancel
 
-  let errMsg = ''
+  let result = ''
   if (!modal.el) {
-    errMsg = await modal.create(options)
+    result = await modal.create(options)
   } else {
-    errMsg = await modal.show(options)
+    result = await modal.show(options)
   }
-  return handle.success({ errMsg })
+  const res = { cancel: !1, confirm: !1 }
+  res[result] = !0
+  return handle.success(res)
 }
 
 function hideModal () {
@@ -244,11 +246,11 @@ const showActionSheet: typeof Taro.showActionSheet = async (options = { itemList
   }
 
   if (options.itemList.length < 1) {
-    return handle.fail({ errMsg: 'showActionSheet:fail parameter error: parameter.itemList should have at least 1 item' })
+    return handle.fail({ errMsg: 'parameter error: parameter.itemList should have at least 1 item' })
   }
 
   if (options.itemList.length > 6) {
-    return handle.fail({ errMsg: 'showActionSheet:fail parameter error: parameter.itemList should not be large than 6' })
+    return handle.fail({ errMsg: 'parameter error: parameter.itemList should not be large than 6' })
   }
 
   for (let i = 0; i < options.itemList.length; i++) {