Merge pull request #277 from Meituan-Dianping/develop

Develop
Meituan-Dianping · Apr 13, 2018 · 94c119a · 94c119a
2 parents 3f39878 + e179a6d
commit 94c119a
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 22 deletions.
diff --git a/packages/mpvue-template-compiler/build.js b/packages/mpvue-template-compiler/build.js
@@ -1676,7 +1676,6 @@ function handleError (err, vm, info) {
 }
 
 /*  */
-/* globals MutationObserver */
 
 // can we use __proto__?
 var hasProto = '__proto__' in {};
@@ -4352,15 +4351,15 @@ function transformDynamicClass (staticClass, clsBinding) {
   var result = babel.transform(("!" + clsBinding), { plugins: [transformObjectToTernaryOperator] });
   // 先实现功能，再优化代码
   // https://github.com/babel/babel/issues/7138
-  var cls = prettier.format(result.code, { semi: false, singleQuote: true }).slice(1).slice(0, -1).replace(/\n|\r/g, "");
+  var cls = prettier.format(result.code, { semi: false, singleQuote: true }).slice(1).slice(0, -1).replace(/\n|\r/g, '');
   return (staticClass + " {{" + cls + "}}")
 }
 
 function transformDynamicStyle (staticStyle, styleBinding) {
   if ( staticStyle === void 0 ) staticStyle = '';
 
   var result = babel.transform(("!" + styleBinding), { plugins: [transformObjectToString] });
-  var cls = prettier.format(result.code, { semi: false, singleQuote: true }).slice(1).slice(0, -1).replace(/\n|\r/g, "");
+  var cls = prettier.format(result.code, { semi: false, singleQuote: true }).slice(1).slice(0, -1).replace(/\n|\r/g, '');
   return (staticStyle + " {{" + cls + "}}")
 }
 
@@ -4863,7 +4862,8 @@ function compileToWxml (compiled, options) {
     slot.code = generate$2(slot.node, options);
   });
 
-  return { code: code, compiled: compiled, slots: slots }
+  // TODO: 后期优化掉这种暴力全部 import，虽然对性能没啥大影响
+  return { code: code, compiled: compiled, slots: slots, importCode: importCode }
 }
 
 /*  */

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.7",
+  "version": "1.0.8",
   "description": "mpvue template compiler for Vue",
   "main": "index.js",
   "repository": {

diff --git a/packages/mpvue/index.js b/packages/mpvue/index.js
@@ -476,7 +476,6 @@ function handleError (err, vm, info) {
 }
 
 /*  */
-/* globals MutationObserver */
 
 // can we use __proto__?
 var hasProto = '__proto__' in {};
@@ -4145,7 +4144,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
 });
 
 Vue$3.version = '2.4.1';
-Vue$3.mpvueVersion = '1.0.7';
+Vue$3.mpvueVersion = '1.0.8';
 
 /* globals renderer */
 
@@ -5342,7 +5341,20 @@ function getHandle (vnode, eventid, eventTypes) {
   var children = ref.children; if ( children === void 0 ) children = [];
   var componentInstance = ref.componentInstance;
   if (componentInstance) {
-    return res
+    // 增加 slot 情况的处理
+    // Object.values 会多增加几行编译后的代码
+    Object.keys(componentInstance.$slots).forEach(function (slotKey) {
+      var slot = componentInstance.$slots[slotKey];
+      var slots = Array.isArray(slot) ? slot : [slot];
+      slots.forEach(function (node) {
+        res = res.concat(getHandle(node, eventid, eventTypes));
+      });
+    });
+  } else {
+    // 避免遍历超出当前组件的 vm
+    children.forEach(function (node) {
+      res = res.concat(getHandle(node, eventid, eventTypes));
+    });
   }
 
   var attrs = data.attrs;
@@ -5359,10 +5371,6 @@ function getHandle (vnode, eventid, eventTypes) {
     return res
   }
 
-  children.forEach(function (node) {
-    res = res.concat(getHandle(node, eventid, eventTypes));
-  });
-
   return res
 }
 
@@ -5416,6 +5424,11 @@ function handleProxyWithVue (e) {
   if (handles.length) {
     var event = getWebEventByMP(e);
     handles.forEach(function (h) { return h(event); });
+  } else {
+    var currentPage = vm.$mp.page.route;
+    console.group(new Date() + ' 事件警告');
+    console.warn(("Do not have handler in current page: " + currentPage + ". Please make sure that handler has been defined in " + currentPage + ", or " + currentPage + " has been added into app.json"));
+    console.groupEnd();
   }
 }
 

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

diff --git a/src/core/util/env.js b/src/core/util/env.js
@@ -1,5 +1,4 @@
 /* @flow */
-/* globals MutationObserver */
 
 import { noop } from 'shared/util'
 import { handleError } from './error'

diff --git a/src/platforms/mp/compiler/codegen/convert/attrs.js b/src/platforms/mp/compiler/codegen/convert/attrs.js
@@ -9,13 +9,13 @@ function transformDynamicClass (staticClass = '', clsBinding) {
   const result = babel.transform(`!${clsBinding}`, { plugins: [transformObjectToTernaryOperator] })
   // 先实现功能，再优化代码
   // https://github.com/babel/babel/issues/7138
-  const cls = prettier.format(result.code, { semi: false, singleQuote: true }).slice(1).slice(0, -1).replace(/\n|\r/g, "")
+  const cls = prettier.format(result.code, { semi: false, singleQuote: true }).slice(1).slice(0, -1).replace(/\n|\r/g, '')
   return `${staticClass} {{${cls}}}`
 }
 
 function transformDynamicStyle (staticStyle = '', styleBinding) {
   const result = babel.transform(`!${styleBinding}`, { plugins: [transformObjectToString] })
-  const cls = prettier.format(result.code, { semi: false, singleQuote: true }).slice(1).slice(0, -1).replace(/\n|\r/g, "")
+  const cls = prettier.format(result.code, { semi: false, singleQuote: true }).slice(1).slice(0, -1).replace(/\n|\r/g, '')
   return `${staticStyle} {{${cls}}}`
 }
 

diff --git a/src/platforms/mp/compiler/codegen/index.js b/src/platforms/mp/compiler/codegen/index.js
@@ -20,5 +20,6 @@ export function compileToWxml (compiled, options = {}) {
     slot.code = generate(slot.node, options)
   })
 
-  return { code, compiled, slots }
+  // TODO: 后期优化掉这种暴力全部 import，虽然对性能没啥大影响
+  return { code, compiled, slots, importCode }
 }
diff --git a/src/platforms/mp/runtime/events.js b/src/platforms/mp/runtime/events.js
@@ -27,7 +27,20 @@ function getHandle (vnode, eventid, eventTypes = []) {
 
   const { data = {}, children = [], componentInstance } = vnode || {}
   if (componentInstance) {
-    return res
+    // 增加 slot 情况的处理
+    // Object.values 会多增加几行编译后的代码
+    Object.keys(componentInstance.$slots).forEach(slotKey => {
+      const slot = componentInstance.$slots[slotKey]
+      const slots = Array.isArray(slot) ? slot : [slot]
+      slots.forEach(node => {
+        res = res.concat(getHandle(node, eventid, eventTypes))
+      })
+    })
+  } else {
+    // 避免遍历超出当前组件的 vm
+    children.forEach(node => {
+      res = res.concat(getHandle(node, eventid, eventTypes))
+    })
   }
 
   const { attrs, on } = data
@@ -43,10 +56,6 @@ function getHandle (vnode, eventid, eventTypes = []) {
     return res
   }
 
-  children.forEach(node => {
-    res = res.concat(getHandle(node, eventid, eventTypes))
-  })
-
   return res
 }
 
@@ -90,5 +99,10 @@ export function handleProxyWithVue (e) {
   if (handles.length) {
     const event = getWebEventByMP(e)
     handles.forEach(h => h(event))
+  } else {
+    const currentPage = vm.$mp.page.route
+    console.group(new Date() + ' 事件警告')
+    console.warn(`Do not have handler in current page: ${currentPage}. Please make sure that handler has been defined in ${currentPage}, or ${currentPage} has been added into app.json`)
+    console.groupEnd()
   }
 }