@mpxjs/core 2.7.33 → 2.7.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.7.33",
+  "version": "2.7.37",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -41,5 +41,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "c1d2e39bcfef9bf20484dcbb301381b86a5939e6"
+  "gitHead": "b39b466d24c97264ee096c91747dbb922422b122"
 }

package/src/platform/builtInMixins/proxyEventMixin.js

@@ -70,10 +70,13 @@ export default function proxyEventMixin () {
     }
   }
   if (__mpx_mode__ === 'ali') {
+    const getHandler = (eventName, props) => {
+      const handlerName = eventName.replace(/^./, matched => matched.toUpperCase()).replace(/-([a-z])/g, (match, p1) => p1.toUpperCase())
+      return props && (props['on' + handlerName] || props['catch' + handlerName])
+    }
     Object.assign(methods, {
       triggerEvent (eventName, eventDetail) {
-        const handlerName = eventName.replace(/^./, matched => matched.toUpperCase()).replace(/-([a-z])/g, (match, p1) => p1.toUpperCase())
-        const handler = this.props && (this.props['on' + handlerName] || this.props['catch' + handlerName])
+        const handler = getHandler(eventName, this.props)
         if (handler && typeof handler === 'function') {
           const dataset = collectDataset(this.props)
           const id = this.props.id || ''
@@ -92,6 +95,31 @@ export default function proxyEventMixin () {
             },
             detail: eventDetail
           }
+          handler.call(this, eventObj)
+        }
+      },
+      __proxyEvent (e) {
+        const type = e.type
+        const handler = getHandler(type, this.props)
+
+        if (handler && typeof handler === 'function') {
+          const dataset = collectDataset(this.props)
+          const id = this.props.id || ''
+          const targetData = Object.assign({}, e.target || {}, {
+            id,
+            dataset
+          })
+
+          const currentTargetData = Object.assign({}, e.currentTarget || {}, {
+            id,
+            dataset
+          })
+
+          const eventObj = Object.assign({}, e, {
+            target: targetData,
+            currentTarget: currentTargetData
+          })
+
           handler.call(this, eventObj)
         }
       }