@mpxjs/core 2.8.50 → 2.8.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.50",
+  "version": "2.8.52",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.8.50",
+    "@mpxjs/utils": "^2.8.52",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "32f30631cc5f37503fb7791cb3b0d6c901ee2b27"
+  "gitHead": "87bec6efa6bd62939b2fb7714b16e33d4d29f5c8"
 }

package/src/core/injectMixins.js

@@ -19,7 +19,7 @@ export function injectMixins (mixins, options = {}) {
     }
   }
 
-  let types = options.types || ['app', 'page', 'component']
+  let types = options.types || ['page', 'component']
   const stage = options.stage || -1
 
   if (typeof types === 'string') {

package/src/platform/builtInMixins/proxyEventMixin.js

@@ -89,29 +89,34 @@ export default function proxyEventMixin () {
   }
   if (__mpx_mode__ === 'ali') {
     Object.assign(methods, {
-      triggerEvent (eventName, eventDetail) {
+      triggerEvent (eventName, eventDetail, e) {
         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') {
-          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
+          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
+            }
           }
           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,6 +18,12 @@ 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

@@ -1,12 +1,39 @@
-import { walkChildren, parseSelector, error } from '@mpxjs/utils'
+import { walkChildren, parseSelector, error, hasOwn } from '@mpxjs/utils'
 import * as webApi from '@mpxjs/api-proxy/src/web/api'
+const datasetReg = /^data-(.+)$/
+
+function collectDataset (attrs) {
+  const dataset = {}
+  for (const key in attrs) {
+    if (hasOwn(attrs, key)) {
+      const matched = datasetReg.exec(key)
+      if (matched) {
+        dataset[matched[1]] = attrs[key]
+      }
+    }
+  }
+  return dataset
+}
 
 export default function install (Vue) {
-  Vue.prototype.triggerEvent = function (eventName, eventDetail) {
-    return this.$emit(eventName, {
-      type: eventName,
-      detail: eventDetail
-    })
+  Vue.prototype.triggerEvent = function (eventName, eventDetail, e) {
+    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
+      }
+    }
+    return this.$emit(eventName, eventObj)
   }
   Vue.prototype.selectComponent = function (selector, all) {
     const result = []