Merge branch 'dev' of github.com:dcloudio/uni-app into dev

packages/uni-app-plus/dist/index.js

@@ -21,7 +21,7 @@ function hasOwn (obj, key) {
 
 function noop () {}
 
-const SYNC_API_RE = /hideKeyboard|upx2px|canIUse|^create|Sync$|Manager$/;
+const SYNC_API_RE = /requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$/;
 
 const CONTEXT_API_RE = /^create|Manager$/;
 
@@ -228,35 +228,6 @@ TODOS.forEach(function (name) {
   todoApis[name] = createTodoApi(name);
 });
 
-var providers = {};
-
-function getProvider ({
-  service,
-  success,
-  fail,
-  complete
-}) {
-  let res = false;
-  if (providers[service]) {
-    res = {
-      errMsg: 'getProvider:ok',
-      service,
-      provider: providers[service]
-    };
-    isFn(success) && success(res);
-  } else {
-    res = {
-      errMsg: 'getProvider:fail:服务[' + service + ']不存在'
-    };
-    isFn(fail) && fail(res);
-  }
-  isFn(complete) && complete(res);
-}
-
-var extraApi = /*#__PURE__*/Object.freeze({
-  getProvider: getProvider
-});
-
 function requireNativePlugin (pluginName) {
   /* eslint-disable no-undef */
   return __requireNativePlugin__(pluginName)
@@ -289,13 +260,13 @@ function initHooks (mpOptions, hooks, delay = false) {
   });
 }
 
-function getData (vueOptions) {
+function getData (vueOptions, context) {
   let data = vueOptions.data || {};
   const methods = vueOptions.methods || {};
 
   if (typeof data === 'function') {
     try {
-      data = data();
+      data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
       if (process.env.VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
@@ -561,7 +532,7 @@ const hooks$1 = [
 function createPage (vueOptions) {
   vueOptions = vueOptions.default || vueOptions;
   const pageOptions = {
-    data: getData(vueOptions),
+    data: getData(vueOptions, Vue.prototype),
     onLoad (args) {
 
       this.$vm = new Vue(Object.assign(vueOptions, {
@@ -570,7 +541,7 @@ function createPage (vueOptions) {
       }));
 
       this.$vm.__call_hook('created');
-      this.$vm.__call_hook('onLoad', args); // 开发者一般可能会在 onLoad 时赋值，所以提前到 mount 之前
+      this.$vm.__call_hook('onLoad', args); // 开发者可能会在 onLoad 时赋值，提前到 mount 之前
       this.$vm.$mount();
     },
     onReady () {
@@ -615,6 +586,9 @@ function initVueComponent (mpInstace, VueComponent, extraOptions = {}) {
     });
     mpInstace.$vm.$scopedSlots = mpInstace.$vm.$slots = $slots;
   }
+  // 性能优先，mount 提前到 attached 中，保证组件首次渲染数据被合并
+  // 导致与标准 Vue 的差异，data 和 computed 中不能使用$parent，provide等组件属性
+  mpInstace.$vm.$mount();
 }
 
 function createComponent (vueOptions) {
@@ -629,7 +603,7 @@ function createComponent (vueOptions) {
       multipleSlots: true,
       addGlobalClass: true
     },
-    data: getData(vueOptions),
+    data: getData(vueOptions, Vue.prototype),
     properties,
     lifetimes: {
       attached () {
@@ -639,9 +613,9 @@ function createComponent (vueOptions) {
         initVueComponent(this, VueComponent); // 目前发现部分情况小程序 attached 不触发
         triggerLink(this); // 处理 parent,children
 
-        // 初始化渲染数据(需要等 parent，inject 都初始化完成，否则可以放到 attached 里边初始化渲染)
+        // 补充生命周期
         this.$vm.__call_hook('created');
-        this.$vm.$mount();
+        this.$vm.__call_hook('beforeMount');
         this.$vm._isMounted = true;
         this.$vm.__call_hook('mounted');
         this.$vm.__call_hook('onReady');
@@ -680,13 +654,7 @@ if (typeof Proxy !== 'undefined') {
       }
       if (api[name]) {
         return promisify(name, api[name])
-      }
-      if (extraApi[name]) {
-        return promisify(name, extraApi[name])
-      }
-      if (todoApis[name]) {
-        return promisify(name, todoApis[name])
-      }
+      }
       if (!hasOwn(wx, name) && !hasOwn(protocols, name)) {
         return
       }
@@ -696,14 +664,6 @@ if (typeof Proxy !== 'undefined') {
 } else {
   uni.upx2px = upx2px;
 
-  Object.keys(todoApis).forEach(name => {
-    uni[name] = promisify(name, todoApis[name]);
-  });
-
-  Object.keys(extraApi).forEach(name => {
-    uni[name] = promisify(name, todoApis[name]);
-  });
-
   Object.keys(api).forEach(name => {
     uni[name] = promisify(name, api[name]);
   });

packages/uni-app-plus/package.json

 {
 	"name": "@dcloudio/uni-app-plus",
-	"version": "0.0.202",
+	"version": "0.0.204",
 	"description": "uni-app app-plus",
 	"main": "dist/index.js",
 	"scripts": {

packages/uni-mp-weixin/dist/index.js

@@ -21,7 +21,7 @@ function hasOwn (obj, key) {
 
 function noop () {}
 
-const SYNC_API_RE = /hideKeyboard|upx2px|canIUse|^create|Sync$|Manager$/;
+const SYNC_API_RE = /requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$/;
 
 const CONTEXT_API_RE = /^create|Manager$/;
 
@@ -291,13 +291,13 @@ function initHooks (mpOptions, hooks, delay = false) {
   });
 }
 
-function getData (vueOptions) {
+function getData (vueOptions, context) {
   let data = vueOptions.data || {};
   const methods = vueOptions.methods || {};
 
   if (typeof data === 'function') {
     try {
-      data = data();
+      data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
       if (process.env.VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
@@ -563,7 +563,7 @@ const hooks$1 = [
 function createPage (vueOptions) {
   vueOptions = vueOptions.default || vueOptions;
   const pageOptions = {
-    data: getData(vueOptions),
+    data: getData(vueOptions, Vue.prototype),
     onLoad (args) {
 
       this.$vm = new Vue(Object.assign(vueOptions, {
@@ -572,7 +572,7 @@ function createPage (vueOptions) {
       }));
 
       this.$vm.__call_hook('created');
-      this.$vm.__call_hook('onLoad', args); // 开发者一般可能会在 onLoad 时赋值，所以提前到 mount 之前
+      this.$vm.__call_hook('onLoad', args); // 开发者可能会在 onLoad 时赋值，提前到 mount 之前
       this.$vm.$mount();
     },
     onReady () {
@@ -634,7 +634,7 @@ function createComponent (vueOptions) {
       multipleSlots: true,
       addGlobalClass: true
     },
-    data: getData(vueOptions),
+    data: getData(vueOptions, Vue.prototype),
     properties,
     lifetimes: {
       attached () {
@@ -685,9 +685,11 @@ if (typeof Proxy !== 'undefined') {
       }
       if (api[name]) {
         return promisify(name, api[name])
-      }
-      if (extraApi[name]) {
-        return promisify(name, extraApi[name])
+      }
+      {
+        if (extraApi[name]) {
+          return promisify(name, extraApi[name])
+        }
       }
       if (todoApis[name]) {
         return promisify(name, todoApis[name])
@@ -704,10 +706,12 @@ if (typeof Proxy !== 'undefined') {
   Object.keys(todoApis).forEach(name => {
     uni[name] = promisify(name, todoApis[name]);
   });
-
-  Object.keys(extraApi).forEach(name => {
-    uni[name] = promisify(name, todoApis[name]);
-  });
+
+  {
+    Object.keys(extraApi).forEach(name => {
+      uni[name] = promisify(name, todoApis[name]);
+    });
+  }
 
   Object.keys(api).forEach(name => {
     uni[name] = promisify(name, api[name]);

packages/uni-mp-weixin/package.json

 {
 	"name": "@dcloudio/uni-mp-weixin",
-	"version": "0.0.913",
+	"version": "0.0.914",
 	"description": "uni-app mp-weixin",
 	"main": "dist/index.js",
 	"scripts": {

src/core/helpers/promise.js

@@ -2,7 +2,7 @@ import {
   isFn
 } from 'uni-shared'
 
-const SYNC_API_RE = /hideKeyboard|upx2px|canIUse|^create|Sync$|Manager$/
+const SYNC_API_RE = /requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$/
 
 const CONTEXT_API_RE = /^create|Manager$/
 

src/core/runtime/index.js

@@ -13,8 +13,8 @@ import {
 import wrapper from './wrapper'
 
 import todoApi from './todo'
-
-import * as extraApi from './extra'
+
+import * as extraApi from './extra'
 
 import * as api from 'uni-platform/service/api/index.js'
 
@@ -30,12 +30,14 @@ if (typeof Proxy !== 'undefined') {
       }
       if (api[name]) {
         return promisify(name, api[name])
-      }
-      if (extraApi[name]) {
-        return promisify(name, extraApi[name])
-      }
-      if (todoApi[name]) {
-        return promisify(name, todoApi[name])
+      }
+      if (__PLATFORM__ !== 'app-plus') {
+        if (extraApi[name]) {
+          return promisify(name, extraApi[name])
+        }
+        if (todoApi[name]) {
+          return promisify(name, todoApi[name])
+        }
       }
       if (!hasOwn(__GLOBAL__, name) && !hasOwn(protocols, name)) {
         return
@@ -46,13 +48,14 @@ if (typeof Proxy !== 'undefined') {
 } else {
   uni.upx2px = upx2px
 
-  Object.keys(todoApi).forEach(name => {
-    uni[name] = promisify(name, todoApi[name])
-  })
-
-  Object.keys(extraApi).forEach(name => {
-    uni[name] = promisify(name, todoApi[name])
-  })
+  if (__PLATFORM__ !== 'app-plus') {
+    Object.keys(todoApi).forEach(name => {
+      uni[name] = promisify(name, todoApi[name])
+    })
+    Object.keys(extraApi).forEach(name => {
+      uni[name] = promisify(name, todoApi[name])
+    })
+  }
 
   Object.keys(api).forEach(name => {
     uni[name] = promisify(name, api[name])

src/core/runtime/wrapper/create-component.js

@@ -50,7 +50,7 @@ export function createComponent (vueOptions) {
       multipleSlots: true,
       addGlobalClass: true
     },
-    data: getData(vueOptions),
+    data: getData(vueOptions, Vue.prototype),
     properties,
     lifetimes: {
       attached () {

src/core/runtime/wrapper/create-page.js

@@ -30,7 +30,7 @@ const hooks = [
 export function createPage (vueOptions) {
   vueOptions = vueOptions.default || vueOptions
   const pageOptions = {
-    data: getData(vueOptions),
+    data: getData(vueOptions, Vue.prototype),
     onLoad (args) {
       if (__PLATFORM__ === 'mp-baidu') {
         this.$baiduComponentInstances = Object.create(null)
@@ -42,7 +42,7 @@ export function createPage (vueOptions) {
       }))
 
       this.$vm.__call_hook('created')
-      this.$vm.__call_hook('onLoad', args) // 开发者一般可能会在 onLoad 时赋值，所以提前到 mount 之前
+      this.$vm.__call_hook('onLoad', args) // 开发者可能会在 onLoad 时赋值，提前到 mount 之前
       this.$vm.$mount()
     },
     onReady () {

src/core/runtime/wrapper/util.js

@@ -28,13 +28,13 @@ export function initHooks (mpOptions, hooks, delay = false) {
   })
 }
 
-export function getData (vueOptions) {
+export function getData (vueOptions, context) {
   let data = vueOptions.data || {}
   const methods = vueOptions.methods || {}
 
   if (typeof data === 'function') {
     try {
-      data = data()
+      data = data.call(context) // 支持 Vue.prototype 上挂的数据
     } catch (e) {
       if (process.env.VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data)

src/core/service/api/media/get-image-info.js

+import getRealPath from 'uni-platform/helpers/get-real-path'
+
+function _getServiceAddress () {
+  return window.location.protocol + '//' + window.location.host
+}
+
 export function getImageInfo ({
   src
 }, callbackId) {
@@ -5,11 +11,13 @@ export function getImageInfo ({
     invokeCallbackHandler: invoke
   } = UniServiceJSBridge
   const img = new Image()
+  const realPath = getRealPath(src)
   img.onload = function () {
     invoke(callbackId, {
       errMsg: 'getImageInfo:ok',
       width: img.naturalWidth,
-      height: img.naturalHeight
+      height: img.naturalHeight,
+      path: realPath.indexOf('/') === 0 ? _getServiceAddress() + realPath : realPath
     })
   }
   img.onerror = function (e) {
@@ -18,4 +26,4 @@ export function getImageInfo ({
     })
   }
   img.src = src
-}
+}

src/platforms/app-plus/service/api/require-native-plugin.js

+export default function requireNativePlugin (pluginName) {
+  /* eslint-disable no-undef */
+  return __requireNativePlugin__(pluginName)
+}