@mpxjs/core 2.9.36 → 2.9.38

package/package.json

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

package/src/platform/builtInMixins/proxyEventMixin.js

@@ -1,21 +1,6 @@
-import { setByPath, error, hasOwn, dash2hump } from '@mpxjs/utils'
+import { setByPath, error, dash2hump, collectDataset } from '@mpxjs/utils'
 import Mpx from '../../index'
 
-const datasetReg = /^data-(.+)$/
-
-function collectDataset (props) {
-  const dataset = {}
-  for (const key in props) {
-    if (hasOwn(props, key)) {
-      const matched = datasetReg.exec(key)
-      if (matched) {
-        dataset[matched[1]] = props[key]
-      }
-    }
-  }
-  return dataset
-}
-
 export default function proxyEventMixin () {
   const methods = {
     __invoke ($event) {

package/src/vuePlugin.js

@@ -1,4 +1,4 @@
-import { walkChildren, parseSelector, error, hasOwn } from '@mpxjs/utils'
+import { walkChildren, parseSelector, error, hasOwn, collectDataset } from '@mpxjs/utils'
 import { createSelectorQuery, createIntersectionObserver } from '@mpxjs/api-proxy'
 import { EffectScope } from 'vue'
 import { PausedState } from './helper/const'
@@ -55,22 +55,25 @@ const hackEffectScope = () => {
   }
 }
 
-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]
+export default function install (Vue) {
+  Object.defineProperties(Vue.prototype, {
+    data: {
+      get () {
+        return Object.assign({}, this.$props, this.$data)
+      }
+    },
+    dataset: {
+      get () {
+        return collectDataset(this.$attrs, true)
+      }
+    },
+    id: {
+      get () {
+        return this.$attrs.id || ''
       }
     }
-  }
-  return dataset
-}
+  })
 
-export default function install (Vue) {
   Vue.prototype.triggerEvent = function (eventName, eventDetail) {
     // 输出Web时自定义组件绑定click事件会和web原生事件冲突，组件内部triggerEvent时会导致事件执行两次，将click事件改为_click来规避此问题
     const escapeEvents = ['click']
@@ -78,8 +81,8 @@ export default function install (Vue) {
       eventName = '_' + eventName
     }
     let eventObj = {}
-    const dataset = collectDataset(this.$attrs)
-    const id = this.$attrs.id || ''
+    const dataset = this.dataset
+    const id = this.id
     const timeStamp = +new Date()
     eventObj = {
       type: eventName,