Merge pull request #175 from Meituan-Dianping/develop

Develop
Meituan-Dianping · Mar 23, 2018 · 624f4d1 · 624f4d1
2 parents d6e8bef + 6dcd1a6
commit 624f4d1
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 66 deletions.
diff --git a/packages/mpvue-template-compiler/build.js b/packages/mpvue-template-compiler/build.js
@@ -1773,23 +1773,23 @@ var nextTick = (function () {
  // "force" the microtask queue to be flushed by adding an empty timer.
  if (isIOS) { setTimeout(noop); }
  };
- } else if (typeof MutationObserver !== 'undefined' && (
- isNative(MutationObserver) ||
- // PhantomJS and iOS 7.x
- MutationObserver.toString() === '[object MutationObserverConstructor]'
- )) {
- // use MutationObserver where native Promise is not available,
- // e.g. PhantomJS IE11, iOS7, Android 4.4
-  var counter = 1;
-  var observer = new MutationObserver(nextTickHandler);
-  var textNode = document.createTextNode(String(counter));
- observer.observe(textNode, {
- characterData: true
-  });
-  timerFunc = function () {
- counter = (counter + 1) % 2;
- textNode.data = String(counter);
-  };
+ // } else if (typeof MutationObserver !== 'undefined' && (
+ //  isNative(MutationObserver) ||
+ //  // PhantomJS and iOS 7.x
+ //  MutationObserver.toString() === '[object MutationObserverConstructor]'
+ // )) {
+ //  // use MutationObserver where native Promise is not available,
+ //  // e.g. PhantomJS IE11, iOS7, Android 4.4
+ // var counter = 1
+ // var observer = new MutationObserver(nextTickHandler)
+ // var textNode = document.createTextNode(String(counter))
+ //  observer.observe(textNode, {
+ //  characterData: true
+ // })
+ // timerFunc = () => {
+ //  counter = (counter + 1) % 2
+ //  textNode.data = String(counter)
+ // }
  } else {
  // fallback to setTimeout
  /* istanbul ignore next */

diff --git a/packages/mpvue-template-compiler/package.json b/packages/mpvue-template-compiler/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mpvue-template-compiler",
- "version": "1.0.6",
+ "version": "1.0.7",
  "description": "mpvue template compiler for Vue",
  "main": "index.js",
  "repository": {

diff --git a/packages/mpvue/index.js b/packages/mpvue/index.js
@@ -573,23 +573,23 @@ var nextTick = (function () {
  // "force" the microtask queue to be flushed by adding an empty timer.
  if (isIOS) { setTimeout(noop); }
  };
- } else if (typeof MutationObserver !== 'undefined' && (
- isNative(MutationObserver) ||
- // PhantomJS and iOS 7.x
- MutationObserver.toString() === '[object MutationObserverConstructor]'
- )) {
- // use MutationObserver where native Promise is not available,
- // e.g. PhantomJS IE11, iOS7, Android 4.4
-  var counter = 1;
-  var observer = new MutationObserver(nextTickHandler);
-  var textNode = document.createTextNode(String(counter));
- observer.observe(textNode, {
- characterData: true
-  });
-  timerFunc = function () {
- counter = (counter + 1) % 2;
- textNode.data = String(counter);
-  };
+ // } else if (typeof MutationObserver !== 'undefined' && (
+ //  isNative(MutationObserver) ||
+ //  // PhantomJS and iOS 7.x
+ //  MutationObserver.toString() === '[object MutationObserverConstructor]'
+ // )) {
+ //  // use MutationObserver where native Promise is not available,
+ //  // e.g. PhantomJS IE11, iOS7, Android 4.4
+ // var counter = 1
+ // var observer = new MutationObserver(nextTickHandler)
+ // var textNode = document.createTextNode(String(counter))
+ //  observer.observe(textNode, {
+ //  characterData: true
+ // })
+ // timerFunc = () => {
+ //  counter = (counter + 1) % 2
+ //  textNode.data = String(counter)
+ // }
  } else {
  // fallback to setTimeout
  /* istanbul ignore next */
@@ -4145,7 +4145,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
 });
 
 Vue$3.version = '2.4.1';
-Vue$3.mpvueVersion = '1.0.6';
+Vue$3.mpvueVersion = '1.0.7';
 
 /* globals renderer */
 
@@ -5093,8 +5093,14 @@ function initMP (mpType, next) {
 
  // 生命周期函数--监听页面显示
  onShow: function onShow () {
+ mp.page = this;
  mp.status = 'show';
  callHook$1(rootVueVM, 'onShow');
+
+ // 只有页面需要 setData
+ rootVueVM.$nextTick(function () {
+ rootVueVM._initDataToMP();
+ });
  },
 
  // 生命周期函数--监听页面初次渲染完成
@@ -5103,23 +5109,20 @@ function initMP (mpType, next) {
 
  callHook$1(rootVueVM, 'onReady');
  next();
-
- // 只有页面需要 setData
- rootVueVM.$nextTick(function () {
- rootVueVM._initDataToMP();
- });
  },
 
  // 生命周期函数--监听页面隐藏
  onHide: function onHide () {
  mp.status = 'hide';
  callHook$1(rootVueVM, 'onHide');
+ mp.page = null;
  },
 
  // 生命周期函数--监听页面卸载
  onUnload: function onUnload () {
  mp.status = 'unload';
  callHook$1(rootVueVM, 'onUnload');
+ mp.page = null;
  },
 
  // 页面相关事件处理函数--监听用户下拉动作
@@ -5394,7 +5397,7 @@ function handleProxyWithVue (e) {
  var rootVueVM = this.$root;
  var type = e.type;
  var target = e.target; if ( target === void 0 ) target = {};
- var currentTarget = e.currentTarget; if ( currentTarget === void 0 ) currentTarget = {};
+ var currentTarget = e.currentTarget;
  var ref = currentTarget || target;
  var dataset = ref.dataset; if ( dataset === void 0 ) dataset = {};
  var comkey = dataset.comkey; if ( comkey === void 0 ) comkey = '';

diff --git a/packages/mpvue/package.json b/packages/mpvue/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mpvue",
- "version": "1.0.6",
+ "version": "1.0.7",
  "description": "Vue Runtime for mini program",
  "main": "index.js",
  "repository": {

diff --git a/src/core/util/env.js b/src/core/util/env.js
@@ -99,23 +99,23 @@ export const nextTick = (function () {
  // "force" the microtask queue to be flushed by adding an empty timer.
  if (isIOS) setTimeout(noop)
  }
- } else if (typeof MutationObserver !== 'undefined' && (
- isNative(MutationObserver) ||
- // PhantomJS and iOS 7.x
- MutationObserver.toString() === '[object MutationObserverConstructor]'
- )) {
- // use MutationObserver where native Promise is not available,
- // e.g. PhantomJS IE11, iOS7, Android 4.4
- var counter = 1
- var observer = new MutationObserver(nextTickHandler)
- var textNode = document.createTextNode(String(counter))
- observer.observe(textNode, {
- characterData: true
- })
- timerFunc = () => {
- counter = (counter + 1) % 2
- textNode.data = String(counter)
- }
+ // } else if (typeof MutationObserver !== 'undefined' && (
+ //  isNative(MutationObserver) ||
+ //  // PhantomJS and iOS 7.x
+ //  MutationObserver.toString() === '[object MutationObserverConstructor]'
+ // )) {
+ //  // use MutationObserver where native Promise is not available,
+ //  // e.g. PhantomJS IE11, iOS7, Android 4.4
+ //  var counter = 1
+ //  var observer = new MutationObserver(nextTickHandler)
+ //  var textNode = document.createTextNode(String(counter))
+ //  observer.observe(textNode, {
+ //  characterData: true
+ //  })
+ //  timerFunc = () => {
+ //  counter = (counter + 1) % 2
+ //  textNode.data = String(counter)
+ //  }
  } else {
  // fallback to setTimeout
  /* istanbul ignore next */

diff --git a/src/platforms/mp/runtime/events.js b/src/platforms/mp/runtime/events.js
@@ -73,7 +73,7 @@ function getWebEventByMP (e) {
 
 export function handleProxyWithVue (e) {
  const rootVueVM = this.$root
- const { type, target = {}, currentTarget = {}} = e
+ const { type, target = {}, currentTarget } = e
  const { dataset = {}} = currentTarget || target
  const { comkey = '', eventid } = dataset
  const vm = getVM(rootVueVM, comkey.split(','))

diff --git a/src/platforms/mp/runtime/lifecycle.js b/src/platforms/mp/runtime/lifecycle.js
@@ -167,8 +167,14 @@ export function initMP (mpType, next) {
 
  // 生命周期函数--监听页面显示
  onShow () {
+ mp.page = this
  mp.status = 'show'
  callHook(rootVueVM, 'onShow')
+
+ // 只有页面需要 setData
+ rootVueVM.$nextTick(() => {
+ rootVueVM._initDataToMP()
+ })
  },
 
  // 生命周期函数--监听页面初次渲染完成
@@ -177,23 +183,20 @@ export function initMP (mpType, next) {
 
  callHook(rootVueVM, 'onReady')
  next()
-
- // 只有页面需要 setData
- rootVueVM.$nextTick(() => {
- rootVueVM._initDataToMP()
- })
  },
 
  // 生命周期函数--监听页面隐藏
  onHide () {
  mp.status = 'hide'
  callHook(rootVueVM, 'onHide')
+ mp.page = null
  },
 
  // 生命周期函数--监听页面卸载
  onUnload () {
  mp.status = 'unload'
  callHook(rootVueVM, 'onUnload')
+ mp.page = null
  },
 
  // 页面相关事件处理函数--监听用户下拉动作