@dcloudio/uni-h5 2.0.0 → 2.0.1-32920211122002

package/src/platforms/app-plus/service/api/network/request.js

@@ -8,6 +8,10 @@ import {
   base64ToArrayBuffer
 } from '../../bridge'
 
+import {
+  invoke
+} from 'uni-core/service/bridge'
+
 let requestTaskId = 0
 const requestTasks = {}
 
@@ -46,6 +50,7 @@ export function createRequestTaskById (requestTaskId, {
   responseType,
   sslVerify = true,
   firstIpv4 = false,
+  tls,
   timeout = (__uniConfig.networkTimeout && __uniConfig.networkTimeout.request) || 60 * 1000
 } = {}) {
   const stream = requireNativePlugin('stream')
@@ -99,7 +104,8 @@ export function createRequestTaskById (requestTaskId, {
     timeout: timeout || 6e5,
     // 配置和weex模块内相反
     sslVerify: !sslVerify,
-    firstIpv4: firstIpv4
+    firstIpv4: firstIpv4,
+    tls
   }
   if (method !== 'GET') {
     options.body = typeof data === 'string' ? data : JSON.stringify(data)
@@ -186,3 +192,23 @@ export function operateRequestTask ({
     errMsg: 'operateRequestTask:fail'
   }
 }
+
+export function configMTLS ({ certificates }, callbackId) {
+  const stream = requireNativePlugin('stream')
+  stream.configMTLS(certificates, ({ type, code, message }) => {
+    switch (type) {
+      case 'success':
+        invoke(callbackId, {
+          errMsg: 'configMTLS:ok',
+          code
+        })
+        break
+      case 'fail':
+        invoke(callbackId, {
+          errMsg: 'configMTLS:fail ' + message,
+          code
+        })
+        break
+    }
+  })
+}

package/src/platforms/app-plus/service/api/network/upload-file.js

@@ -62,7 +62,7 @@ const createUploadTaskById = function (uploadTaskId, {
   }
   if (files && files.length) {
     files.forEach(file => {
-      uploader.addFile(getRealPath(file.uri), {
+      uploader.addFile(getRealPath(file.uri || file.filePath), {
         key: file.name || 'file'
       })
     })

package/src/platforms/app-plus/service/api/plugin/oauth.js

@@ -5,6 +5,9 @@ import {
   warpPlusSuccessCallback,
   warpPlusErrorCallback
 } from '../util'
+import { isPlainObject, toRawType, callback } from 'uni-shared'
+
+let univerifyManager
 
 function getService (provider) {
   return new Promise((resolve, reject) => {
@@ -18,20 +21,36 @@ function getService (provider) {
 /**
  * 微信登录
  */
-export function login (params, callbackId) {
+export function login (params, callbackId, plus = true) {
   const provider = params.provider || 'weixin'
-  const errorCallback = warpPlusErrorCallback(callbackId, 'login')
+  const errorCallback = warpErrorCallback(callbackId, 'login', plus)
+  const authOptions = provider === 'apple'
+    ? { scope: 'email' }
+    : params.univerifyStyle
+      ? { univerifyStyle: univerifyButtonsClickHandling(params.univerifyStyle, errorCallback) }
+      : {}
+  const _invoke = plus ? invoke : callback.invoke
 
   getService(provider).then(service => {
     function login () {
+      if (params.onlyAuthorize && provider === 'weixin') {
+        service.authorize(({ code }) => {
+          _invoke(callbackId, {
+            code,
+            authResult: '',
+            errMsg: 'login:ok'
+          })
+        }, errorCallback)
+        return
+      }
       service.login(res => {
         const authResult = res.target.authResult
-        invoke(callbackId, {
+        _invoke(callbackId, {
           code: authResult.code,
           authResult: authResult,
           errMsg: 'login:ok'
         })
-      }, errorCallback, provider === 'apple' ? { scope: 'email' } : { univerifyStyle: params.univerifyStyle } || {})
+      }, errorCallback, authOptions)
     }
     // 先注销再登录
     // apple登录logout之后无法重新触发获取email,fullname；一键登录无logout
@@ -99,6 +118,12 @@ export function getUserInfo (params, callbackId) {
     })
   })
 }
+/**
+ * 获取用户信息-兼容
+ */
+export function getUserProfile (params, callbackId) {
+  return getUserInfo(params, callbackId)
+}
 
 /**
  * 获取用户信息
@@ -115,12 +140,119 @@ export function operateWXData (params, callbackId) {
   }
 }
 
-export function preLogin (params, callbackId) {
-  const successCallback = warpPlusSuccessCallback(callbackId, 'preLogin')
-  const errorCallback = warpPlusErrorCallback(callbackId, 'preLogin')
+export function preLogin (params, callbackId, plus) {
+  const successCallback = warpSuccessCallback(callbackId, 'preLogin', plus)
+  const errorCallback = warpErrorCallback(callbackId, 'preLogin', plus)
   getService(params.provider).then(service => service.preLogin(successCallback, errorCallback)).catch(errorCallback)
 }
 
 export function closeAuthView () {
-  getService('univerify').then(service => service.closeAuthView())
+  return getService('univerify').then(service => service.closeAuthView())
+}
+
+export function getCheckBoxState (params, callbackId, plus) {
+  const successCallback = warpSuccessCallback(callbackId, 'getCheckBoxState', plus)
+  const errorCallback = warpErrorCallback(callbackId, 'getCheckBoxState', plus)
+  try {
+    getService('univerify').then(service => {
+      const state = service.getCheckBoxState()
+      successCallback({ state })
+    })
+  } catch (error) {
+    errorCallback(error)
+  }
+}
+
+/**
+ * 一键登录自定义登陆按钮点击处理
+ */
+function univerifyButtonsClickHandling (univerifyStyle, errorCallback) {
+  if (isPlainObject(univerifyStyle) && isPlainObject(univerifyStyle.buttons) && toRawType(univerifyStyle.buttons.list) === 'Array') {
+    univerifyStyle.buttons.list.forEach((button, index) => {
+      univerifyStyle.buttons.list[index].onclick = function () {
+        const res = {
+          code: '30008',
+          message: '用户点击了自定义按钮',
+          index,
+          provider: button.provider
+        }
+        isPlainObject(univerifyManager)
+          ? univerifyManager._triggerUniverifyButtonsClick(res)
+          : closeAuthView().then(() => {
+            errorCallback(res)
+          })
+      }
+    })
+  }
+  return univerifyStyle
+}
+
+class UniverifyManager {
+  constructor () {
+    this.provider = 'univerify'
+    this.eventName = 'api.univerifyButtonsClick'
+  }
+
+  close () {
+    closeAuthView()
+  }
+
+  login (options) {
+    this._warp((data, callbackId) => login(data, callbackId, false), this._getOptions(options))
+  }
+
+  getCheckBoxState (options) {
+    this._warp((_, callbackId) => getCheckBoxState(_, callbackId, false), options)
+  }
+
+  preLogin (options) {
+    this._warp((data, callbackId) => preLogin(data, callbackId, false), this._getOptions(options))
+  }
+
+  onButtonsClick (callback) {
+    UniServiceJSBridge.on(this.eventName, callback)
+  }
+
+  offButtonsClick (callback) {
+    UniServiceJSBridge.off(this.eventName, callback)
+  }
+
+  _triggerUniverifyButtonsClick (res) {
+    UniServiceJSBridge.emit(this.eventName, res)
+  }
+
+  _warp (fn, options) {
+    return callback.warp(fn)(this._getOptions(options))
+  }
+
+  _getOptions (options = {}) {
+    return Object.assign({}, options, { provider: this.provider })
+  }
+}
+
+export function getUniverifyManager () {
+  return univerifyManager || (univerifyManager = new UniverifyManager())
+}
+
+function warpSuccessCallback (callbackId, name, plus = true) {
+  return plus
+    ? warpPlusSuccessCallback(callbackId, name)
+    : (options) => {
+      callback.invoke(callbackId, Object.assign({}, options, {
+        errMsg: `${name}:ok`
+      }))
+    }
+}
+
+function warpErrorCallback (callbackId, name, plus = true) {
+  return plus
+    ? warpPlusErrorCallback(callbackId, name)
+    : (error) => {
+      const { code = 0, message: errorMessage } = error
+      callback.invoke(callbackId, {
+        errMsg: `${name}:fail ${errorMessage || ''}`,
+        errCode: code,
+        code
+      })
+    }
 }

package/src/platforms/app-plus/service/api/storage/storage.js

@@ -185,7 +185,7 @@ export function getStorageInfo () {
   let currentSize = 0
   for (let index = 0; index < length; index++) {
     const key = plus.storage.key(index)
-    if (key !== STORAGE_KEYS && key.indexOf(STORAGE_DATA_TYPE) + STORAGE_DATA_TYPE.length !== key.length) {
+    if (key !== STORAGE_KEYS && (key.indexOf(STORAGE_DATA_TYPE) < 0 || key.indexOf(STORAGE_DATA_TYPE) + STORAGE_DATA_TYPE.length !== key.length)) {
       const value = plus.storage.getItem(key)
       currentSize += key.length + value.length
       keys.push(key)

package/src/platforms/app-plus/service/api/ui/popup.js

@@ -43,7 +43,7 @@ export function showToast ({
     })
     toast = true
   } else {
-    if (icon && !~['success', 'loading', 'none'].indexOf(icon)) {
+    if (icon && !~['success', 'loading', 'error', 'none'].indexOf(icon)) {
       icon = 'success'
     }
     const waitingOptions = {
@@ -70,11 +70,11 @@ export function showToast ({
         interval: duration
       }
     } else {
-      if (icon === 'success') {
+      if (['success', 'error'].indexOf(icon) !== -1) {
         waitingOptions.loading = {
           display: 'block',
           height: '55px',
-          icon: '__uniappsuccess.png',
+          icon: icon === 'success' ? '__uniappsuccess.png' : '__uniapperror.png',
           interval: duration
         }
       }
@@ -121,24 +121,34 @@ export function showModal ({
   cancelText,
   cancelColor,
   confirmText,
-  confirmColor
+  confirmColor,
+  editable = false,
+  placeholderText	= ''
 } = {}, callbackId) {
+  const buttons = showCancel ? [cancelText, confirmText] : [confirmText]
+  const tip = editable ? placeholderText : buttons
+
   content = content || ' '
-  plus.nativeUI.confirm(content, (e) => {
+  plus.nativeUI[editable ? 'prompt' : 'confirm'](content, (e) => {
     if (showCancel) {
-      invoke(callbackId, {
+      const isConfirm = e.index === 1
+      const res = {
         errMsg: 'showModal:ok',
-        confirm: e.index === 1,
+        confirm: isConfirm,
         cancel: e.index === 0 || e.index === -1
-      })
+      }
+      isConfirm && editable && (res.content = e.value)
+      invoke(callbackId, res)
     } else {
-      invoke(callbackId, {
+      const res = {
         errMsg: 'showModal:ok',
         confirm: e.index === 0,
         cancel: false
-      })
+      }
+      editable && (res.content = e.value)
+      invoke(callbackId, res)
     }
-  }, title, showCancel ? [cancelText, confirmText] : [confirmText])
+  }, title, tip, buttons)
 }
 export function showActionSheet ({
   itemList = [],

package/src/platforms/app-plus/service/api/ui/tab-bar.js

@@ -20,9 +20,10 @@ export function setTabBarItem ({
   text,
   iconPath,
   selectedIconPath,
-  pagePath
+  pagePath,
+  visible
 }) {
-  tabBar.setTabBarItem(index, text, iconPath, selectedIconPath)
+  tabBar.setTabBarItem(index, text, iconPath, selectedIconPath, visible)
   const route = pagePath && __uniRoutes.find(({ path }) => path === pagePath)
   if (route) {
     const meta = route.meta

package/src/platforms/app-plus/service/api/util.js

@@ -60,7 +60,7 @@ export function getRealPath (filePath) {
 
   // 无协议的情况补全 https
   if (filePath.indexOf('//') === 0) {
-    filePath = 'https:' + filePath
+    return 'https:' + filePath
   }
 
   // 网络资源或base64
@@ -75,6 +75,10 @@ export function getRealPath (filePath) {
   const wwwPath = 'file://' + _handleLocalPath('_www')
   // 绝对路径转换为本地文件系统路径
   if (filePath.indexOf('/') === 0) {
+    // 平台绝对路径 安卓、iOS
+    if (filePath.startsWith('/storage/') || filePath.startsWith('/sdcard/') || filePath.includes('/Containers/Data/Application/')) {
+      return 'file://' + filePath
+    }
     return wwwPath + filePath
   }
   // 相对资源

package/src/platforms/app-plus/service/framework/app.js

@@ -1,3 +1,7 @@
+import {
+  initAppLocale
+} from 'uni-helpers/i18n'
+
 import {
   callAppHook
 } from 'uni-core/service/plugins/util'
@@ -93,10 +97,15 @@ function initGlobalListeners () {
     })
   })
 
+  let keyboardHeightChange = 0
   plus.globalEvent.addEventListener('KeyboardHeightChange', function (event) {
-    publish('onKeyboardHeightChange', {
-      height: event.height
-    })
+    // 安卓设备首次获取高度为 0
+    if (keyboardHeightChange !== event.height) {
+      keyboardHeightChange = event.height
+      publish('onKeyboardHeightChange', {
+        height: keyboardHeightChange
+      })
+    }
   })
 
   globalEvent.addEventListener('uistylechange', function (event) {
@@ -142,6 +151,12 @@ function initAppLaunch (appVm) {
 
   callAppHook(appVm, 'onLaunch', args)
   callAppHook(appVm, 'onShow', args)
+  // https://tower.im/teams/226535/todos/16905/
+  const getAppState = weex.requireModule('plus').getAppState
+  const appState = getAppState && Number(getAppState())
+  if (appState === 2) {
+    callAppHook(appVm, 'onHide', args)
+  }
 }
 
 function initTabBar () {
@@ -202,12 +217,13 @@ export function clearTempFile () {
   })
 }
 
-export function registerApp (appVm) {
+export function registerApp (appVm, Vue) {
   if (process.env.NODE_ENV !== 'production') {
     console.log('[uni-app] registerApp')
   }
   appCtx = appVm
   appCtx.$vm = appVm
+  initAppLocale(Vue, appVm)
 
   Object.assign(appCtx, defaultApp) // 拷贝默认实现
 
@@ -236,4 +252,4 @@ export function registerApp (appVm) {
   __uniConfig.ready = true
 
   process.env.NODE_ENV !== 'production' && perf('registerApp')
-}
+}

package/src/platforms/app-plus/service/framework/config.js

@@ -76,6 +76,7 @@ export function initEntryPage () {
   const entryRoute = '/' + entryPagePath
   const routeOptions = __uniRoutes.find(route => route.path === entryRoute)
   if (!routeOptions) {
+    console.error(`[uni-app] ${entryPagePath} not found...`)
     return
   }
 

package/src/platforms/app-plus/service/framework/plugins/index.js

@@ -22,6 +22,10 @@ import {
   vdSyncCallbacks
 } from '../subscribe-handlers/on-vd-sync-callback'
 
+import {
+  uniIdMixin
+} from 'uni-shared'
+
 export default {
   install (Vue, options) {
     initVue(Vue)
@@ -31,6 +35,8 @@ export default {
 
     initPolyfill(Vue)
 
+    uniIdMixin(Vue)
+
     Vue.prototype.getOpenerEventChannel = function () {
       if (!this.$root.$scope.eventChannel) {
         this.$root.$scope.eventChannel = new EventChannel()
@@ -66,12 +72,12 @@ export default {
               console.log('[uni-app] launchApp')
             }
             plus.updateConfigInfo && plus.updateConfigInfo()
-            registerApp(this)
+            registerApp(this, Vue)
             oldMount.call(this, el, hydrating)
           })
           return
         }
-        registerApp(this)
+        registerApp(this, Vue)
       }
       return oldMount.call(this, el, hydrating)
     }

package/src/platforms/app-plus/service/framework/plugins/lifecycle.js

@@ -55,7 +55,7 @@ function parsePageCreateOptions (vm, route) {
 
   return {
     version: VD_SYNC_VERSION,
-    locale: plus.os.language, // TODO
+    locale: weex.requireModule('plus').getLanguage(),
     disableScroll,
     onPageScroll,
     onPageReachBottom,
@@ -121,4 +121,4 @@ export function initLifecycle (Vue) {
       }
     }
   })
-}
+}

package/src/platforms/app-plus/service/framework/subscribe-handlers/index.js

@@ -70,4 +70,4 @@ export function initSubscribeHandlers () {
 
   subscribe(WEBVIEW_INSERTED, onWebviewInserted)
   subscribe(WEBVIEW_REMOVED, onWebviewRemoved)
-}
+}

package/src/platforms/app-plus/service/framework/tab-bar.js

@@ -49,7 +49,7 @@ function setTabBarBadge (type, index, text) {
 /**
  * 动态设置 tabBar 某一项的内容
  */
-function setTabBarItem (index, text, iconPath, selectedIconPath) {
+function setTabBarItem (index, text, iconPath, selectedIconPath, visible) {
   const item = {
     index
   }
@@ -62,7 +62,17 @@ function setTabBarItem (index, text, iconPath, selectedIconPath) {
   if (selectedIconPath) {
     item.selectedIconPath = getRealPath(selectedIconPath)
   }
-  tabBar && tabBar.setTabBarItem(item)
+  if (visible !== undefined) {
+    item.visible = config.list[index].visible = visible
+    delete item.index
+
+    const tabbarItems = config.list.map(item => ({ visible: item.visible }))
+    tabbarItems[index] = item
+
+    tabBar && tabBar.setTabBarItems({ list: tabbarItems })
+  } else {
+    tabBar && tabBar.setTabBarItem(item)
+  }
 }
 /**
  * 动态设置 tabBar 的整体样式

package/src/platforms/app-plus/service/framework/webview/index.js

@@ -152,7 +152,7 @@ export function initWebview (webview, routeOptions, path, query) {
 
 export function createPreloadWebview () {
   if (!preloadWebview || preloadWebview.__uniapp_route) { // 不存在，或已被使用
-    preloadWebview = plus.webview.create(VIEW_WEBVIEW_PATH, String(id++))
+    preloadWebview = plus.webview.create(VIEW_WEBVIEW_PATH, String(id++), { contentAdjust: false })
     if (process.env.NODE_ENV !== 'production') {
       console.log(`[uni-app] preloadWebview[${preloadWebview.id}]`)
     }
@@ -170,4 +170,4 @@ export function consumeWebviewReady (pageId) {
   const callbacks = webviewReadyCallbacks[pageId]
   Array.isArray(callbacks) && callbacks.forEach(callback => callback())
   delete webviewReadyCallbacks[pageId]
-}
+}

package/src/platforms/app-plus/service/framework/webview/parser/title-nview-parser.js

@@ -1,7 +1,6 @@
-import {
-  isPlainObject
-}
-  from 'uni-shared'
+import { isPlainObject } from 'uni-shared'
+
+import { initNavigationBarI18n } from 'uni-helpers/i18n'
 
 function createButtonOnClick (index) {
   return function onClick (btn) {
@@ -28,20 +27,18 @@ function parseTitleNViewButtons (titleNView) {
   return titleNView
 }
 
-export function parseTitleNView (routeOptions) {
+export function parseTitleNView (id, routeOptions) {
   const windowOptions = routeOptions.window
   const titleNView = windowOptions.titleNView
-  routeOptions.meta.statusBarStyle = windowOptions.navigationBarTextStyle === 'black' ? 'dark' : 'light'
-  if ( // 无头
+  routeOptions.meta.statusBarStyle =
+    windowOptions.navigationBarTextStyle === 'black' ? 'dark' : 'light'
+  if (
+    // 无头
     titleNView === false ||
     titleNView === 'false' ||
-    (
-      windowOptions.navigationStyle === 'custom' &&
-      !isPlainObject(titleNView)
-    ) || (
-      windowOptions.transparentTitle === 'always' &&
-      !isPlainObject(titleNView)
-    )
+    (windowOptions.navigationStyle === 'custom' &&
+      !isPlainObject(titleNView)) ||
+    (windowOptions.transparentTitle === 'always' && !isPlainObject(titleNView))
   ) {
     return false
   }
@@ -54,28 +51,74 @@ export function parseTitleNView (routeOptions) {
     always: 'float'
   }
 
-  const navigationBarBackgroundColor = windowOptions.navigationBarBackgroundColor
+  const navigationBarBackgroundColor =
+    windowOptions.navigationBarBackgroundColor
   const ret = {
     autoBackButton: !routeOptions.meta.isQuit,
-    titleText: titleImage === '' ? windowOptions.navigationBarTitleText || '' : '',
-    titleColor: windowOptions.navigationBarTextStyle === 'black' ? '#000000' : '#ffffff',
+    titleText:
+      titleImage === '' ? windowOptions.navigationBarTitleText || '' : '',
+    titleColor:
+      windowOptions.navigationBarTextStyle === 'black' ? '#000000' : '#ffffff',
     type: titleNViewTypeList[transparentTitle],
-    backgroundColor: (/^#[a-z0-9]{6}$/i.test(navigationBarBackgroundColor) || navigationBarBackgroundColor === 'transparent') ? navigationBarBackgroundColor : '#f7f7f7',
-    tags: titleImage === '' ? [] : [{
-      tag: 'img',
-      src: titleImage,
-      position: {
-        left: 'auto',
-        top: 'auto',
-        width: 'auto',
-        height: '26px'
-      }
-    }]
+    backgroundColor:
+      /^#[a-z0-9]{6}$/i.test(navigationBarBackgroundColor) ||
+      navigationBarBackgroundColor === 'transparent'
+        ? navigationBarBackgroundColor
+        : '#f7f7f7',
+    tags:
+      titleImage === ''
+        ? []
+        : [
+          {
+            tag: 'img',
+            src: titleImage,
+            position: {
+              left: 'auto',
+              top: 'auto',
+              width: 'auto',
+              height: '26px'
+            }
+          }
+        ]
   }
 
   if (isPlainObject(titleNView)) {
-    return Object.assign(ret, parseTitleNViewButtons(titleNView))
+    return initTitleNViewI18n(
+      id,
+      Object.assign(ret, parseTitleNViewButtons(titleNView))
+    )
   }
+  return initTitleNViewI18n(id, ret)
+}
 
-  return ret
+function initTitleNViewI18n (id, titleNView) {
+  const i18nResult = initNavigationBarI18n(titleNView)
+  if (!i18nResult) {
+    return titleNView
+  }
+  const [titleTextI18n, searchInputPlaceholderI18n] = i18nResult
+  if (titleTextI18n || searchInputPlaceholderI18n) {
+    uni.onLocaleChange(() => {
+      const webview = plus.webview.getWebviewById(id + '')
+      if (!webview) {
+        return
+      }
+      const newTitleNView = {}
+      if (titleTextI18n) {
+        newTitleNView.titleText = titleNView.titleText
+      }
+      if (searchInputPlaceholderI18n) {
+        newTitleNView.searchInput = {
+          placeholder: titleNView.searchInput.placeholder
+        }
+      }
+      if (process.env.NODE_ENV !== 'production') {
+        console.log('[uni-app] updateWebview', webview.id, newTitleNView)
+      }
+      webview.setStyle({
+        titleNView: newTitleNView
+      })
+    })
+  }
+  return titleNView
 }