@mpxjs/api-proxy 2.6.106 → 2.6.114-alpha.7

package/src/tenon/api/toast/Toast.js

@@ -0,0 +1,101 @@
+import { webHandleSuccess } from '../../../common/js'
+import '../../../common/stylus/Toast.styl'
+
+import { getClassStyle } from '@hummer/tenon-vue'
+
+function createDom (Element, attrs = {}, children = []) {
+  let dom = new Element()
+  Object.keys(attrs).forEach(k => Reflect.set(dom, k, attrs[k]))
+  children.length && children.forEach(child => dom.appendChild(child))
+  return dom
+}
+
+export default class Toast {
+  constructor () {
+    this.defaultOpts = {
+      title: '',
+      icon: 'success',
+      image: '',
+      duration: 1500,
+      mask: false,
+      success: () => {},
+      fail: () => {},
+      complete: () => {}
+    }
+    this.dialog = null
+    this.hideTimer = null
+    this.type = null
+
+    // create & combine toast
+    this.toast = createDom(View, { style: getClassStyle(null, '__mpx_toast__') }, [
+      // todo 暂不支持 mask隐藏
+      // this.mask = createDom(View, { style: getClassStyle(null, '__mpx_mask__') }),
+      this.content = createDom(View, { style: getClassStyle(null, '__mpx_toast_box__') }, [
+        this.icon = createDom(View, { style: getClassStyle(null, '__mpx_toast_icon__') }),
+        this.title = createDom(Text, { style: getClassStyle(null, '__mpx_toast_title__') })
+      ])
+    ])
+  }
+
+  show (options, type) {
+    if (this.hideTimer) {
+      clearTimeout(this.hideTimer)
+      this.hideTimer = null
+    }
+
+    const opts = Object.assign({}, this.defaultOpts, options)
+
+    this.type = type
+
+    // if (opts.mask) {
+    //   this.mask.class += 'show'
+    // } else {
+    //   this.mask.classList.remove('show')
+    // }
+
+    // const defaultIconClass = '__mpx_toast_icon__'
+
+    const iconClass = opts.image
+      ? '' // image
+      : opts.icon === 'none'
+        ? '__hide_icon' // none
+        : opts.icon === 'error'
+          ? '__error_icon'
+          : '__success_icon' // default
+
+    // 在Hummer环境，Object.assign 有一些问题，需要重新进行一次赋值
+    this.icon.style = Object.assign(this.icon.style, getClassStyle(null, `${iconClass}`))
+
+    opts.image && (this.icon.style = Object.assign(this.icon.style, { backgroundImage: opts.image }))
+
+    this.title.text = opts.title || ''
+
+    this.dialog = new Dialog()
+    this.dialog.cancelable = false
+    opts.icon === 'loading'
+      ? this.dialog.loading(opts.title || 'loading...') // 空字符串也被过滤
+      : this.dialog.custom(this.toast)
+
+    opts.duration >= 0 && this.hide({ duration: opts.duration }, type)
+
+    const errMsg = type === 'loading' ? 'showLoading:ok' : 'showToast:ok'
+    webHandleSuccess({ errMsg }, opts.success, opts.complete)
+    return Promise.resolve({ errMsg })
+  }
+
+  hide (options = {}, type) {
+    if (this.type !== type) return
+
+    const duration = options.duration || 0
+    const errMsg = type === 'loading' ? 'hideLoading:ok' : 'hideToast:ok'
+    webHandleSuccess({ errMsg }, options.success, options.complete)
+
+    if (this.hideTimer) {
+      clearTimeout(this.hideTimer)
+      this.hideTimer = null
+    }
+
+    this.hideTimer = setTimeout(() => { this.dialog.dismiss() }, duration)
+    return Promise.resolve({ errMsg })
+  }
+}

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

@@ -0,0 +1,36 @@
+import Toast from './Toast'
+
+let toast = null
+
+function showToast (options = { title: '' }) {
+  if (!toast) { toast = new Toast() }
+  return toast.show(options, 'toast')
+}
+
+function hideToast (options = {}) {
+  if (!toast) { return }
+  return toast.hide(Object.assign({ duration: 0 }, options), 'toast')
+}
+
+function showLoading (options = { title: '' }) {
+  if (!toast) { toast = new Toast() }
+  return toast.show(Object.assign({
+    icon: 'loading',
+    duration: -1
+  }, options), 'loading')
+}
+
+function hideLoading (options = {}) {
+  if (!toast) { return }
+  return toast.hide(Object.assign({
+    icon: 'loading',
+    duration: 0
+  }, options), 'loading')
+}
+
+export {
+  showToast,
+  hideToast,
+  showLoading,
+  hideLoading
+}

package/src/web/api/route/index.js

@@ -1,9 +1,14 @@
-import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { webHandleSuccess, webHandleFail, isTabBarPage } from '../../../common/js'
 import { EventChannel } from '../event-channel'
 
 function redirectTo (options = {}) {
   const router = global.__mpxRouter
   if (router) {
+    if (isTabBarPage(options.url, router)) {
+      const res = { errMsg: 'redirectTo:fail can not redirectTo a tabBar page' }
+      webHandleFail(res, options.fail, options.complete)
+      return Promise.reject(res)
+    }
     router.__mpxAction = { type: 'redirect' }
     return new Promise((resolve, reject) => {
       router.replace(
@@ -28,6 +33,11 @@ function redirectTo (options = {}) {
 function navigateTo (options = {}) {
   const router = global.__mpxRouter
   if (router) {
+    if (isTabBarPage(options.url, router)) {
+      const res = { errMsg: 'navigateTo:fail can not navigateTo a tabBar page' }
+      webHandleFail(res, options.fail, options.complete)
+      return Promise.reject(res)
+    }
     const eventChannel = new EventChannel()
     router.__mpxAction = {
       type: 'to',
@@ -71,11 +81,13 @@ function navigateBack (options = {}) {
   }
 }
 
+let reLaunchCount = 0
+
 function reLaunch (options = {}) {
   const router = global.__mpxRouter
   if (router) {
+    if (reLaunchCount === 0 && router.currentRoute.query.reLaunchCount) reLaunchCount = router.currentRoute.query.reLaunchCount
     const delta = router.stack.length - 1
-    let reLaunchCount = router.currentRoute.query.reLaunchCount || 0
     router.__mpxAction = {
       type: 'reLaunch',
       path: options.url,
@@ -120,7 +132,7 @@ function switchTab (options = {}) {
     const toRoute = router.match(options.url, router.history.current)
     const currentRoute = router.currentRoute
     if (toRoute.path !== currentRoute.path) {
-      if (toRoute.redirectedFrom) {
+      if (!isTabBarPage(options.url, router)) {
         const res = { errMsg: 'switchTab:fail can not switch to no-tabBar page!' }
         webHandleFail(res, options.fail, options.complete)
         return Promise.reject(res)