@mpxjs/core 2.8.56 → 2.8.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.56",
+  "version": "2.8.59",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "391feabc6246acfa17271aa632adf5da2c308a05"
+  "gitHead": "4e014ea355bb2d659c6fd6a3040b6b88245da9e5"
 }

package/src/platform/builtInMixins/proxyEventMixin.js

@@ -89,34 +89,22 @@ export default function proxyEventMixin () {
   }
   if (__mpx_mode__ === 'ali') {
     Object.assign(methods, {
-      triggerEvent (eventName, eventDetail, e) {
+      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])
         if (handler && typeof handler === 'function') {
-          let eventObj = {}
-          if (e) {
-            e.detail = Object.assign(e.detail, eventDetail)
-            eventObj = e
-          } else {
-            const dataset = collectDataset(this.props)
-            const id = this.props.id || ''
-            const timeStamp = +new Date()
-            eventObj = {
-              type: eventName,
-              timeStamp,
-              target: { id, dataset, targetDataset: dataset },
-              currentTarget: { id, dataset },
-              detail: eventDetail
-            }
+          const dataset = collectDataset(this.props)
+          const id = this.props.id || ''
+          const timeStamp = +new Date()
+          const eventObj = {
+            type: eventName,
+            timeStamp,
+            target: { id, dataset, targetDataset: dataset },
+            currentTarget: { id, dataset },
+            detail: eventDetail
           }
           handler.call(this, eventObj)
         }
-      },
-      __proxyEvent (e) {
-        const eventName = e.type
-        // 保持和微信一致
-        e.target = e.currentTarget
-        this.triggerEvent(eventName, {}, e)
       }
     })
   }

package/src/platform/builtInMixins/proxyEventMixin.web.js

@@ -18,12 +18,6 @@ export default function proxyEventMixin () {
         const originValue = valuePath.reduce((acc, cur) => acc[cur], $event.detail)
         const value = filterMethod ? (innerFilter[filterMethod] ? innerFilter[filterMethod](originValue) : typeof this[filterMethod] === 'function' && this[filterMethod]) : originValue
         setByPath(this, expr, value)
-      },
-      __proxyEvent (e) {
-        const type = e.type
-        // 保持和微信一致 target 和 currentTarget 相同
-        e.target = e.currentTarget
-        this.triggerEvent(type, {}, e)
       }
     }
   }

package/src/vuePlugin.js

@@ -16,22 +16,17 @@ function collectDataset (attrs) {
 }
 
 export default function install (Vue) {
-  Vue.prototype.triggerEvent = function (eventName, eventDetail, e) {
+  Vue.prototype.triggerEvent = function (eventName, eventDetail) {
     let eventObj = {}
-    if (e) {
-      e.detail = Object.assign(e.detail, eventDetail)
-      eventObj = e
-    } else {
-      const dataset = collectDataset(this.$attrs)
-      const id = this.$attrs.id || ''
-      const timeStamp = +new Date()
-      eventObj = {
-        type: eventName,
-        timeStamp,
-        target: { id, dataset, targetDataset: dataset },
-        currentTarget: { id, dataset },
-        detail: eventDetail
-      }
+    const dataset = collectDataset(this.$attrs)
+    const id = this.$attrs.id || ''
+    const timeStamp = +new Date()
+    eventObj = {
+      type: eventName,
+      timeStamp,
+      target: { id, dataset, targetDataset: dataset },
+      currentTarget: { id, dataset },
+      detail: eventDetail
     }
     return this.$emit(eventName, eventObj)
   }