chore: build runtime

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

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

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

@@ -2023,11 +2023,14 @@ function initScopedSlotsParams () {
   };
 
   Vue.prototype.$setScopedSlotsParams = function (name, value) {
-    const vueId = this.$options.propsData.vueId;
-    const object = center[vueId] = center[vueId] || {};
-    object[name] = value;
-    if (parents[vueId]) {
-      parents[vueId].$forceUpdate();
+    const vueIds = this.$options.propsData.vueId;
+    if (vueIds) {
+      const vueId = vueIds.split(',')[0];
+      const object = center[vueId] = center[vueId] || {};
+      object[name] = value;
+      if (parents[vueId]) {
+        parents[vueId].$forceUpdate();
+      }
     }
   };
 
@@ -2723,6 +2726,7 @@ function createSubpackageApp (vm) {
   const app = getApp({
     allowDefault: true
   });
+  vm.$scope = app;
   const globalData = app.globalData;
   if (globalData) {
     Object.keys(appOptions.globalData).forEach(name => {
@@ -2737,18 +2741,18 @@ function createSubpackageApp (vm) {
     }
   });
   if (isFn(appOptions.onShow) && my.onAppShow) {
-    my.onAppShow((...args) => {
-      appOptions.onShow.apply(app, args);
+    my.onAppShow((...args) => {
+      vm.__call_hook('onShow', args);
     });
   }
   if (isFn(appOptions.onHide) && my.onAppHide) {
-    my.onAppHide((...args) => {
-      appOptions.onHide.apply(app, args);
+    my.onAppHide((...args) => {
+      vm.__call_hook('onHide', args);
     });
   }
   if (isFn(appOptions.onLaunch)) {
     const args = my.getLaunchOptionsSync && my.getLaunchOptionsSync();
-    appOptions.onLaunch.call(app, args);
+    vm.__call_hook('onLaunch', args);
   }
   return vm
 }

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

@@ -1710,11 +1710,14 @@ function initScopedSlotsParams () {
   };
 
   Vue.prototype.$setScopedSlotsParams = function (name, value) {
-    const vueId = this.$options.propsData.vueId;
-    const object = center[vueId] = center[vueId] || {};
-    object[name] = value;
-    if (parents[vueId]) {
-      parents[vueId].$forceUpdate();
+    const vueIds = this.$options.propsData.vueId;
+    if (vueIds) {
+      const vueId = vueIds.split(',')[0];
+      const object = center[vueId] = center[vueId] || {};
+      object[name] = value;
+      if (parents[vueId]) {
+        parents[vueId].$forceUpdate();
+      }
     }
   };
 
@@ -2228,6 +2231,7 @@ function createSubpackageApp (vm) {
   const app = getApp({
     allowDefault: true
   });
+  vm.$scope = app;
   const globalData = app.globalData;
   if (globalData) {
     Object.keys(appOptions.globalData).forEach(name => {
@@ -2242,18 +2246,18 @@ function createSubpackageApp (vm) {
     }
   });
   if (isFn(appOptions.onShow) && swan.onAppShow) {
-    swan.onAppShow((...args) => {
-      appOptions.onShow.apply(app, args);
+    swan.onAppShow((...args) => {
+      vm.__call_hook('onShow', args);
     });
   }
   if (isFn(appOptions.onHide) && swan.onAppHide) {
-    swan.onAppHide((...args) => {
-      appOptions.onHide.apply(app, args);
+    swan.onAppHide((...args) => {
+      vm.__call_hook('onHide', args);
     });
   }
   if (isFn(appOptions.onLaunch)) {
     const args = swan.getLaunchOptionsSync && swan.getLaunchOptionsSync();
-    appOptions.onLaunch.call(app, args);
+    vm.__call_hook('onLaunch', args);
   }
   return vm
 }

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

@@ -1459,11 +1459,14 @@ function initScopedSlotsParams () {
   };
 
   Vue.prototype.$setScopedSlotsParams = function (name, value) {
-    const vueId = this.$options.propsData.vueId;
-    const object = center[vueId] = center[vueId] || {};
-    object[name] = value;
-    if (parents[vueId]) {
-      parents[vueId].$forceUpdate();
+    const vueIds = this.$options.propsData.vueId;
+    if (vueIds) {
+      const vueId = vueIds.split(',')[0];
+      const object = center[vueId] = center[vueId] || {};
+      object[name] = value;
+      if (parents[vueId]) {
+        parents[vueId].$forceUpdate();
+      }
     }
   };
 
@@ -1862,6 +1865,7 @@ function createSubpackageApp (vm) {
   const app = getApp({
     allowDefault: true
   });
+  vm.$scope = app;
   const globalData = app.globalData;
   if (globalData) {
     Object.keys(appOptions.globalData).forEach(name => {
@@ -1876,18 +1880,18 @@ function createSubpackageApp (vm) {
     }
   });
   if (isFn(appOptions.onShow) && ks.onAppShow) {
-    ks.onAppShow((...args) => {
-      appOptions.onShow.apply(app, args);
+    ks.onAppShow((...args) => {
+      vm.__call_hook('onShow', args);
     });
   }
   if (isFn(appOptions.onHide) && ks.onAppHide) {
-    ks.onAppHide((...args) => {
-      appOptions.onHide.apply(app, args);
+    ks.onAppHide((...args) => {
+      vm.__call_hook('onHide', args);
     });
   }
   if (isFn(appOptions.onLaunch)) {
     const args = ks.getLaunchOptionsSync && ks.getLaunchOptionsSync();
-    appOptions.onLaunch.call(app, args);
+    vm.__call_hook('onLaunch', args);
   }
   return vm
 }

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

@@ -1620,11 +1620,14 @@ function initScopedSlotsParams () {
   };
 
   Vue.prototype.$setScopedSlotsParams = function (name, value) {
-    const vueId = this.$options.propsData.vueId;
-    const object = center[vueId] = center[vueId] || {};
-    object[name] = value;
-    if (parents[vueId]) {
-      parents[vueId].$forceUpdate();
+    const vueIds = this.$options.propsData.vueId;
+    if (vueIds) {
+      const vueId = vueIds.split(',')[0];
+      const object = center[vueId] = center[vueId] || {};
+      object[name] = value;
+      if (parents[vueId]) {
+        parents[vueId].$forceUpdate();
+      }
     }
   };
 
@@ -2035,6 +2038,7 @@ function createSubpackageApp (vm) {
   const app = getApp({
     allowDefault: true
   });
+  vm.$scope = app;
   const globalData = app.globalData;
   if (globalData) {
     Object.keys(appOptions.globalData).forEach(name => {
@@ -2049,18 +2053,18 @@ function createSubpackageApp (vm) {
     }
   });
   if (isFn(appOptions.onShow) && wx.onAppShow) {
-    wx.onAppShow((...args) => {
-      appOptions.onShow.apply(app, args);
+    wx.onAppShow((...args) => {
+      vm.__call_hook('onShow', args);
     });
   }
   if (isFn(appOptions.onHide) && wx.onAppHide) {
-    wx.onAppHide((...args) => {
-      appOptions.onHide.apply(app, args);
+    wx.onAppHide((...args) => {
+      vm.__call_hook('onHide', args);
     });
   }
   if (isFn(appOptions.onLaunch)) {
     const args = wx.getLaunchOptionsSync && wx.getLaunchOptionsSync();
-    appOptions.onLaunch.call(app, args);
+    vm.__call_hook('onLaunch', args);
   }
   return vm
 }

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

@@ -1712,11 +1712,14 @@ function initScopedSlotsParams () {
   };
 
   Vue.prototype.$setScopedSlotsParams = function (name, value) {
-    const vueId = this.$options.propsData.vueId;
-    const object = center[vueId] = center[vueId] || {};
-    object[name] = value;
-    if (parents[vueId]) {
-      parents[vueId].$forceUpdate();
+    const vueIds = this.$options.propsData.vueId;
+    if (vueIds) {
+      const vueId = vueIds.split(',')[0];
+      const object = center[vueId] = center[vueId] || {};
+      object[name] = value;
+      if (parents[vueId]) {
+        parents[vueId].$forceUpdate();
+      }
     }
   };
 
@@ -2259,6 +2262,7 @@ function createSubpackageApp (vm) {
   const app = getApp({
     allowDefault: true
   });
+  vm.$scope = app;
   const globalData = app.globalData;
   if (globalData) {
     Object.keys(appOptions.globalData).forEach(name => {
@@ -2273,18 +2277,18 @@ function createSubpackageApp (vm) {
     }
   });
   if (isFn(appOptions.onShow) && tt.onAppShow) {
-    tt.onAppShow((...args) => {
-      appOptions.onShow.apply(app, args);
+    tt.onAppShow((...args) => {
+      vm.__call_hook('onShow', args);
     });
   }
   if (isFn(appOptions.onHide) && tt.onAppHide) {
-    tt.onAppHide((...args) => {
-      appOptions.onHide.apply(app, args);
+    tt.onAppHide((...args) => {
+      vm.__call_hook('onHide', args);
     });
   }
   if (isFn(appOptions.onLaunch)) {
     const args = tt.getLaunchOptionsSync && tt.getLaunchOptionsSync();
-    appOptions.onLaunch.call(app, args);
+    vm.__call_hook('onLaunch', args);
   }
   return vm
 }

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

 import Vue from 'vue';
 
-function b64DecodeUnicode (str) {
-  return decodeURIComponent(atob(str).split('').map(function (c) {
-    return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)
-  }).join(''))
-}
-
-function getCurrentUserInfo () {
-  const token = ( wx).getStorageSync('uni_id_token') || '';
-  const tokenArr = token.split('.');
-  if (!token || tokenArr.length !== 3) {
-    return {
-      uid: null,
-      role: [],
-      permission: [],
-      tokenExpired: 0
-    }
-  }
-  let userInfo;
-  try {
-    userInfo = JSON.parse(b64DecodeUnicode(tokenArr[1]));
-  } catch (error) {
-    throw new Error('获取当前用户信息出错，详细错误信息为：' + error.message)
-  }
-  userInfo.tokenExpired = userInfo.exp * 1000;
-  delete userInfo.exp;
-  delete userInfo.iat;
-  return userInfo
-}
-
-function uniIdMixin (Vue) {
-  Vue.prototype.uniIDHasRole = function (roleId) {
-    const {
-      role
-    } = getCurrentUserInfo();
-    return role.indexOf(roleId) > -1
-  };
-  Vue.prototype.uniIDHasPermission = function (permissionId) {
-    const {
-      permission
-    } = getCurrentUserInfo();
-    return this.uniIDHasRole('admin') || permission.indexOf(permissionId) > -1
-  };
-  Vue.prototype.uniIDTokenValid = function () {
-    const {
-      tokenExpired
-    } = getCurrentUserInfo();
-    return tokenExpired > Date.now()
-  };
+function b64DecodeUnicode (str) {
+  return decodeURIComponent(atob(str).split('').map(function (c) {
+    return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)
+  }).join(''))
+}
+
+function getCurrentUserInfo () {
+  const token = ( wx).getStorageSync('uni_id_token') || '';
+  const tokenArr = token.split('.');
+  if (!token || tokenArr.length !== 3) {
+    return {
+      uid: null,
+      role: [],
+      permission: [],
+      tokenExpired: 0
+    }
+  }
+  let userInfo;
+  try {
+    userInfo = JSON.parse(b64DecodeUnicode(tokenArr[1]));
+  } catch (error) {
+    throw new Error('获取当前用户信息出错，详细错误信息为：' + error.message)
+  }
+  userInfo.tokenExpired = userInfo.exp * 1000;
+  delete userInfo.exp;
+  delete userInfo.iat;
+  return userInfo
+}
+
+function uniIdMixin (Vue) {
+  Vue.prototype.uniIDHasRole = function (roleId) {
+    const {
+      role
+    } = getCurrentUserInfo();
+    return role.indexOf(roleId) > -1
+  };
+  Vue.prototype.uniIDHasPermission = function (permissionId) {
+    const {
+      permission
+    } = getCurrentUserInfo();
+    return this.uniIDHasRole('admin') || permission.indexOf(permissionId) > -1
+  };
+  Vue.prototype.uniIDTokenValid = function () {
+    const {
+      tokenExpired
+    } = getCurrentUserInfo();
+    return tokenExpired > Date.now()
+  };
 }
 
 const _toString = Object.prototype.toString;
@@ -472,37 +472,37 @@ var previewImage = {
   }
 };
 
-const UUID_KEY = '__DC_STAT_UUID';
-let deviceId;
-function addUuid (result) {
-  deviceId = deviceId || wx.getStorageSync(UUID_KEY);
-  if (!deviceId) {
-    deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7);
-    wx.setStorage({
-      key: UUID_KEY,
-      data: deviceId
-    });
-  }
-  result.deviceId = deviceId;
-}
-
-function addSafeAreaInsets (result) {
-  if (result.safeArea) {
-    const safeArea = result.safeArea;
-    result.safeAreaInsets = {
-      top: safeArea.top,
-      left: safeArea.left,
-      right: result.windowWidth - safeArea.right,
-      bottom: result.windowHeight - safeArea.bottom
-    };
-  }
-}
-
-var getSystemInfo = {
-  returnValue: function (result) {
-    addUuid(result);
-    addSafeAreaInsets(result);
-  }
+const UUID_KEY = '__DC_STAT_UUID';
+let deviceId;
+function addUuid (result) {
+  deviceId = deviceId || wx.getStorageSync(UUID_KEY);
+  if (!deviceId) {
+    deviceId = Date.now() + '' + Math.floor(Math.random() * 1e7);
+    wx.setStorage({
+      key: UUID_KEY,
+      data: deviceId
+    });
+  }
+  result.deviceId = deviceId;
+}
+
+function addSafeAreaInsets (result) {
+  if (result.safeArea) {
+    const safeArea = result.safeArea;
+    result.safeAreaInsets = {
+      top: safeArea.top,
+      left: safeArea.left,
+      right: result.windowWidth - safeArea.right,
+      bottom: result.windowHeight - safeArea.bottom
+    };
+  }
+}
+
+var getSystemInfo = {
+  returnValue: function (result) {
+    addUuid(result);
+    addSafeAreaInsets(result);
+  }
 };
 
 // import navigateTo from 'uni-helpers/navigate-to'
@@ -1777,7 +1777,7 @@ function createComponent (vueOptions) {
   }
 }
 
-function createSubpackageApp(vm) {
+function createSubpackageApp (vm) {
   const appOptions = parseApp(vm);
   const app = getApp({
     allowDefault: true
@@ -1813,23 +1813,23 @@ function createSubpackageApp(vm) {
   return vm
 }
 
-function createPlugin (vm) {
-  const appOptions = parseApp(vm);
-  if (isFn(appOptions.onShow) && wx.onAppShow) {
-    wx.onAppShow((...args) => {
-      appOptions.onShow.apply(vm, args);
-    });
-  }
-  if (isFn(appOptions.onHide) && wx.onAppHide) {
-    wx.onAppHide((...args) => {
-      appOptions.onHide.apply(vm, args);
-    });
-  }
-  if (isFn(appOptions.onLaunch)) {
-    const args = wx.getLaunchOptionsSync && wx.getLaunchOptionsSync();
-    appOptions.onLaunch.call(vm, args);
-  }
-  return vm
+function createPlugin (vm) {
+  const appOptions = parseApp(vm);
+  if (isFn(appOptions.onShow) && wx.onAppShow) {
+    wx.onAppShow((...args) => {
+      appOptions.onShow.apply(vm, args);
+    });
+  }
+  if (isFn(appOptions.onHide) && wx.onAppHide) {
+    wx.onAppHide((...args) => {
+      appOptions.onHide.apply(vm, args);
+    });
+  }
+  if (isFn(appOptions.onLaunch)) {
+    const args = wx.getLaunchOptionsSync && wx.getLaunchOptionsSync();
+    appOptions.onLaunch.call(vm, args);
+  }
+  return vm
 }
 
 todos.forEach(todoApi => {

packages/uni-quickapp-webview/dist/index.js

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