@dcloudio/uni-h5 2.0.0 → 2.0.1-32920211122002

package/src/core/view/components/textarea/index.vue

@@ -1,6 +1,9 @@
 <template>
   <uni-textarea v-on="$listeners">
-    <div class="uni-textarea-wrapper">
+    <div
+      ref="wrapper"
+      class="uni-textarea-wrapper"
+    >
       <div
         v-show="!(composing || valueSync.length)"
         ref="placeholder"
@@ -144,7 +147,8 @@ export default {
         lineCount
       })
       if (this.autoHeight) {
-        this.$el.style.height = this.height + 'px'
+        this.$el.style.height = 'auto'
+        this.$refs.wrapper.style.height = this.height + 'px'
       }
     }
   },
@@ -246,7 +250,6 @@ uni-textarea {
   line-height: normal;
   white-space: pre-wrap;
   word-break: break-all;
-  box-sizing: content-box !important;
 }
 uni-textarea[hidden] {
   display: none;
@@ -267,6 +270,7 @@ uni-textarea[hidden] {
   position: relative;
   width: 100%;
   height: 100%;
+  min-height: inherit;
 }
 .uni-textarea-placeholder,
 .uni-textarea-line,

package/src/core/view/index.css

@@ -64,6 +64,10 @@ body {
     content: "\EA08";
 }
 
+.uni-icon-error:before {
+    content: "\EA0B";
+}
+  
 .uni-loading,
 uni-button[loading]:before {
     background: transparent url("data:image/svg+xml;base64, PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=") no-repeat;

package/src/core/view/mixins/field.js

@@ -4,6 +4,7 @@ import {
 } from 'uni-shared'
 import emitter from './emitter'
 import keyboard from './keyboard'
+import interact from './interact'
 
 UniViewJSBridge.subscribe('getSelectedTextRange', function ({ pageId, callbackId }) {
   const activeElement = document.activeElement
@@ -29,7 +30,7 @@ let startTime
 
 export default {
   name: 'Field',
-  mixins: [emitter, keyboard],
+  mixins: [emitter, keyboard, interact],
   model: {
     prop: 'value',
     event: 'update:value'
@@ -116,6 +117,7 @@ export default {
     }, 100)
     this.$watch('value', valueChange)
     this.__triggerInput = throttle(($event, detail) => {
+      this.__valueChange.cancel()
       this.$emit('update:value', detail.value)
       this.$trigger('input', $event, detail)
     }, 100)
@@ -146,7 +148,9 @@ export default {
       this._field = el
       startTime = startTime || Date.now()
       if (this.needFocus) {
-        this._focus()
+        setTimeout(() => {
+          this._focus()
+        })
       }
     },
     _focus () {
@@ -167,7 +171,10 @@ export default {
           return
         }
         field.focus()
-        plus.key.showSoftKeybord()
+        // 无用户交互的 webview 需主动显示键盘（安卓）
+        if (!this.userInteract) {
+          plus.key.showSoftKeybord()
+        }
       }
     },
     _blur () {
@@ -190,20 +197,31 @@ export default {
         this._onInput($event, true)
       }
       this.focusSync = false
+      const field = $event.target
+      let cursor
+      if (field.type === 'number') {
+        field.type = 'text'
+        cursor = field.selectionEnd
+        field.type = 'number'
+      } else {
+        cursor = field.selectionEnd
+      }
       this.$trigger('blur', $event, {
         value: this.valueSync,
-        cursor: $event.target.selectionEnd
+        cursor
       })
     },
     _checkSelection () {
-      if (this.focusSync && this.selectionStartNumber > -1 && this.selectionEndNumber > -1) {
-        this._field.selectionStart = this.selectionStartNumber
-        this._field.selectionEnd = this.selectionEndNumber
+      const field = this._field
+      if (this.focusSync && this.selectionStartNumber > -1 && this.selectionEndNumber > -1 && field.type !== 'number') {
+        field.selectionStart = this.selectionStartNumber
+        field.selectionEnd = this.selectionEndNumber
       }
     },
     _checkCursor () {
-      if (this.focusSync && this.selectionStartNumber < 0 && this.selectionEndNumber < 0 && this.cursorNumber > -1) {
-        this._field.selectionEnd = this._field.selectionStart = this.cursorNumber
+      const field = this._field
+      if (this.focusSync && this.selectionStartNumber < 0 && this.selectionEndNumber < 0 && this.cursorNumber > -1 && field.type !== 'number') {
+        field.selectionEnd = field.selectionStart = this.cursorNumber
       }
     }
   }

package/src/core/view/mixins/interact.js

@@ -9,21 +9,18 @@ const passiveOptions = supportsPassive ? {
 const vms = []
 let userInteract = 0
 let inited
-function addInteractListener (vm) {
+function setInteract (interact) { vms.forEach(vm => (vm.userInteract = interact)) }
+function addInteractListener (vm = {}) {
   if (!inited) {
     const eventNames = ['touchstart', 'touchmove', 'touchend', 'mousedown', 'mouseup']
     eventNames.forEach(eventName => {
       document.addEventListener(eventName, function () {
-        vms.forEach(vm => {
-          vm.userInteract = true
-          userInteract++
-          setTimeout(() => {
-            userInteract--
-            if (!userInteract) {
-              vm.userInteract = false
-            }
-          }, 0)
-        })
+        !userInteract && setInteract(true)
+        userInteract++
+
+        setTimeout(() => {
+          !--userInteract && setInteract(false)
+        }, 0)
       }, passiveOptions)
     })
     inited = true
@@ -51,5 +48,10 @@ export default {
   },
   beforeDestroy () {
     removeInteractListener(this)
+  },
+  addInteractListener,
+  // true -> interact
+  getStatus () {
+    return !!userInteract
   }
 }

package/src/core/view/mixins/keyboard.js

@@ -3,6 +3,23 @@ import {
 } from 'uni-shared'
 import emitter from './emitter'
 
+let resetTimer
+let isAndroid
+let osVersion
+let keyboardHeight
+let keyboardChangeCallback
+let webviewStyle
+if (__PLATFORM__ === 'app-plus') {
+  plusReady(() => {
+    isAndroid = plus.os.name.toLowerCase() === 'android'
+    osVersion = plus.os.version
+  })
+  document.addEventListener('keyboardchange', function (event) {
+    keyboardHeight = event.height
+    keyboardChangeCallback && keyboardChangeCallback()
+  }, false)
+}
+
 /**
  * 保证iOS点击输入框外隐藏键盘
  */
@@ -14,7 +31,8 @@ function setSoftinputTemporary (vm, reset) {
     const MODE_ADJUSTPAN = 'adjustPan'
     const MODE_NOTHING = 'nothing'
     const currentWebview = plus.webview.currentWebview()
-    const style = currentWebview.getStyle() || {}
+    // iOS 14.6 调用同步方法导致键盘弹卡顿
+    const style = webviewStyle || currentWebview.getStyle() || {}
     const options = {
       mode: (reset || style.softinputMode === MODE_ADJUSTRESIZE) ? MODE_ADJUSTRESIZE : (vm.adjustPosition ? MODE_ADJUSTPAN : MODE_NOTHING),
       position: {
@@ -63,22 +81,6 @@ function resetSoftinputNavBar (vm) {
   }
 }
 
-let resetTimer
-let isAndroid
-let osVersion
-let keyboardHeight
-let keyboardChangeCallback
-if (__PLATFORM__ === 'app-plus') {
-  plusReady(() => {
-    isAndroid = plus.os.name.toLowerCase() === 'android'
-    osVersion = plus.os.version
-  })
-  document.addEventListener('keyboardchange', function (event) {
-    keyboardHeight = event.height
-    keyboardChangeCallback && keyboardChangeCallback()
-  }, false)
-}
-
 export default {
   name: 'Keyboard',
   mixins: [emitter],
@@ -146,19 +148,30 @@ export default {
 
       if (__PLATFORM__ === 'app-plus') {
         // 安卓单独隐藏键盘后点击输入框不会触发 focus 事件
-        el.addEventListener('click', () => {
-          if (!this.disabled && focus && keyboardHeight === 0) {
-            setSoftinputTemporary(this)
-          }
-        })
-        if (!isAndroid && parseInt(osVersion) < 12) {
-          // iOS12 以下系统 focus 事件设置较迟，改在 touchstart 设置
-          el.addEventListener('touchstart', () => {
-            if (!this.disabled && !focus) {
+        if (isAndroid) {
+          el.addEventListener('click', () => {
+            if (!this.disabled && focus && keyboardHeight === 0) {
               setSoftinputTemporary(this)
             }
           })
         }
+        if (!isAndroid) {
+          // iOS12 以下系统 focus 事件设置较迟，改在 touchstart 设置
+          if (parseInt(osVersion) < 12) {
+            el.addEventListener('touchstart', () => {
+              if (!this.disabled && !focus) {
+                setSoftinputTemporary(this)
+              }
+            })
+          }
+          // iOS 14.6 调用同步方法导致键盘弹卡顿
+          if (parseFloat(osVersion) >= 14.6 && !webviewStyle) {
+            plusReady(() => {
+              const currentWebview = plus.webview.currentWebview()
+              webviewStyle = currentWebview.getStyle() || {}
+            })
+          }
+        }
       }
 
       const onKeyboardHide = () => {
@@ -188,6 +201,9 @@ export default {
       }
 
       el.addEventListener('blur', () => {
+        // 在iOS设备上，手动调用uni.hideKeyboard()，键盘收起并且触发blur，但实际并没有blur。
+        // 此时如果再点击页面其他地方会重新聚焦，此处做处理
+        el.blur()
         focus = false
         onKeyboardHide()
       })

package/src/core/view/mixins/touchtrack.js

@@ -35,8 +35,8 @@ export default {
           changedTouches: $event.changedTouches,
           detail: {
             state,
-            x0: x,
-            y0: y,
+            x: x,
+            y: y,
             dx: x - x0,
             dy: y - y0,
             ddx: x - x1,

package/src/core/view/plugins/index.js

@@ -100,4 +100,4 @@ export default {
     })
   }
 
-}
+}

package/src/platforms/app-plus/constants.js

@@ -21,3 +21,4 @@ export const WEB_INVOKE_APPSERVICE = 'WEB_INVOKE_APPSERVICE'
 export const WEBVIEW_INSERTED = 'webviewInserted'
 export const WEBVIEW_REMOVED = 'webviewRemoved'
 export const WEBVIEW_ID_PREFIX = 'webviewId'
+export const SET_LOCALE = 'setLocale'

package/src/platforms/app-plus/helpers/get-real-path.js

@@ -22,10 +22,13 @@ function addBase (filePath) {
 export default function getRealPath (filePath) {
   if (filePath.indexOf('/') === 0) {
     if (filePath.indexOf('//') === 0) {
-      filePath = 'https:' + filePath
-    } else {
-      return addBase(filePath.substr(1))
+      return 'https:' + filePath
     }
+    // 平台绝对路径 安卓、iOS
+    if (filePath.startsWith('/storage/') || filePath.startsWith('/sdcard/') || filePath.includes('/Containers/Data/Application/')) {
+      return 'file://' + filePath
+    }
+    return addBase(filePath.substr(1))
   }
   // 网络资源或base64
   if (SCHEME_RE.test(filePath) || DATA_RE.test(filePath) || filePath.indexOf('blob:') === 0) {
@@ -43,4 +46,4 @@ export default function getRealPath (filePath) {
   }
 
   return filePath
-}
+}

package/src/platforms/app-plus/helpers/uuid.js

@@ -1,6 +1,6 @@
 let deviceId
 
 export default function () {
-  deviceId = deviceId || plus.runtime.getDCloudId()
+  deviceId = deviceId || plus.device.uuid
   return deviceId
 }

package/src/platforms/app-plus/service/api/ad/ad-base.js

@@ -0,0 +1,159 @@
+const eventTypes = {
+  load: 'load',
+  close: 'close',
+  error: 'error',
+  adClicked: 'adClicked'
+}
+
+const eventNames = [
+  eventTypes.load,
+  eventTypes.close,
+  eventTypes.error,
+  eventTypes.adClicked
+]
+
+class AdBase {
+  constructor (adInstance, options) {
+    const _callbacks = this._callbacks = {}
+    eventNames.forEach(item => {
+      _callbacks[item] = []
+      const name = item[0].toUpperCase() + item.substr(1)
+      this[`on${name}`] = function (callback) {
+        _callbacks[item].push(callback)
+      }
+    })
+
+    this._preload = options.preload !== undefined ? options.preload : false
+
+    this._isLoaded = false
+    this._isLoading = false
+    this._adError = ''
+    this._loadPromiseResolve = null
+    this._loadPromiseReject = null
+    this._showPromiseResolve = null
+    this._showPromiseReject = null
+
+    const ad = this._ad = adInstance
+    ad.onLoad((e) => {
+      this._isLoaded = true
+      this._isLoading = false
+
+      if (this._loadPromiseResolve != null) {
+        this._loadPromiseResolve()
+        this._loadPromiseResolve = null
+      }
+      if (this._showPromiseResolve != null) {
+        this._showPromiseResolve()
+        this._showPromiseResolve = null
+        this._showAd()
+      }
+
+      this._dispatchEvent(eventTypes.load, {})
+    })
+    ad.onClose((e) => {
+      this._isLoaded = false
+      this._isLoading = false
+      this._dispatchEvent(eventTypes.close, { isEnded: e.isEnded })
+
+      if (this._preload === true) {
+        this._loadAd()
+      }
+    })
+    ad.onError((e) => {
+      this._isLoading = false
+
+      const data = {
+        code: e.code,
+        errMsg: e.message
+      }
+
+      this._adError = data
+
+      this._dispatchEvent(eventTypes.error, data)
+
+      const error = new Error(JSON.stringify(this._adError))
+      error.code = e.code
+      error.errMsg = e.message
+
+      if (this._loadPromiseReject != null) {
+        this._loadPromiseReject(error)
+        this._loadPromiseReject = null
+      }
+
+      if (this._showPromiseReject != null) {
+        this._showPromiseReject(error)
+        this._showPromiseReject = null
+      }
+    })
+    ad.onAdClicked && ad.onAdClicked((e) => {
+      this._dispatchEvent(eventTypes.adClicked, {})
+    })
+  }
+
+  load () {
+    return new Promise((resolve, reject) => {
+      this._loadPromiseResolve = resolve
+      this._loadPromiseReject = reject
+      if (this._isLoading) {
+        return
+      }
+
+      if (this._isLoaded) {
+        resolve()
+      } else {
+        this._loadAd()
+      }
+    })
+  }
+
+  show () {
+    return new Promise((resolve, reject) => {
+      this._showPromiseResolve = resolve
+      this._showPromiseReject = reject
+
+      if (this._isLoading) {
+        return
+      }
+
+      if (this._isLoaded) {
+        this._showAd()
+        resolve()
+      } else {
+        this._loadAd()
+      }
+    })
+  }
+
+  destroy () {
+    this._ad.destroy()
+  }
+
+  getProvider () {
+    return this._ad.getProvider()
+  }
+
+  _loadAd () {
+    this._adError = ''
+    this._isLoaded = false
+    this._isLoading = true
+    this._ad.load()
+  }
+
+  _showAd () {
+    this._ad.show()
+  }
+
+  _dispatchEvent (name, data) {
+    this._callbacks[name].forEach(callback => {
+      if (typeof callback === 'function') {
+        callback(data || {})
+      }
+    })
+  }
+}
+
+export {
+  eventTypes,
+  eventNames,
+  AdBase
+}

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

@@ -10,8 +10,7 @@ UniServiceJSBridge.subscribe('onAdMethodCallback', ({
   callbackId,
   data
 }, pageId) => {
-  const { adpid, width, count } = data
-  getAdData(adpid, width, count, (res) => {
+  getAdData(data, (res) => {
     operateAdView(pageId, callbackId, 'success', res)
   }, (err) => {
     operateAdView(pageId, callbackId, 'fail', err)
@@ -20,7 +19,8 @@ UniServiceJSBridge.subscribe('onAdMethodCallback', ({
 
 const _adDataCache = {}
 
-function getAdData (adpid, width, count, onsuccess, onerror) {
+function getAdData (data, onsuccess, onerror) {
+  const { adpid, width } = data
   const key = adpid + '-' + width
   const adDataList = _adDataCache[key]
   if (adDataList && adDataList.length > 0) {
@@ -29,11 +29,7 @@ function getAdData (adpid, width, count, onsuccess, onerror) {
   }
 
   plus.ad.getAds(
-    {
-      adpid,
-      count,
-      width
-    },
+    data,
     (res) => {
       const list = res.ads
       onsuccess(list.splice(0, 1)[0])

package/src/platforms/app-plus/service/api/ad/full-screen-video-ad.js

@@ -1,103 +1,10 @@
-const eventNames = [
-  'load',
-  'close',
-  'error',
-  'adClicked'
-]
+import {
+  AdBase
+} from './ad-base.js'
 
-class FullScreenVideoAd {
+class FullScreenVideoAd extends AdBase {
   constructor (options = {}) {
-    const _callbacks = this._callbacks = {}
-    eventNames.forEach(item => {
-      _callbacks[item] = []
-      const name = item[0].toUpperCase() + item.substr(1)
-      this[`on${name}`] = function (callback) {
-        _callbacks[item].push(callback)
-      }
-    })
-
-    this._isLoad = false
-    this._adError = ''
-    this._loadPromiseResolve = null
-    this._loadPromiseReject = null
-    this._lastLoadTime = 0
-
-    const ad = this._ad = plus.ad.createFullScreenVideoAd(options)
-    ad.onLoad((e) => {
-      this._isLoad = true
-      this._lastLoadTime = Date.now()
-      this._dispatchEvent('load', {})
-
-      if (this._loadPromiseResolve != null) {
-        this._loadPromiseResolve()
-        this._loadPromiseResolve = null
-      }
-    })
-    ad.onClose((e) => {
-      this._isLoad = false
-      this._dispatchEvent('close', { isEnded: e.isEnded })
-    })
-    ad.onError((e) => {
-      const { code, message } = e
-      const data = { code: code, errMsg: message }
-      this._adError = message
-      if (code === -5008) {
-        this._isLoad = false
-      }
-      this._dispatchEvent('error', data)
-
-      if (this._loadPromiseReject != null) {
-        this._loadPromiseReject(data)
-        this._loadPromiseReject = null
-      }
-    })
-    ad.onAdClicked((e) => {
-      this._dispatchEvent('adClicked', {})
-    })
-  }
-
-  load () {
-    return new Promise((resolve, reject) => {
-      if (this._isLoad) {
-        resolve()
-        return
-      }
-      this._loadPromiseResolve = resolve
-      this._loadPromiseReject = reject
-      this._loadAd()
-    })
-  }
-
-  show () {
-    return new Promise((resolve, reject) => {
-      if (this._isLoad) {
-        this._ad.show()
-        resolve()
-      } else {
-        reject(new Error(this._adError))
-      }
-    })
-  }
-
-  getProvider () {
-    return this._ad.getProvider()
-  }
-
-  destroy () {
-    this._ad.destroy()
-  }
-
-  _loadAd () {
-    this._isLoad = false
-    this._ad.load()
-  }
-
-  _dispatchEvent (name, data) {
-    this._callbacks[name].forEach(callback => {
-      if (typeof callback === 'function') {
-        callback(data || {})
-      }
-    })
+    super(plus.ad.createFullScreenVideoAd(options), options)
   }
 }