@mpxjs/core 2.8.60 → 2.8.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.60",
+  "version": "2.8.61",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "02a77bf602744c35703b2fdc27171edbec09edcb"
+  "gitHead": "f393ffc439f21b24f5f09a65ef99db20b145e19a"
 }

package/src/core/proxy.js

@@ -541,6 +541,7 @@ export default class MpxProxy {
     const _i = this.target._i.bind(this.target)
     const _c = this.target._c.bind(this.target)
     const _r = this.target._r.bind(this.target)
+    const _sc = this.target._sc.bind(this.target)
     const effect = this.effect = new ReactiveEffect(() => {
       // pre render for props update
       if (this.propsUpdatedFlag) {
@@ -549,7 +550,7 @@ export default class MpxProxy {
 
       if (this.target.__injectedRender) {
         try {
-          return this.target.__injectedRender(_i, _c, _r)
+          return this.target.__injectedRender(_i, _c, _r, _sc)
         } catch (e) {
           warn('Failed to execute render function, degrade to full-set-data mode.', this.options.mpxFileResource, e)
           this.render()

package/src/platform/builtInMixins/renderHelperMixin.js

@@ -1,4 +1,4 @@
-import { isObject, getByPath, hasOwn } from '@mpxjs/utils'
+import { getByPath, hasOwn, isObject } from '@mpxjs/utils'
 
 export default function renderHelperMixin () {
   return {
@@ -21,6 +21,7 @@ export default function renderHelperMixin () {
           }
         }
       },
+      // collect
       _c (key, value) {
         if (hasOwn(this.__mpxProxy.renderData, key)) {
           return this.__mpxProxy.renderData[key]
@@ -31,6 +32,10 @@ export default function renderHelperMixin () {
         this.__mpxProxy.renderData[key] = value
         return value
       },
+      // simple collect
+      _sc (key) {
+        return (this.__mpxProxy.renderData[key] = this[key])
+      },
       _r () {
         this.__mpxProxy.renderWithData()
       }

package/src/vuePlugin.js

@@ -17,6 +17,11 @@ function collectDataset (attrs) {
 
 export default function install (Vue) {
   Vue.prototype.triggerEvent = function (eventName, eventDetail) {
+    // 输出Web时自定义组件绑定click事件会和web原生事件冲突，组件内部triggerEvent时会导致事件执行两次，将click事件改为_click来规避此问题
+    const escapeEvents = ['click']
+    if (escapeEvents.includes(eventName)) {
+      eventName = '_' + eventName
+    }
     let eventObj = {}
     const dataset = collectDataset(this.$attrs)
     const id = this.$attrs.id || ''