@dcloudio/uni-h5 2.0.0 → 2.0.1-32920211122002

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

@@ -1,14 +1,8 @@
-import {
-  parseTitleNView
-} from './title-nview-parser'
+import { parseTitleNView } from './title-nview-parser'
 
-import {
-  parsePullToRefresh
-} from './pull-to-refresh-parser'
+import { parsePullToRefresh } from './pull-to-refresh-parser'
 
-import {
-  parseStyleUnit
-} from './style-unit-parser'
+import { parseStyleUnit } from './style-unit-parser'
 
 const WEBVIEW_STYLE_BLACKLIST = [
   'navigationBarBackgroundColor',
@@ -33,10 +27,12 @@ export function parseWebviewStyle (id, path, routeOptions = {}) {
   }
 
   // 合并
-  routeOptions.window = parseStyleUnit(Object.assign(
-    JSON.parse(JSON.stringify(__uniConfig.window || {})),
-    routeOptions.window || {}
-  ))
+  routeOptions.window = parseStyleUnit(
+    Object.assign(
+      JSON.parse(JSON.stringify(__uniConfig.window || {})),
+      routeOptions.window || {}
+    )
+  )
 
   Object.keys(routeOptions.window).forEach(name => {
     if (WEBVIEW_STYLE_BLACKLIST.indexOf(name) === -1) {
@@ -45,7 +41,10 @@ export function parseWebviewStyle (id, path, routeOptions = {}) {
   })
 
   const backgroundColor = routeOptions.window.backgroundColor
-  if (/^#[a-z0-9]{6}$/i.test(backgroundColor) || backgroundColor === 'transparent') {
+  if (
+    /^#[a-z0-9]{6}$/i.test(backgroundColor) ||
+    backgroundColor === 'transparent'
+  ) {
     if (!webviewStyle.background) {
       webviewStyle.background = backgroundColor
     }
@@ -54,7 +53,7 @@ export function parseWebviewStyle (id, path, routeOptions = {}) {
     }
   }
 
-  const titleNView = parseTitleNView(routeOptions)
+  const titleNView = parseTitleNView(id, routeOptions)
   if (titleNView) {
     if (
       id === 1 &&
@@ -79,7 +78,8 @@ export function parseWebviewStyle (id, path, routeOptions = {}) {
     delete webviewStyle.popGesture
   }
 
-  if (routeOptions.meta.isQuit) { // 退出
+  if (routeOptions.meta.isQuit) {
+    // 退出
     webviewStyle.popGesture = plus.os.name === 'iOS' ? 'appback' : 'none'
   }
 

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

@@ -1,7 +1,7 @@
 import {
   uni
 } from 'uni-core/service/uni'
-
+import EventChannel from 'uni-helpers/EventChannel'
 import {
   invokeCallbackHandler,
   removeCallbackHandler
@@ -31,6 +31,12 @@ import {
 
 import vuePlugin from './framework/plugins'
 
+import {
+  initI18n
+} from 'uni-helpers/i18n'
+
+initI18n()
+
 // 挂靠在uni上，暂不做全局导出
 uni.__$wx__ = wx
 
@@ -45,5 +51,6 @@ export default {
   __registerPage: registerPage,
   uni,
   getApp,
-  getCurrentPages
-}
+  getCurrentPages,
+  EventChannel
+}

package/src/platforms/app-plus/service/publish-handler.js

@@ -8,6 +8,9 @@ export function publishHandler (eventType, args, pageIds) {
   }
   const evalJSCode =
     `typeof UniViewJSBridge !== 'undefined' && UniViewJSBridge.subscribeHandler("${eventType}",${args},__PAGE_ID__)`
+  if (process.env.NODE_ENV !== 'production') {
+    console.log(`UNIAPP[publishHandler]:[${+new Date()}]`, 'length', evalJSCode.length)
+  }
   pageIds.forEach(id => {
     const webview = plus.webview.getWebviewById(String(id))
     webview && webview.evalJS(evalJSCode.replace('__PAGE_ID__', id))

package/src/platforms/app-plus/view/bridge/subscribe/index.js

@@ -16,7 +16,8 @@ import {
 } from '../../constants'
 
 import {
-  WEBVIEW_READY
+  WEBVIEW_READY,
+  SET_LOCALE
 } from '../../../constants'
 
 const passiveOptions = supportsPassive ? {
@@ -56,7 +57,7 @@ function onPageCreate ({
   onPageScroll,
   onPageReachBottom,
   onReachBottomDistance
-}, pageId) {
+}, pageId) {
   setLocale(locale)
 
   onCssVar({
@@ -85,4 +86,5 @@ function onWebviewReady () { // service 主动发起检测
 export default function initSubscribe (subscribe) {
   subscribe(WEBVIEW_READY, onWebviewReady)
   subscribe(ON_PAGE_CREATE, onPageCreate)
-}
+  subscribe(SET_LOCALE, setLocale)
+}

package/src/platforms/app-plus/view/components/ad/index.vue

@@ -35,6 +35,10 @@ export default {
     dataCount: {
       type: Number,
       default: 5
+    },
+    channel: {
+      type: String,
+      default: ''
     }
   },
   data () {
@@ -69,53 +73,55 @@ export default {
     }
   },
   mounted () {
-    this._adId = 'AdView-' + this._newGUID()
-    const adStyle = Object.assign({
-      id: this._adId
-    }, this.position)
-    const adView = this.adView = plus.ad.createAdView(adStyle)
-    adView.interceptTouchEvent(false)
-    plus.webview.currentWebview().append(adView)
-    if (this.hidden) {
-      adView.hide()
-    }
-    this.$watch('attrs', () => {
-      this._request()
-    }, {
-      deep: true
-    })
-    this.$watch('position', () => {
-      this.adView && this.adView.setStyle(this.position)
-    }, {
-      deep: true
-    })
-    // 模板渲染有效
-    adView.setDislikeListener && adView.setDislikeListener((data) => {
-      this.adView && this.adView.close()
-      this.$refs.container.style.height = '0px'
-
-      this._updateView()
+    this._onParentReady(() => {
+      this._adId = 'AdView-' + this._newGUID()
+      const adStyle = Object.assign({
+        id: this._adId
+      }, this.position)
+      const adView = this.adView = plus.ad.createAdView(adStyle)
+      adView.interceptTouchEvent(false)
+      plus.webview.currentWebview().append(adView)
+      if (this.hidden) {
+        adView.hide()
+      }
+      this.$watch('attrs', () => {
+        this._request()
+      }, {
+        deep: true
+      })
+      this.$watch('position', () => {
+        this.adView && this.adView.setStyle(this.position)
+      }, {
+        deep: true
+      })
+      // 模板渲染有效
+      adView.setDislikeListener && adView.setDislikeListener((data) => {
+        this.adView && this.adView.close()
+        this.$refs.container.style.height = '0px'
 
-      this.$trigger('close', {}, data)
-    })
-    adView.setRenderingListener && adView.setRenderingListener((data) => {
-      if (data.result === 0) {
-        this.$refs.container.style.height = data.height + 'px'
         this._updateView()
-      } else {
-        this.$trigger('error', {}, {
-          errCode: data.result
-        })
-      }
-    })
-    adView.setAdClickedListener((data) => {
-      this.$trigger('adclicked', {}, data)
-    })
 
-    this._callbackId = this.$page.id + this._adId
-    UniViewJSBridge.subscribe(this._callbackId, this._handleAdData.bind(this))
+        this.$trigger('close', {}, data)
+      })
+      adView.setRenderingListener && adView.setRenderingListener((data) => {
+        if (data.result === 0) {
+          this.$refs.container.style.height = data.height + 'px'
+          this._updateView()
+        } else {
+          this.$trigger('error', {}, {
+            errCode: data.result
+          })
+        }
+      })
+      adView.setAdClickedListener((data) => {
+        this.$trigger('adclicked', {}, data)
+      })
+
+      this._callbackId = this.$page.id + this._adId
+      UniViewJSBridge.subscribe(this._callbackId, this._handleAdData.bind(this))
 
-    this._request()
+      this._request()
+    })
   },
   beforeDestroy () {
     this.adView && this.adView.close()
@@ -150,7 +156,10 @@ export default {
       const data = {
         adpid: adpid || this.adpid,
         width: this.position.width,
-        count: this.dataCount
+        count: this.dataCount,
+        ext: {
+          channel: this.channel
+        }
       }
       UniViewJSBridge.publishHandler('onAdMethodCallback', {
         callbackId: this._callbackId,

package/src/platforms/app-plus/view/components/cover-view/index.vue

@@ -15,12 +15,17 @@ export default {
   render (createElement) {
     let coverContent = ''
     const $slots = this.$slots.default || []
-    $slots.forEach(node => {
-      if (!node.tag) {
-        coverContent += node.text || ''
-      }
-    })
-    this.coverContent = coverContent
+    const _slots = $slots.filter(node => node.tag)
+    if (!_slots.length) {
+      $slots.forEach(node => {
+        if (!node.tag) {
+          coverContent += node.text || ''
+        }
+      })
+      this.coverContent = coverContent
+    } else {
+      coverContent = _slots
+    }
     return createElement('uni-cover-view', {
       on: {
         on: this.$listeners
@@ -28,7 +33,7 @@ export default {
     }, [createElement('div', {
       ref: 'container',
       staticClass: 'uni-cover-view'
-    }, [coverContent])])
+    }, [].concat(coverContent))])
   }
 }
 </script>
@@ -48,5 +53,6 @@ uni-cover-view[hidden] {
 uni-cover-view .uni-cover-view {
   width: 100%;
   height: 100%;
+  visibility: hidden;
 }
 </style>

package/src/platforms/app-plus/view/components/map/index.vue

@@ -189,34 +189,36 @@ export default {
     }
   },
   mounted () {
-    const mapStyle = Object.assign({}, this.attrs, this.position)
-    if (this.latitude && this.longitude) {
-      mapStyle.center = new plus.maps.Point(this.longitude, this.latitude)
-    }
-    const map = this.map = plus.maps.create(this.$page.id + '-map-' + (this.id || Date.now()), mapStyle)
-    map.__markers__ = []
-    map.__markers_map__ = {}
-    map.__lines__ = []
-    map.__circles__ = []
-    map.setZoom(parseInt(this.scale))
-    plus.webview.currentWebview().append(map)
-    if (this.hidden) {
-      map.hide()
-    }
-    this.$watch('position', () => {
-      this.map && this.map.setStyles(this.position)
-    }, {
-      deep: true
+    this._onParentReady(() => {
+      const mapStyle = Object.assign({}, this.attrs, this.position)
+      if (this.latitude && this.longitude) {
+        mapStyle.center = new plus.maps.Point(this.longitude, this.latitude)
+      }
+      const map = this.map = plus.maps.create(this.$page.id + '-map-' + (this.id || Date.now()), mapStyle)
+      map.__markers__ = []
+      map.__markers_map__ = {}
+      map.__lines__ = []
+      map.__circles__ = []
+      map.setZoom(parseInt(this.scale))
+      plus.webview.currentWebview().append(map)
+      if (this.hidden) {
+        map.hide()
+      }
+      this.$watch('position', () => {
+        this.map && this.map.setStyles(this.position)
+      }, {
+        deep: true
+      })
+      map.onclick = (e) => {
+        this.$trigger('click', {}, e)
+      }
+      map.onstatuschanged = (e) => {
+        this.$trigger('regionchange', {}, {})
+      }
+      this._addMarkers(this.markers)
+      this._addMapLines(this.polyline)
+      this._addMapCircles(this.circles)
     })
-    map.onclick = (e) => {
-      this.$trigger('click', {}, e)
-    }
-    map.onstatuschanged = (e) => {
-      this.$trigger('regionchange', {}, {})
-    }
-    this._addMarkers(this.markers)
-    this._addMapLines(this.polyline)
-    this._addMapCircles(this.circles)
   },
   beforeDestroy () {
     this.map && this.map.close()

package/src/platforms/app-plus/view/components/video/index.vue

@@ -61,7 +61,9 @@ const attrs = [
   'showLoading',
   'codec',
   'httpCache',
-  'playStrategy'
+  'playStrategy',
+  'header',
+  'advanced'
 ]
 
 export default {
@@ -169,6 +171,18 @@ export default {
     playStrategy: {
       type: [Number, String],
       default: 0
+    },
+    header: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    advanced: {
+      type: Array,
+      default () {
+        return []
+      }
     }
   },
   computed: {
@@ -183,30 +197,32 @@ export default {
     }
   },
   mounted () {
-    const video = this.video = plus.video.createVideoPlayer('video' + Date.now(), Object.assign({}, this.attrs, this.position))
-    plus.webview.currentWebview().append(video)
-    if (this.hidden) {
-      video.hide()
-    }
-    this.$watch('attrs', () => {
-      this.video && this.video.setStyles(this.attrs)
-    }, { deep: true })
-    this.$watch('position', () => {
-      this.video && this.video.setStyles(this.position)
-    }, { deep: true })
-    this.$watch('hidden', (val) => {
-      const video = this.video
-      if (video) {
-        video[val ? 'hide' : 'show']()
-        // iOS 隐藏状态设置 setStyles 不生效
-        if (!val) {
-          video.setStyles(this.position)
-        }
+    this._onParentReady(() => {
+      const video = this.video = plus.video.createVideoPlayer('video' + Date.now(), Object.assign({}, this.attrs, this.position))
+      plus.webview.currentWebview().append(video)
+      if (this.hidden) {
+        video.hide()
       }
-    })
-    events.forEach(key => {
-      video.addEventListener(key, (e) => {
-        this.$trigger(key, {}, { ...e.detail })
+      this.$watch('attrs', () => {
+        this.video && this.video.setStyles(this.attrs)
+      }, { deep: true })
+      this.$watch('position', () => {
+        this.video && this.video.setStyles(this.position)
+      }, { deep: true })
+      this.$watch('hidden', (val) => {
+        const video = this.video
+        if (video) {
+          video[val ? 'hide' : 'show']()
+          // iOS 隐藏状态设置 setStyles 不生效
+          if (!val) {
+            video.setStyles(this.position)
+          }
+        }
+      })
+      events.forEach(key => {
+        video.addEventListener(key, (e) => {
+          this.$trigger(key, {}, { ...e.detail })
+        })
       })
     })
   },

package/src/platforms/app-plus/view/framework/plugins/gesture.js

@@ -0,0 +1,17 @@
+if (String(navigator.vendor).indexOf('Apple') === 0) {
+  let firstEvent
+  let timeout
+  // 用于全局禁用 iOS 双击包含手势
+  document.documentElement.addEventListener('click', event => {
+    const TIME_MAX = 450
+    const PAGE_MAX = 44
+    clearTimeout(timeout)
+    if (firstEvent && Math.abs(event.pageX - firstEvent.pageX) <= PAGE_MAX && Math.abs(event.pageY - firstEvent.pageY) <= PAGE_MAX && event.timeStamp - firstEvent.timeStamp <= TIME_MAX) {
+      event.preventDefault()
+    }
+    firstEvent = event
+    timeout = setTimeout(() => {
+      firstEvent = null
+    }, TIME_MAX)
+  })
+}

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

@@ -12,6 +12,8 @@ import {
   initEvent
 } from './event'
 
+import './gesture'
+
 export default {
   install (Vue, options) {
     if (process.env.NODE_ENV !== 'production') {
@@ -29,4 +31,4 @@ export default {
 
     initEvent(Vue)
   }
-}
+}

package/src/platforms/app-plus/view/index.css

@@ -72,6 +72,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/platforms/app-plus/view/mixins/cover.js

@@ -8,7 +8,8 @@ export default {
   name: 'Cover',
   data () {
     return {
-      style: {}
+      style: {},
+      parentPosition: {}
     }
   },
   computed: {
@@ -17,12 +18,12 @@ export default {
       for (const key in this.position) {
         let val = this.position[key]
         const valNumber = parseFloat(val)
-        const parentValNumber = parseFloat(this._nativeParent.position[key])
+        const parentValNumber = parseFloat(this.parentPosition[key])
         if (key === 'top' || key === 'left') {
           val = Math.max(valNumber, parentValNumber) + 'px'
         } else if (key === 'width' || key === 'height') {
           const base = key === 'width' ? 'left' : 'top'
-          const parentStart = parseFloat(this._nativeParent.position[base])
+          const parentStart = parseFloat(this.parentPosition[base])
           const viewStart = parseFloat(this.position[base])
           const diff1 = Math.max(parentStart - viewStart, 0)
           const diff2 = Math.max((viewStart + valNumber) - (parentStart + parentValNumber), 0)
@@ -91,16 +92,10 @@ export default {
     this._nativeParent = $parent
   },
   mounted () {
-    this._updateStyle()
-    const $nativeParent = this._nativeParent
-    if ($nativeParent.isNative) {
-      if ($nativeParent._isMounted) {
-        this._onCanInsert()
-      } else {
-        $nativeParent.onCanInsertCallbacks.push(() => {
-          this._onCanInsert()
-        })
-      }
+    this._onParentReady((parentPosition) => {
+      this.parentPosition = this._nativeParent.position || parentPosition
+      this._updateStyle()
+      this._onCanInsert()
       this.$watch('hidden', (val) => {
         this.cover && this.cover[val ? 'hide' : 'show']()
       })
@@ -115,7 +110,7 @@ export default {
         }
       }, { deep: true })
       this.$on('uni-view-update', this._requestStyleUpdate)
-    }
+    })
   },
   beforeDestroy () {
     if (this._nativeParent.isNative) {
@@ -139,7 +134,7 @@ export default {
       for (const key in this.position) {
         let val = this.position[key]
         if (key === 'top' || key === 'left') {
-          val = Math.min((parseFloat(val) - parseFloat(this._nativeParent.position[key])), 0) + 'px'
+          val = Math.min((parseFloat(val) - parseFloat(this.parentPosition[key])), 0) + 'px'
         }
         position[key] = val
       }

package/src/platforms/app-plus/view/mixins/native.js

@@ -26,15 +26,23 @@ export default {
       hidden: false
     }
   },
+  provide () {
+    return {
+      parentOnDraw: this._onDraw
+    }
+  },
+  inject: {
+    parentOnDraw: { default: null }
+  },
   created () {
     this.isNative = true
     this.onCanInsertCallbacks = []
+    this.onDrawCallbacks = []
   },
   mounted () {
     this._updatePosition()
-    this.$nextTick(() => {
-      this.onCanInsertCallbacks.forEach(callback => callback())
-    })
+    this.onCanInsertCallbacks.forEach(callback => callback())
+    this.onCanInsertCallbacks = null
     this.$on('uni-view-update', this._requestPositionUpdate)
   },
   methods: {
@@ -60,6 +68,40 @@ export default {
         delete this._positionUpdateRequest
         this._updatePosition()
       })
+    },
+    _onParentReady (parentReadyCallback) {
+      const callback = (parentPosition) => {
+        parentReadyCallback(parentPosition)
+        this.onDrawCallbacks.forEach(callback => callback(this.position))
+        this.onDrawCallbacks = null
+      }
+      this._onSelfReady(() => {
+        if (this.parentOnDraw) {
+          this.parentOnDraw(callback)
+        } else {
+          callback({
+            top: '0px',
+            left: '0px',
+            width: Number.MAX_SAFE_INTEGER + 'px',
+            height: Number.MAX_SAFE_INTEGER + 'px',
+            position: 'static'
+          })
+        }
+      })
+    },
+    _onSelfReady (callback) {
+      if (this.onCanInsertCallbacks) {
+        this.onCanInsertCallbacks.push(callback)
+      } else {
+        callback()
+      }
+    },
+    _onDraw (callback) {
+      if (this.onDrawCallbacks) {
+        this.onDrawCallbacks.push(callback)
+      } else {
+        callback(this.position)
+      }
     }
   }
 }

package/src/platforms/app-plus-nvue/service/api/context/operate-map-player.js

@@ -52,6 +52,9 @@ const METHODS = {
   },
   openMapApp (ctx, args) {
     return invokeVmMethod(ctx, 'openMapApp', args)
+  },
+  on (ctx, args) {
+    return ctx.on(args.name, args.callback)
   }
 }
 

package/src/platforms/h5/components/app/observable.js

@@ -1,3 +1,4 @@
 import Vue from 'vue'
-__uniConfig.tabBar = Vue.observable(__uniConfig.tabBar || {})
-export const tabBar = __uniConfig.tabBar
+import { initTabBarI18n } from 'uni-helpers/i18n'
+__uniConfig.tabBar = Vue.observable(initTabBarI18n(__uniConfig.tabBar || {}))
+export const tabBar = __uniConfig.tabBar

package/src/platforms/h5/components/app/popup/mixins/modal.js

@@ -21,9 +21,9 @@ export default {
   },
   methods: {
     // 处理 modal close 回调
-    _onModalClose (type) {
+    _onModalClose (res) {
       this.showModal.visible = false
-      isFn(this.onModalCloseCallback) && this.onModalCloseCallback(type)
+      isFn(this.onModalCloseCallback) && this.onModalCloseCallback(res)
     }
   }
-}
+}