@dcloudio/uni-h5 2.0.0 → 2.0.1-32920211122002

package/src/platforms/mp-lark/runtime/api/protocols.js

@@ -0,0 +1,68 @@
+import navigateTo from 'uni-helpers/navigate-to'
+import redirectTo from '../../../mp-weixin/helpers/redirect-to'
+import previewImage from '../../../mp-weixin/helpers/normalize-preview-image'
+import getSystemInfo from '../../../mp-weixin/helpers/system-info'
+import getUserProfile from '../../../mp-weixin/helpers/get-user-profile'
+
+// 需要做转换的 API 列表
+export const protocols = {
+  navigateTo,
+  redirectTo,
+  previewImage,
+  getSystemInfo,
+  getSystemInfoSync: getSystemInfo,
+  getUserProfile,
+  connectSocket: {
+    args: {
+      method: false
+    }
+  },
+  chooseVideo: {
+    args: {
+      camera: false
+    }
+  },
+  scanCode: {
+    args: {
+      onlyFromCamera: false
+    }
+  },
+  startAccelerometer: {
+    args: {
+      interval: false
+    }
+  },
+  showToast: {
+    args: {
+      image: false
+    }
+  },
+  showModal: {
+    args: {
+      cancelColor: false,
+      confirmColor: false
+    }
+  },
+  showActionSheet: {
+    args: {
+      itemColor: false,
+      alertText: false
+    }
+  },
+  login: {
+    args: {
+      scopes: false,
+      timeout: false
+    }
+  },
+  getUserInfo: {
+    args: {
+      lang: false,
+      timeout: false
+    }
+  }
+}
+
+export const todos = []
+
+export const canIUses = []

package/src/platforms/mp-lark/runtime/api/providers.js

@@ -0,0 +1,6 @@
+export default {
+  oauth: ['lark'],
+  share: ['lark'],
+  payment: [''],
+  push: ['']
+}

package/src/platforms/mp-lark/runtime/index.js

@@ -0,0 +1 @@
+import '../../mp-weixin/runtime/index'

package/src/platforms/mp-lark/runtime/web-view.js

@@ -0,0 +1,11 @@
+const isLark = window.tt &&
+  window.tt.miniProgram &&
+  /Lark|Feishu/i.test(navigator.userAgent)
+
+export function initWebviewApi (readyCallback) {
+  if (!isLark) {
+    return
+  }
+  document.addEventListener('DOMContentLoaded', readyCallback)
+  return window.tt.miniProgram
+}

package/src/platforms/mp-lark/runtime/wrapper/app-parser.js

@@ -0,0 +1,33 @@
+import Vue from 'vue'
+
+import parseBaseApp from '../../../mp-weixin/runtime/wrapper/app-base-parser'
+
+import {
+  mocks,
+  initRefs
+} from './util'
+
+export default function parseApp (vm) {
+  Vue.prototype._$fallback = true // 降级（调整原 vue 的部分生命周期，如 created，beforeMount,inject,provide）
+
+  Vue.mixin({
+    created () { // 处理 injections, triggerEvent 是异步，且触发时机很慢，故延迟 relation 设置
+      if (this.mpType !== 'app') {
+        if (this.mpType === 'page' && !this.$scope.route && this.$scope.__route__
+        ) {
+          this.$scope.route = this.$scope.__route__
+        }
+
+        initRefs(this)
+
+        this.__init_injections(this)
+        this.__init_provide(this)
+      }
+    }
+  })
+
+  return parseBaseApp(vm, {
+    mocks,
+    initRefs: function () {} // attached 时，可能查询不到
+  })
+}

package/src/platforms/mp-lark/runtime/wrapper/component-parser.js

@@ -0,0 +1,50 @@
+import {
+  isPage,
+  initRelation,
+  handleLink
+} from './util'
+
+import {
+  initSlots,
+  initVueIds
+} from 'uni-wrapper/util'
+
+import parseBaseComponent from '../../../mp-weixin/runtime/wrapper/component-base-parser'
+
+export default function parseComponent (vueOptions) {
+  const [componentOptions, VueComponent] = parseBaseComponent(vueOptions)
+
+  componentOptions.lifetimes.attached = function attached () {
+    const properties = this.properties
+
+    const options = {
+      mpType: isPage.call(this) ? 'page' : 'component',
+      mpInstance: this,
+      propsData: properties
+    }
+
+    initVueIds(properties.vueId, this)
+
+    // 初始化 vue 实例
+    this.$vm = new VueComponent(options)
+
+    // 处理$slots,$scopedSlots（暂不支持动态变化$slots）
+    initSlots(this.$vm, properties.vueSlots)
+
+    // 处理父子关系
+    initRelation.call(this, {
+      vuePid: this._$vuePid,
+      mpInstance: this
+    })
+
+    // 触发首次 setData
+    this.$vm.$mount()
+  }
+
+  // ready 比 handleLink 还早，初始化逻辑放到 handleLink 中
+  delete componentOptions.lifetimes.ready
+
+  componentOptions.methods.__l = handleLink
+
+  return componentOptions
+}

package/src/platforms/mp-lark/runtime/wrapper/page-parser.js

@@ -0,0 +1,39 @@
+import {
+  isPage,
+  instances,
+  initRelation
+} from './util'
+
+import parseBasePage from '../../../mp-weixin/runtime/wrapper/page-base-parser'
+
+export default function parsePage (vuePageOptions) {
+  const pageOptions = parseBasePage(vuePageOptions, {
+    isPage,
+    initRelation
+  })
+  // 页面需要在 ready 中触发，其他组件是在 handleLink 中触发
+  pageOptions.lifetimes.ready = function ready () {
+    if (this.$vm && this.$vm.mpType === 'page') {
+      this.$vm.__call_hook('created')
+      this.$vm.__call_hook('beforeMount')
+      this.$vm._isMounted = true
+      this.$vm.__call_hook('mounted')
+      this.$vm.__call_hook('onReady')
+    } else {
+      this.is && console.warn(this.is + ' is not ready')
+    }
+  }
+
+  pageOptions.lifetimes.detached = function detached () {
+    this.$vm && this.$vm.$destroy()
+    // 清理
+    const webviewId = this.__webviewId__
+    webviewId && Object.keys(instances).forEach(key => {
+      if (key.indexOf(webviewId + '_') === 0) {
+        delete instances[key]
+      }
+    })
+  }
+
+  return pageOptions
+}

package/src/platforms/mp-lark/runtime/wrapper/util.js

@@ -0,0 +1,64 @@
+import {
+  findVmByVueId,
+  initRefs
+} from '../../../mp-weixin/runtime/wrapper/util'
+
+export { initRefs }
+
+export const mocks = ['__route__', '__webviewId__', '__nodeid__', '__nodeId__']
+
+export const instances = Object.create(null)
+
+export function isPage () {
+  return this.__nodeid__ === 0 || this.__nodeId__ === 0
+}
+
+export function initRelation ({
+  vuePid,
+  mpInstance
+}) {
+  // triggerEvent 后，接收事件时机特别晚，已经到了 ready 之后
+  const nodeId = (mpInstance.__nodeId__ || mpInstance.__nodeid__) + ''
+  const webviewId = mpInstance.__webviewId__ + ''
+
+  instances[webviewId + '_' + nodeId] = mpInstance.$vm
+
+  this.triggerEvent('__l', {
+    vuePid,
+    nodeId,
+    webviewId
+  })
+}
+
+export function handleLink ({
+  detail: {
+    vuePid,
+    nodeId,
+    webviewId
+  }
+}) {
+  const vm = instances[webviewId + '_' + nodeId]
+  if (!vm) {
+    return
+  }
+
+  let parentVm
+
+  if (vuePid) {
+    parentVm = findVmByVueId(this.$vm, vuePid)
+  }
+
+  if (!parentVm) {
+    parentVm = this.$vm
+  }
+
+  vm.$parent = parentVm
+  vm.$root = parentVm.$root
+  parentVm.$children.push(vm)
+
+  vm.__call_hook('created')
+  vm.__call_hook('beforeMount')
+  vm._isMounted = true
+  vm.__call_hook('mounted')
+  vm.__call_hook('onReady')
+}

package/src/platforms/mp-qq/runtime/api/protocols.js

@@ -2,13 +2,15 @@ import navigateTo from 'uni-helpers/navigate-to'
 import redirectTo from '../../../mp-weixin/helpers/redirect-to'
 import previewImage from '../../../mp-weixin/helpers/normalize-preview-image'
 import getSystemInfo from '../../../mp-weixin/helpers/system-info'
+import getUserProfile from '../../../mp-weixin/helpers/get-user-profile'
 
 export const protocols = {
   navigateTo,
   redirectTo,
   previewImage,
   getSystemInfo,
-  getSystemInfoSync: getSystemInfo
+  getSystemInfoSync: getSystemInfo,
+  getUserProfile
 }
 export const todos = [
   'preloadPage',

package/src/platforms/mp-toutiao/runtime/api/protocols.js

@@ -2,6 +2,7 @@ import navigateTo from 'uni-helpers/navigate-to'
 import redirectTo from '../../../mp-weixin/helpers/redirect-to'
 import previewImage from '../../../mp-weixin/helpers/normalize-preview-image'
 import getSystemInfo from '../../../mp-weixin/helpers/system-info'
+import getUserProfile from '../../../mp-weixin/helpers/get-user-profile'
 
 // 不支持的 API 列表
 const todos = [
@@ -107,6 +108,7 @@ const protocols = {
   previewImage,
   getSystemInfo,
   getSystemInfoSync: getSystemInfo,
+  getUserProfile,
   connectSocket: {
     args: {
       method: false

package/src/platforms/mp-toutiao/runtime/wrapper/component-parser.js

@@ -11,34 +11,50 @@ import {
 
 import parseBaseComponent from '../../../mp-weixin/runtime/wrapper/component-base-parser'
 
+const components = []
+
 export default function parseComponent (vueOptions) {
   const [componentOptions, VueComponent] = parseBaseComponent(vueOptions)
 
+  // 基础库 2.0 以上 attached 顺序错乱，按照 created 顺序强制纠正
+  componentOptions.lifetimes.created = function created () {
+    components.push(this)
+  }
+
   componentOptions.lifetimes.attached = function attached () {
-    const properties = this.properties
+    this.__lifetimes_attached = function () {
+      const properties = this.properties
 
-    const options = {
-      mpType: isPage.call(this) ? 'page' : 'component',
-      mpInstance: this,
-      propsData: properties
-    }
+      const options = {
+        mpType: isPage.call(this) ? 'page' : 'component',
+        mpInstance: this,
+        propsData: properties
+      }
 
-    initVueIds(properties.vueId, this)
+      initVueIds(properties.vueId, this)
 
-    // 初始化 vue 实例
-    this.$vm = new VueComponent(options)
+      // 初始化 vue 实例
+      this.$vm = new VueComponent(options)
 
-    // 处理$slots,$scopedSlots（暂不支持动态变化$slots）
-    initSlots(this.$vm, properties.vueSlots)
+      // 处理$slots,$scopedSlots（暂不支持动态变化$slots）
+      initSlots(this.$vm, properties.vueSlots)
 
-    // 处理父子关系
-    initRelation.call(this, {
-      vuePid: this._$vuePid,
-      mpInstance: this
-    })
+      // 处理父子关系
+      initRelation.call(this, {
+        vuePid: this._$vuePid,
+        mpInstance: this
+      })
 
-    // 触发首次 setData
-    this.$vm.$mount()
+      // 触发首次 setData
+      this.$vm.$mount()
+    }
+    let component = this
+    while (component && component.__lifetimes_attached && components[0] && component === components[0]) {
+      components.shift()
+      component.__lifetimes_attached()
+      delete component.__lifetimes_attached
+      component = components[0]
+    }
   }
 
   // ready 比 handleLink 还早，初始化逻辑放到 handleLink 中
@@ -47,4 +63,4 @@ export default function parseComponent (vueOptions) {
   componentOptions.methods.__l = handleLink
 
   return componentOptions
-}
+}

package/src/platforms/mp-weixin/helpers/get-user-profile.js

@@ -0,0 +1,6 @@
+const oName = 'getUserInfo'
+const nName = 'getUserProfile'
+
+export default {
+  name: __GLOBAL__.canIUse(nName) ? nName : oName
+}

package/src/platforms/mp-weixin/runtime/index.js

@@ -13,18 +13,17 @@ const customize = cached((str) => {
 })
 
 function initTriggerEvent (mpInstance) {
-  if (__PLATFORM__ === 'mp-weixin' || __PLATFORM__ === 'app-plus') {
-    if (!wx.canIUse || !wx.canIUse('nextTick')) {
-      return
-    }
-  }
   const oldTriggerEvent = mpInstance.triggerEvent
   mpInstance.triggerEvent = function (event, ...args) {
     return oldTriggerEvent.apply(mpInstance, [customize(event), ...args])
   }
 }
 
-function initHook (name, options) {
+function initHook (name, options, isComponent) {
+  if (__PLATFORM__ === 'mp-toutiao') {
+    // fix by Lxh 字节自定义组件Component构造器文档上写有created，但是实测只触发了lifetimes上的created
+    isComponent && (options = options.lifetimes)
+  }
   const oldHook = options[name]
   if (!oldHook) {
     options[name] = function () {
@@ -46,7 +45,7 @@ if (!MPPage.__$wrappered) {
   Page.after = MPPage.after
 
   Component = function (options = {}) {
-    initHook('created', options)
+    initHook('created', options, true)
     return MPComponent(options)
   }
 }