@dcloudio/uni-h5 2.0.0 → 2.0.1-32920211122002

package/src/core/runtime/web-view/index.js

@@ -29,6 +29,9 @@ import {
 import {
   initWebviewApi as initKuaishouWebviewApi
 } from 'uni-platforms/mp-kuaishou/runtime/web-view'
+import {
+  initWebviewApi as initLarkWebviewApi
+} from 'uni-platforms/mp-lark/runtime/web-view'
 
 const UniAppJSBridgeReady = function () {
   window.UniAppJSBridge = true
@@ -47,6 +50,7 @@ const initWebviewApis = [
   initToutiaoWebviewApi,
   initQuickappWebviewApi,
   initKuaishouWebviewApi,
+  initLarkWebviewApi,
   initH5WebviewApi
 ]
 

package/src/core/runtime/wrapper/create-subpackage-app.js

@@ -12,6 +12,7 @@ export default function createSubpackageApp (vm) {
   const app = getApp({
     allowDefault: true
   })
+  vm.$scope = app
   const globalData = app.globalData
   if (globalData) {
     Object.keys(appOptions.globalData).forEach(name => {
@@ -26,18 +27,18 @@ export default function createSubpackageApp (vm) {
     }
   })
   if (isFn(appOptions.onShow) && __GLOBAL__.onAppShow) {
-    __GLOBAL__.onAppShow((...args) => {
-      appOptions.onShow.apply(app, args)
+    __GLOBAL__.onAppShow((...args) => {
+      vm.__call_hook('onShow', args)
     })
   }
   if (isFn(appOptions.onHide) && __GLOBAL__.onAppHide) {
-    __GLOBAL__.onAppHide((...args) => {
-      appOptions.onHide.apply(app, args)
+    __GLOBAL__.onAppHide((...args) => {
+      vm.__call_hook('onHide', args)
     })
   }
   if (isFn(appOptions.onLaunch)) {
     const args = __GLOBAL__.getLaunchOptionsSync && __GLOBAL__.getLaunchOptionsSync()
-    appOptions.onLaunch.call(app, args)
+    vm.__call_hook('onLaunch', args)
   }
   return vm
-}
+}

package/src/core/runtime/wrapper/util.js

@@ -237,6 +237,11 @@ export function initProperties (props, isBehavior = false, file = '') {
       type: Object,
       value: null
     }
+    // scopedSlotsCompiler auto
+    properties.scopedSlotsCompiler = {
+      type: String,
+      value: ''
+    }
     properties.vueSlots = { // 小程序不能直接定义 $slots 的 props，所以通过 vueSlots 转换到 $slots
       type: null,
       value: [],
@@ -572,4 +577,4 @@ export function handleEvent (event) {
   ) {
     return ret[0]
   }
-}
+}

package/src/core/service/api/base/interceptor.js

@@ -10,4 +10,4 @@ export {
 
 export const interceptors = {
   promiseInterceptor
-}
+}

package/src/core/service/api/context/canvas.js

@@ -231,8 +231,9 @@ function checkColor (e) {
 }
 
 function Pattern (image, repetition) {
-  this.image = image
-  this.repetition = repetition
+  this.type = 'pattern'
+  this.data = image
+  this.colorStop = repetition
 }
 
 class CanvasGradient {

package/src/core/service/api/context/create-map-context.js

@@ -39,6 +39,13 @@ export class MapContext {
   constructor (id, pageVm) {
     this.id = id
     this.pageVm = pageVm
+  }
+
+  on (name, callback) {
+    operateMapPlayer(this.id, this.pageVm, 'on', {
+      name,
+      callback
+    })
   }
 }
 
@@ -46,7 +53,7 @@ MapContext.prototype.$getAppMap = function () {
   if (__PLATFORM__ === 'app-plus') {
     return plus.maps.getMapById(this.pageVm.$page.id + '-map-' + this.id)
   }
-}
+}
 
 methods.forEach(function (method) {
   MapContext.prototype[method] = callback.warp(function (options, callbackId) {

package/src/core/service/api/ui/locale.js

@@ -0,0 +1,50 @@
+import {
+  invoke
+} from 'uni-core/service/bridge'
+import {
+  i18n
+} from 'uni-helpers/i18n'
+import {
+  DC_LOCALE
+} from 'uni-helpers/constants'
+
+export function getLocale () {
+  // 优先使用 $locale
+  const app = getApp({
+    allowDefault: true
+  })
+  if (app && app.$vm) {
+    return app.$vm.$locale
+  }
+  return i18n.getLocale()
+}
+
+export function setLocale (locale) {
+  const oldLocale = getApp().$vm.$locale
+  if (oldLocale !== locale) {
+    getApp().$vm.$locale = locale
+    if (__PLATFORM__ === 'app-plus') {
+      const pages = getCurrentPages()
+      pages.forEach((page) => {
+        UniServiceJSBridge.publishHandler(
+          'setLocale',
+          locale,
+          page.$page.id
+        )
+      })
+      weex.requireModule('plus').setLanguage(locale)
+    }
+    if (__PLATFORM__ === 'h5') {
+      window.localStorage && (localStorage[DC_LOCALE] = locale)
+    }
+    callbacks.forEach(callbackId => {
+      invoke(callbackId, { locale })
+    })
+    return true
+  }
+  return false
+}
+const callbacks = []
+export function onLocaleChange (callbackId) {
+  callbacks.push(callbackId)
+}

package/src/core/service/plugins/app/create-app.js

@@ -1,3 +1,7 @@
+import {
+  initAppLocale
+} from 'uni-helpers/i18n'
+
 import initRouterGuard from './router-guard'
 
 let appVm = false
@@ -23,7 +27,8 @@ export function getCurrentPages (isAll = false, ignoreError = false) {
       childrenVm = layoutVm
     }
     childrenVm.$children.forEach(vm => {
-      if (tabBarVm !== vm && vm.$children.length && vm.$children[0].$options.name === 'Page' && vm.$children[0].$slots
+      if (tabBarVm !== vm && vm.$children.length && vm.$children[0].$options.name === 'Page' && vm.$children[0]
+        .$slots
         .page) {
         // vm.$children[0]=Page->PageBody->RealPage
         const pageBody = vm.$children[0].$children.find(vm => vm.$options.name === 'PageBody')
@@ -63,11 +68,11 @@ export function getCurrentPages (isAll = false, ignoreError = false) {
   return pages
 }
 
-export default function createApp (vm, routes) {
+export default function createApp (Vue, vm, routes) {
   appVm = vm
   appVm.$vm = vm
   appVm.globalData = appVm.$options.globalData || {}
-
+  initAppLocale(Vue, appVm)
   // initEvents(appVm)
   initRouterGuard(appVm, routes)
 }

package/src/core/service/plugins/app/index.js

@@ -10,10 +10,10 @@ export {
 }
   from './create-app'
 
-export function createAppMixin (routes, entryRoute) {
+export function createAppMixin (Vue, routes, entryRoute) {
   return {
     created: function AppCreated () {
-      createApp(this, routes)
+      createApp(Vue, this, routes)
       // TODO
       if (!entryRoute.meta.name) { // PageNotFound
         UniServiceJSBridge.emit('onPageNotFound', {

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

@@ -24,6 +24,10 @@ import {
   getTabBarScrollPosition
 } from './app/router-guard'
 
+import {
+  uniIdMixin
+} from 'uni-shared'
+
 function getMinId (routes) {
   let minId = 0
   routes.forEach(route => {
@@ -74,6 +78,8 @@ export default {
 
     lifecycleMixin(Vue)
 
+    uniIdMixin(Vue)
+
     /* eslint-disable no-undef */
     if (typeof __UNI_ROUTER_BASE__ !== 'undefined') {
       __uniConfig.router.base = __UNI_ROUTER_BASE__
@@ -141,7 +147,7 @@ export default {
               keepAliveInclude
             }
           }
-          const appMixin = createAppMixin(routes, entryRoute)
+          const appMixin = createAppMixin(Vue, routes, entryRoute)
           // mixin app hooks
           Object.keys(appMixin).forEach(hook => {
             options[hook] = options[hook] ? [].concat(appMixin[hook], options[hook]) : [
@@ -201,4 +207,4 @@ export default {
     Vue.use(VueRouter)
   }
 
-}
+}

package/src/core/view/bridge/subscribe/api/request-component-observer.js

@@ -19,6 +19,21 @@ function getRect (rect) {
   }
 }
 
+// 在相交比很小的情况下，Chrome会返回相交为0
+function rectifyIntersectionRatio (entrie) {
+  const {
+    intersectionRatio,
+    boundingClientRect: { height: overAllHeight, width: overAllWidth },
+    intersectionRect: { height: intersectionHeight, width: intersectionWidth }
+  } = entrie
+
+  if (intersectionRatio !== 0) return intersectionRatio
+
+  return intersectionHeight === overAllHeight
+    ? intersectionWidth / overAllWidth
+    : intersectionHeight / overAllHeight
+}
+
 const intersectionObservers = {}
 
 export function requestComponentObserver ({
@@ -44,7 +59,7 @@ export function requestComponentObserver ({
       UniViewJSBridge.publishHandler('onRequestComponentObserver', {
         reqId,
         res: {
-          intersectionRatio: entrie.intersectionRatio,
+          intersectionRatio: rectifyIntersectionRatio(entrie),
           intersectionRect: getRect(entrie.intersectionRect),
           boundingClientRect: getRect(entrie.boundingClientRect),
           relativeRect: getRect(entrie.rootBounds),

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

@@ -133,8 +133,10 @@ export default {
         method(data)
       }
     },
-    _resize () {
+    _resize (size) {
       var canvas = this.$refs.canvas
+      var hasChanged = !size || (canvas.width !== Math.floor(size.width * pixelRatio) || canvas.height !== Math.floor(size.height * pixelRatio))
+      if (!hasChanged) return
       if (canvas.width > 0 && canvas.height > 0) {
         var context = canvas.getContext('2d')
         var imageData = context.getImageData(0, 0, canvas.width, canvas.height)

package/src/core/view/components/editor/formats/image.js

@@ -1,3 +1,5 @@
+import getRealPath from 'uni-platform/helpers/get-real-path'
+
 export default function (Quill) {
   const Image = Quill.import('formats/image')
   const ATTRIBUTES = [
@@ -8,7 +10,7 @@ export default function (Quill) {
     'class',
     'data-local'
   ]
-  Image.sanitize = url => url
+  Image.sanitize = url => url ? getRealPath(url) : url
   Image.formats = function formats (domNode) {
     return ATTRIBUTES.reduce(function (formats, attribute) {
       if (domNode.hasAttribute(attribute)) {

package/src/core/view/components/editor/formats/index.js

@@ -8,6 +8,7 @@ import box from './box'
 import font from './font'
 import text from './text'
 import image from './image'
+import link from './link'
 
 export function register (Quill) {
   const formats = {
@@ -20,7 +21,8 @@ export function register (Quill) {
     box,
     font,
     text,
-    image
+    image,
+    link
   }
   const options = {}
   Object.values(formats).forEach(value => Object.assign(options, value(Quill)))

package/src/core/view/components/editor/formats/link.js

@@ -0,0 +1,9 @@
+export default function (Quill) {
+  const Link = Quill.import('formats/link')
+  Link.sanitize = url => {
+    const anchor = document.createElement('a')
+    anchor.href = url
+    const protocol = anchor.href.slice(0, anchor.href.indexOf(':'))
+    return Link.PROTOCOL_WHITELIST.concat('file').indexOf(protocol) > -1 ? url : Link.SANITIZED_URL
+  }
+}

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

@@ -16,6 +16,20 @@ import HTMLParser from 'uni-helpers/html-parser'
 import * as formats from './formats'
 import loadScript from './load-script'
 
+function isiOS () {
+  if (__PLATFORM__ === 'app-plus') {
+    return plus.os.name.toLowerCase() === 'ios'
+  } else if (__PLATFORM__ === 'h5') {
+    const ua = navigator.userAgent
+    const isIOS = /iphone|ipad|ipod/i.test(ua)
+    const isMac = /Macintosh|Mac/i.test(ua)
+    const isIPadOS = isMac && navigator.maxTouchPoints > 0
+    return isIOS || isIPadOS
+  }
+  return false
+}
+
+let textChanging = false
 export default {
   name: 'Editor',
   mixins: [subscriber, emitter, keyboard],
@@ -64,7 +78,7 @@ export default {
     },
     placeholder (value) {
       if (this.quillReady) {
-        this.quill.root.setAttribute('data-placeholder', value)
+        this.setPlaceHolder(value)
       }
     }
   },
@@ -149,11 +163,14 @@ export default {
               const path = this.$getRealPath(src)
               quill.insertEmbed(range.index, 'image', path, Quill.sources.USER)
               const local = /^(file|blob):/.test(path) ? path : false
+              // 防止 formatText 多次触发 Quill.events.TEXT_CHANGE 事件
+              textChanging = true
               quill.formatText(range.index, 1, 'data-local', local)
               quill.formatText(range.index, 1, 'alt', alt)
               quill.formatText(range.index, 1, 'width', width)
               quill.formatText(range.index, 1, 'height', height)
               quill.formatText(range.index, 1, 'class', extClass)
+              textChanging = false
               quill.formatText(range.index, 1, 'data-custom', Object.keys(data).map(key => `${key}=${data[key]}`).join('&'))
               quill.setSelection(range.index + 1, Quill.sources.SILENT)
             }
@@ -234,6 +251,11 @@ export default {
         }, this.$page.id)
       }
     },
+    setPlaceHolder (value) {
+      const placeHolderAttrName = 'data-placeholder'
+      const QuillRoot = this.quill.root
+      QuillRoot.getAttribute(placeHolderAttrName) !== value && QuillRoot.setAttribute(placeHolderAttrName, value)
+    },
     initQuill (imageResizeModules) {
       const Quill = window.Quill
       formats.register(Quill)
@@ -254,15 +276,23 @@ export default {
       const events = ['focus', 'blur', 'input']
       events.forEach(name => {
         $el.addEventListener(name, ($event) => {
+          const contents = this.getContents()
           if (name === 'input') {
+            if (isiOS()) {
+              const regExpContent = (contents.html.match(/<span [\s\S]*>([\s\S]*)<\/span>/) || [])[1]
+              const placeholder = regExpContent && regExpContent.replace(/\s/g, '') ? '' : this.placeholder
+              this.setPlaceHolder(placeholder)
+            }
             $event.stopPropagation()
           } else {
-            this.$trigger(name, $event, this.getContents())
+            this.$trigger(name, $event, contents)
           }
         })
       })
       quill.on(Quill.events.TEXT_CHANGE, () => {
-        this.$trigger('input', {}, this.getContents())
+        if (!textChanging) {
+          this.$trigger('input', {}, this.getContents())
+        }
       })
       quill.on(Quill.events.SELECTION_CHANGE, this.updateStatus.bind(this))
       quill.on(Quill.events.SCROLL_OPTIMIZE, () => {

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

@@ -142,14 +142,13 @@ export default {
     _fixSize () {
       if (this.ratio) {
         const $el = this.$el
-        const rect = $el.getBoundingClientRect()
         if (this.mode === 'widthFix') {
-          const width = rect.width
+          const width = $el.offsetWidth
           if (width) {
             $el.style.height = fixNumber(width / this.ratio) + 'px'
           }
         } else if (this.mode === 'heightFix') {
-          const height = rect.height
+          const height = $el.offsetHeight
           if (height) {
             $el.style.width = fixNumber(height * this.ratio) + 'px'
           }
@@ -196,9 +195,9 @@ export default {
         img.src = realImagePath
       } else {
         this._clearImage()
+        this._resetData()
         // 与微信小程序保持一致，保留之前样式
-        // this._resetData()
-        this._resetSize()
+        // this._resetSize()
       }
     },
     _clearImage () {

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

@@ -5,7 +5,7 @@
       class="uni-input-wrapper"
     >
       <div
-        v-show="!(composing || valueSync.length || !valid)"
+        v-show="!(composing || valueSync.length || cachedValue === '-')"
         ref="placeholder"
         :style="placeholderStyle"
         :class="placeholderClass"
@@ -23,8 +23,9 @@
         :maxlength="maxlength"
         :step="step"
         :enterkeyhint="confirmType"
+        :pattern="type === 'number' ? '[0-9]*' : null"
         class="uni-input-input"
-        autocomplete="off"
+        :autocomplete="autocomplete"
         @change.stop
         @focus="_onFocus"
         @blur="_onBlur"
@@ -53,8 +54,10 @@
 import {
   field
 } from 'uni-mixins'
-const INPUT_TYPES = ['text', 'number', 'idcard', 'digit', 'password']
+import { kebabCase } from 'uni-shared'
+const INPUT_TYPES = ['text', 'number', 'idcard', 'digit', 'password', 'tel']
 const NUMBER_TYPES = ['number', 'digit']
+const AUTOCOMPLETES = ['off', 'one-time-code']
 export default {
   name: 'Input',
   mixins: [field],
@@ -94,11 +97,14 @@ export default {
     confirmType: {
       type: String,
       default: 'done'
+    },
+    textContentType: {
+      type: String,
+      default: ''
     }
   },
   data () {
     return {
-      valid: true,
       wrapperHeight: 0,
       cachedValue: ''
     }
@@ -126,6 +132,16 @@ export default {
     step () {
       // 处理部分设备中无法输入小数点的问题
       return ~NUMBER_TYPES.indexOf(this.type) ? '0.000000000000000001' : ''
+    },
+    autocomplete () {
+      const camelizeIndex = AUTOCOMPLETES.indexOf(this.textContentType)
+      const kebabCaseIndex = AUTOCOMPLETES.indexOf(kebabCase(this.textContentType))
+      const index = camelizeIndex !== -1
+        ? camelizeIndex
+        : kebabCaseIndex !== -1
+          ? kebabCaseIndex
+          : 0
+      return AUTOCOMPLETES[index]
     }
   },
   watch: {
@@ -174,37 +190,48 @@ export default {
       })
     },
     _onInput ($event, force) {
+      let outOfMaxlength = false
+
       if (this.composing) {
         return
       }
 
-      if (~NUMBER_TYPES.indexOf(this.type)) {
-        // 在输入 - 负号 的情况下，event.target.value没有值，但是会触发校验 false，因此做此处理
-        this.valid = this.$refs.input.validity && this.$refs.input.validity.valid
-        this.cachedValue = this.valueSync
+      if (this.inputType === 'number') {
+        // type="number" 不支持 maxlength 属性，因此需要主动限制长度。
+        const maxlength = parseInt(this.maxlength, 10)
+        if (maxlength > 0 && $event.target.value.length > maxlength) {
+          // 输入前字符长度超出范围，则不触发input，且将值还原
+          // 否则截取一定长度且触发input
+          if (this.cachedValue.length === maxlength) {
+            this.valueSync = this.cachedValue
+            outOfMaxlength = true
+          } else {
+            $event.target.value = $event.target.value.slice(0, maxlength)
+            this.valueSync = $event.target.value
+          }
+        }
 
-        // 处理部分输入法可以输入其它字符的情况
-        // 上一处理导致无法输入 - ，因此去除
-        /* if (this.$refs.input.validity && !this.$refs.input.validity.valid) {
-          $event.target.value = this.cachedValue
-          this.valueSync = $event.target.value
+        // 数字类型输入错误时无法获取具体的值，自定义校验和纠正。
+        this.__clearCachedValue && $event.target.removeEventListener('blur', this.__clearCachedValue)
+        if ($event.target.validity && !$event.target.validity.valid) {
+          if ((!this.cachedValue && $event.data === '-') || (this.cachedValue[0] === '-' && $event.inputType === 'deleteContentBackward')) {
+            this.cachedValue = '-'
+            const clearCachedValue = this.__clearCachedValue = () => {
+              this.cachedValue = ''
+            }
+            $event.target.addEventListener('blur', clearCachedValue)
+            return
+          }
+          this.cachedValue = this.valueSync = $event.target.value = this.cachedValue === '-' ? '' : this.cachedValue
           // 输入非法字符不触发 input 事件
           return
         } else {
           this.cachedValue = this.valueSync
-        } */
-      }
-
-      // type="number" 不支持 maxlength 属性，因此需要主动限制长度。
-      if (this.inputType === 'number') {
-        const maxlength = parseInt(this.maxlength, 10)
-        if (maxlength > 0 && $event.target.value.length > maxlength) {
-          $event.target.value = $event.target.value.slice(0, maxlength)
-          this.valueSync = $event.target.value
-          // 字符长度超出范围不触发 input 事件
-          return
         }
       }
+
+      if (outOfMaxlength) return
+
       this.$triggerInput($event, {
         value: this.valueSync
       }, force)
@@ -299,7 +326,8 @@ uni-input[hidden] {
   text-shadow: inherit;
 }
 
-.uni-input-input[type="search"]::-webkit-search-cancel-button {
+.uni-input-input[type="search"]::-webkit-search-cancel-button,
+.uni-input-input[type="search"]::-webkit-search-decoration {
   display: none;
 }
 

package/src/core/view/components/picker-view-column/index.vue

@@ -122,6 +122,7 @@ export default {
             break
           case 'move':
             this._handleTouchMove(e)
+            e.stopPropagation()
             break
           case 'end':
           case 'cancel':

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

@@ -1,20 +1,20 @@
 <template>
-  <uni-progress
-    class="uni-progress"
-    v-on="$listeners"
+  <uni-progress
+    class="uni-progress"
+    v-on="$listeners"
   >
-    <div
-      :style="outerBarStyle"
-      class="uni-progress-bar"
+    <div
+      :style="outerBarStyle"
+      class="uni-progress-bar"
     >
-      <div
-        :style="innerBarStyle"
-        class="uni-progress-inner-bar"
+      <div
+        :style="innerBarStyle"
+        class="uni-progress-inner-bar"
       />
     </div>
     <template v-if="showInfo">
-      <p class="uni-progress-info">
-        {{ currentPercent }}%
+      <p class="uni-progress-info">
+        {{ currentPercent }}%
       </p>
     </template>
   </uni-progress>
@@ -65,6 +65,13 @@ export default {
     activeMode: {
       type: String,
       default: VALUES.activeMode
+    },
+    duration: {
+      type: [Number, String],
+      default: 30,
+      validator (value) {
+        return !isNaN(parseFloat(value, 10))
+      }
     }
   },
   data () {
@@ -117,7 +124,7 @@ export default {
           } else {
             this.currentPercent += 1
           }
-        }, 30)
+        }, parseFloat(this.duration))
       } else {
         this.currentPercent = this.realPercent
       }
@@ -154,4 +161,4 @@ export default {
 		margin-left: 15px;
 		font-size: 16px;
 	}
-</style>
+</style>