support v-on custom events on child component

Author: yyx990803

src/api/data.js

@@ -9,15 +9,23 @@ var filterRE = /[^|]\|[^|]/
  * Get the value from an expression on this vm.
  *
  * @param {String} exp
+ * @param {Boolean} [asStatement]
  * @return {*}
  */
 
-exports.$get = function (exp) {
+exports.$get = function (exp, asStatement) {
   var res = expParser.parse(exp)
   if (res) {
-    try {
-      return res.get.call(this, this)
-    } catch (e) {}
+    if (asStatement && !expParser.isSimplePath(exp)) {
+      var self = this
+      return function statementHandler () {
+        res.get.call(self, self)
+      }
+    } else {
+      try {
+        return res.get.call(this, this)
+      } catch (e) {}
+    }
   }
 }
 
@@ -78,23 +86,24 @@ exports.$watch = function (exp, cb, options) {
  * Evaluate a text directive, including filters.
  *
  * @param {String} text
+ * @param {Boolean} [asStatement]
  * @return {String}
  */
 
-exports.$eval = function (text) {
+exports.$eval = function (text, asStatement) {
   // check for filters.
   if (filterRE.test(text)) {
     var dir = dirParser.parse(text)
     // the filter regex check might give false positive
     // for pipes inside strings, so it's possible that
     // we don't get any filters here
-    var val = this.$get(dir.expression)
+    var val = this.$get(dir.expression, asStatement)
     return dir.filters
       ? this._applyFilters(val, null, dir.filters)
       : val
   } else {
     // no filter
-    return this.$get(text)
+    return this.$get(text, asStatement)
   }
 }
 

src/instance/events.js

@@ -1,5 +1,6 @@
 var _ = require('../util')
 var inDoc = _.inDoc
+var eventRE = /^v-on:|^@/
 
 /**
  * Setup the instance's option events & watchers.
@@ -9,10 +10,33 @@ var inDoc = _.inDoc
 
 exports._initEvents = function () {
   var options = this.$options
+  if (options._asComponent) {
+    registerComponentEvents(this, options.el)
+  }
   registerCallbacks(this, '$on', options.events)
   registerCallbacks(this, '$watch', options.watch)
 }
 
+/**
+ * Register v-on events on a child component
+ *
+ * @param {Vue} vm
+ * @param {Element} el
+ */
+
+function registerComponentEvents (vm, el) {
+  var attrs = el.attributes
+  var name, handler
+  for (var i = 0, l = attrs.length; i < l; i++) {
+    name = attrs[i].name
+    if (eventRE.test(name)) {
+      name = name.replace(eventRE, '')
+      handler = (vm._scope || vm._context).$eval(attrs[i].value, true)
+      vm.$on(name.replace(eventRE), handler)
+    }
+  }
+}
+
 /**
  * Register callbacks for option events and watchers.
  *