@dcloudio/uni-h5 2.0.0 → 2.0.1-32920211122002

package/src/platforms/h5/service/api/device/clipboard.js

@@ -0,0 +1,41 @@
+
+export function getClipboardData () {
+  const pasteText = document.getElementById('#clipboard')
+  const data = pasteText ? pasteText.value : undefined
+  if (data) {
+    return {
+      data,
+      errMsg: 'getClipboardData:ok'
+    }
+  } else {
+    return {
+      errMsg: 'getClipboardData:fail'
+    }
+  }
+}
+
+export function setClipboardData ({
+  data
+}) {
+  const pasteText = document.getElementById('#clipboard')
+  pasteText && pasteText.remove()
+  const textarea = document.createElement('textarea')
+  textarea.id = '#clipboard'
+  textarea.style.position = 'absolute'
+  textarea.style.top = '-9999px'
+  textarea.style.zIndex = '-9999'
+  document.body.appendChild(textarea)
+  textarea.value = data
+  textarea.focus()
+  textarea.select()
+  const result = document.execCommand('Copy', false, null)
+  if (result) {
+    return {
+      errMsg: 'setClipboardData:ok'
+    }
+  } else {
+    return {
+      errMsg: 'setClipboardData:fail'
+    }
+  }
+}

package/src/platforms/h5/service/api/device/get-system-info.js

@@ -11,6 +11,22 @@ const isAndroid = /android/i.test(ua)
  * 是否iOS设备
  */
 const isIOS = /iphone|ipad|ipod/i.test(ua)
+/**
+ * 是否是Windows设备
+ */
+const isWindows = ua.match(/Windows NT ([\d|\d.\d]*)/i)
+/**
+ * 是否是Mac设备
+ */
+const isMac = /Macintosh|Mac/i.test(ua)
+/**
+ * 是否是Linux设备
+ */
+const isLinux = /Linux|X11/i.test(ua)
+/**
+ * 是否是iPadOS
+ */
+const isIPadOS = isMac && navigator.maxTouchPoints > 0
 /**
  * 获取系统信息-同步
  */
@@ -69,6 +85,65 @@ export function getSystemInfoSync () {
         break
       }
     }
+  } else if (isIPadOS) {
+    model = 'iPad'
+    osname = 'iOS'
+    osversion = typeof window.BigInt === 'function' ? '14.0' : '13.0'
+  } else if (isWindows || isMac || isLinux) {
+    model = 'PC'
+    const osversionFind = ua.match(/\((.+?)\)/)[1]
+
+    if (isWindows) {
+      osname = 'Windows'
+      osversion = ''
+      switch (isWindows[1]) {
+        case '5.1':
+          osversion = 'XP'
+          break
+        case '6.0':
+          osversion = 'Vista'
+          break
+        case '6.1':
+          osversion = '7'
+          break
+        case '6.2':
+          osversion = '8'
+          break
+        case '6.3':
+          osversion = '8.1'
+          break
+        case '10.0':
+          osversion = '10'
+          break
+      }
+
+      const framework = osversionFind.match(/[Win|WOW]([\d]+)/)
+      if (framework) {
+        osversion += ` x${framework[1]}`
+      }
+    } else if (isMac) {
+      osname = 'Mac'
+      osversion = osversionFind.match(/Mac OS X (.+)/) || ''
+
+      if (osversion) {
+        osversion = osversion[1].replace(/_/g, '.')
+        // '10_15_7' or '10.16; rv:86.0'
+        if (osversion.indexOf(';') !== -1) {
+          osversion = osversion.split(';')[0]
+        }
+      }
+    } else if (isLinux) {
+      osname = 'Linux'
+      osversion = osversionFind.match(/Linux (.*)/) || ''
+
+      if (osversion) {
+        osversion = osversion[1]
+        // 'x86_64' or 'x86_64; rv:79.0'
+        if (osversion.indexOf(';') !== -1) {
+          osversion = osversion.split(';')[0]
+        }
+      }
+    }
   } else {
     osname = 'Other'
     osversion = '0'

package/src/platforms/h5/service/api/location/get-location.js

@@ -1,6 +1,10 @@
 import {
   getJSONP
 } from '../../../helpers/get-jsonp'
+import {
+  MapType,
+  getMapInfo
+} from '../../../helpers/location'
 
 /**
  * 获取定位信息
@@ -9,44 +13,69 @@ import {
  */
 export function getLocation ({
   type,
-  altitude
+  altitude,
+  highAccuracyExpireTime
 }, callbackId) {
   const {
     invokeCallbackHandler: invoke
   } = UniServiceJSBridge
-  const key = __uniConfig.qqMapKey
+  const mapInfo = getMapInfo()
 
   new Promise((resolve, reject) => {
     if (navigator.geolocation) {
       navigator.geolocation.getCurrentPosition(res => resolve(res.coords), reject, {
         enableHighAccuracy: altitude,
-        timeout: 1000 * 100
+        timeout: highAccuracyExpireTime || 1000 * 100
       })
     } else {
       reject(new Error('device nonsupport geolocation'))
     }
   }).catch(() => {
     return new Promise((resolve, reject) => {
-      getJSONP(`https://apis.map.qq.com/ws/location/v1/ip?output=jsonp&key=${key}`, {
-        callback: 'callback'
-      }, (res) => {
-        if ('result' in res && res.result.location) {
-          const location = res.result.location
-          resolve({
-            latitude: location.lat,
-            longitude: location.lng
-          }, true)
-        } else {
-          reject(new Error(res.message || JSON.stringify(res)))
-        }
-      }, () => reject(new Error('network error')))
+      if (mapInfo.type === MapType.QQ) {
+        getJSONP(`https://apis.map.qq.com/ws/location/v1/ip?output=jsonp&key=${mapInfo.key}`, {
+          callback: 'callback'
+        }, (res) => {
+          if ('result' in res && res.result.location) {
+            const location = res.result.location
+            resolve({
+              latitude: location.lat,
+              longitude: location.lng
+            }, true)
+          } else {
+            reject(new Error(res.message || JSON.stringify(res)))
+          }
+        }, () => reject(new Error('network error')))
+      } else if (mapInfo.type === MapType.GOOGLE) {
+        uni.request({
+          method: 'POST',
+          url: `https://www.googleapis.com/geolocation/v1/geolocate?key=${mapInfo.key}`,
+          success (res) {
+            const data = res.data
+            if ('location' in data) {
+              resolve({
+                latitude: data.location.lat,
+                longitude: data.location.lng,
+                accuracy: data.accuracy
+              })
+            } else {
+              reject(new Error((data.error && data.error.message) || JSON.stringify(res)))
+            }
+          },
+          fail () {
+            reject(new Error('network error'))
+          }
+        })
+      } else {
+        reject(new Error('network error'))
+      }
     })
   }).then((coords, skip) => {
-    if (type.toUpperCase() === 'WGS84' || skip) {
+    if (type.toUpperCase() === 'WGS84' || mapInfo.type !== MapType.QQ || skip) {
       return coords
     }
     return new Promise((resolve, reject) => {
-      getJSONP(`https://apis.map.qq.com/jsapi?qt=translate&type=1&points=${coords.longitude},${coords.latitude}&key=${key}&output=jsonp&pf=jsapi&ref=jsapi`, {
+      getJSONP(`https://apis.map.qq.com/jsapi?qt=translate&type=1&points=${coords.longitude},${coords.latitude}&key=${mapInfo.key}&output=jsonp&pf=jsapi&ref=jsapi`, {
         callback: 'cb'
       }, (res) => {
         if ('detail' in res && 'points' in res.detail && res.detail.points.length) {

package/src/platforms/h5/service/api/media/MIMEType.js

@@ -0,0 +1,53 @@
+export default {
+  /**
+   * 关于图片常见的MIME类型
+   */
+  image: {
+    jpg: 'jpeg',
+    jpe: 'jpeg',
+    pbm: 'x-portable-bitmap',
+    pgm: 'x-portable-graymap',
+    pnm: 'x-portable-anymap',
+    ppm: 'x-portable-pixmap',
+    psd: 'vnd.adobe.photoshop',
+    pic: 'x-pict',
+    rgb: 'x-rgb',
+    svg: 'svg+xml',
+    svgz: 'svg+xml',
+    tif: 'tiff',
+    xif: 'vnd.xiff',
+    wbmp: 'vnd.wap.wbmp',
+    wdp: 'vnd.ms-photo',
+    xbm: 'x-xbitmap',
+    ico: 'x-icon'
+  },
+  /**
+   * 关于视频常见的MIME类型
+   */
+  video: {
+    '3g2': '3gpp2',
+    '3gp': '3gpp',
+    avi: 'x-msvideo',
+    f4v: 'x-f4v',
+    flv: 'x-flv',
+    jpgm: 'jpm',
+    jpgv: 'jpeg',
+    m1v: 'mpeg',
+    m2v: 'mpeg',
+    mpe: 'mpeg',
+    mpg: 'mpeg',
+    mpg4: 'mpeg',
+    m4v: 'x-m4v',
+    mkv: 'x-matroska',
+    mov: 'quicktime',
+    qt: 'quicktime',
+    movie: 'x-sgi-movie',
+    mp4v: 'mp4',
+    ogv: 'ogg',
+    smv: 'x-smv',
+    wm: 'x-ms-wm',
+    wmv: 'x-ms-wmv',
+    wmx: 'x-ms-wmx',
+    wvx: 'x-ms-wvx'
+  }
+}

package/src/platforms/h5/service/api/media/choose-file.js

@@ -1,5 +1,7 @@
 import { fileToUrl } from 'uni-platform/helpers/file'
+import { t } from 'uni-core/helpers/i18n'
 import _createInput from './create_input'
+import { interact } from 'uni-mixins'
 
 const {
   invokeCallbackHandler: invoke
@@ -55,5 +57,11 @@ export function chooseFile ({
     // TODO 用户取消选择时，触发 fail，目前尚未找到合适的方法。
   })
 
-  fileInput.click()
+  if (interact.getStatus()) {
+    fileInput.click()
+  } else {
+    invoke(callbackId, {
+      errMsg: `chooseFile:fail ${t('uni.chooseFile.notUserActivation')}`
+    })
+  }
 }

package/src/platforms/h5/service/api/media/choose-image.js

@@ -1,5 +1,7 @@
 import { fileToUrl } from 'uni-platform/helpers/file'
+import { t } from 'uni-core/helpers/i18n'
 import _createInput from './create_input'
+import { interact } from 'uni-mixins'
 
 const {
   invokeCallbackHandler: invoke
@@ -27,7 +29,6 @@ export function chooseImage ({
     type: 'image'
   })
   document.body.appendChild(imageInput)
-
   imageInput.addEventListener('change', function (event) {
     const tempFiles = []
     const fileCount = event.target.files.length
@@ -54,5 +55,11 @@ export function chooseImage ({
     // TODO 用户取消选择时，触发 fail，目前尚未找到合适的方法。
   })
 
-  imageInput.click()
+  if (interact.getStatus()) {
+    imageInput.click()
+  } else {
+    invoke(callbackId, {
+      errMsg: `chooseImage:fail ${t('uni.chooseFile.notUserActivation')}`
+    })
+  }
 }

package/src/platforms/h5/service/api/media/choose-video.js

@@ -1,5 +1,7 @@
 import { fileToUrl, revokeObjectURL } from 'uni-platform/helpers/file'
+import { t } from 'uni-core/helpers/i18n'
 import _createInput from './create_input'
+import { interact } from 'uni-mixins'
 
 const {
   invokeCallbackHandler: invoke
@@ -67,5 +69,11 @@ export function chooseVideo ({
     // TODO 用户取消选择时，触发 fail，目前尚未找到合适的方法。
   })
 
-  videoInput.click()
+  if (interact.getStatus()) {
+    videoInput.click()
+  } else {
+    invoke(callbackId, {
+      errMsg: `chooseVideo:fail ${t('uni.chooseFile.notUserActivation')}`
+    })
+  }
 }

package/src/platforms/h5/service/api/media/create_input.js

@@ -1,4 +1,9 @@
 import { updateElementStyle } from 'uni-shared'
+import MIMEType from './MIMEType'
+import { interact } from 'uni-mixins'
+
+interact.addInteractListener()
+
 const ALL = '*'
 
 function isWXEnv () {
@@ -24,16 +29,20 @@ export default function ({ count, sourceType, type, extension }) {
     left: 0
   })
 
+  /**
+   * 选择文件
+   * chooseFile 使用后缀名
+   * chooseImage、chooseVideo 使用MIME类型
+   */
   inputEl.accept = extension.map(item => {
     if (type !== ALL) {
-      // 剔除.拼接在type后
-      return `${type}/${item.replace('.', '')}`
+      const MIMEKey = item.replace('.', '')
+      return `${type}/${MIMEType[type][MIMEKey] || MIMEKey}`
     } else {
       // 在微信环境里，'.jpeg,.png' 会提示没有应用可执行此操作
       if (isWXEnv()) {
         return '.'
       }
-      // 在后缀前方加上.
       return item.indexOf('.') === 0 ? item : `.${item}`
     }
   }).join(',')

package/src/platforms/h5/service/api/ui/popup.js

@@ -4,10 +4,8 @@ const {
 } = UniServiceJSBridge
 
 export function showModal (args, callbackId) {
-  emit('onShowModal', args, function (type) {
-    invoke(callbackId, {
-      [type]: true
-    })
+  emit('onShowModal', args, function (res) {
+    invoke(callbackId, res)
   })
 }
 
@@ -43,4 +41,4 @@ export function showActionSheet (args, callbackId) {
       })
     }
   })
-}
+}

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

@@ -2,7 +2,7 @@ import {
   setProperties
 } from 'uni-shared'
 
-const setTabBarItemProps = ['text', 'iconPath', 'selectedIconPath']
+const setTabBarItemProps = ['text', 'iconPath', 'selectedIconPath', 'visible']
 
 const setTabBarStyleProps = ['color', 'selectedColor', 'backgroundColor', 'borderStyle']
 

package/src/platforms/h5/service/index.js

@@ -10,6 +10,11 @@ import {
   getCurrentPages
 }
   from 'uni-core/service/plugins/app'
+import {
+  initI18n
+} from 'uni-helpers/i18n'
+
+initI18n()
 
 initOn(UniServiceJSBridge.on, {
   getApp,

package/src/platforms/h5/view/bridge/subscribe/index.js

@@ -23,10 +23,11 @@ const passiveOptions = supportsPassive ? {
 
 function updateCssVar (vm) {
   if (uni.canIUse('css.var')) {
+    const uniConfigTabbarHeight = parseFloat(__uniConfig.tabBar.height)
     const pageVm = vm.$parent.$parent
     const navigationBarType = pageVm.navigationBar.type
     const windowTopValue = navigationBarType === 'default' || navigationBarType === 'float' ? NAVBAR_HEIGHT : 0
-    const windowBottomValue = getApp().$children[0].showTabBar ? TABBAR_HEIGHT : 0
+    const windowBottomValue = getApp().$children[0].showTabBar ? isNaN(uniConfigTabbarHeight) ? TABBAR_HEIGHT : uniConfigTabbarHeight : 0
     const envMethod = uni.canIUse('css.env') ? 'env' : (uni.canIUse('css.constant') ? 'constant' : '')
     const windowTop = windowTopValue && envMethod ? `calc(${windowTopValue}px + ${envMethod}(safe-area-inset-top))`
       : `${windowTopValue}px`
@@ -87,4 +88,4 @@ export default function initSubscribe (subscribe) {
       })
     }
   })
-}
+}