@mpxjs/core 2.9.27 → 2.9.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.27",
+  "version": "2.9.33",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "3939aaaa7d9be0c86e51da16080a6cd8d7863a1a"
+  "gitHead": "5a8b6accc9462d4c9a35e06689a6a84903d47c52"
 }

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

@@ -6,36 +6,39 @@ function getEl (ref) {
   if (ref && ref.$options && ref.$options.__mpxBuiltIn) return ref.$el
 }
 
-function processRefs (refs) {
-  Object.keys(refs).forEach((key) => {
-    const matched = /^__mpx_ref_(.+)__$/.exec(key)
-    const rKey = matched && matched[1]
-    if (rKey) {
-      const ref = refs[key]
-      if (Array.isArray(ref)) {
-        if (getEl(ref[0])) {
-          refs[rKey] = createSelectorQuery().in(this).selectAll(ref.map(getEl))
+function processRefs (target) {
+  const refs = target.$refs
+  if (refs) {
+    Object.keys(refs).forEach((key) => {
+      const matched = /^__mpx_ref_(.+)__$/.exec(key)
+      const rKey = matched && matched[1]
+      if (rKey) {
+        const ref = refs[key]
+        if (Array.isArray(ref)) {
+          if (getEl(ref[0])) {
+            refs[rKey] = createSelectorQuery().in(target).selectAll(ref.map(getEl))
+          } else {
+            refs[rKey] = ref
+          }
         } else {
-          refs[rKey] = ref
-        }
-      } else {
-        if (getEl(ref)) {
-          refs[rKey] = createSelectorQuery().in(this).select(getEl(ref))
-        } else {
-          refs[rKey] = ref
+          if (getEl(ref)) {
+            refs[rKey] = createSelectorQuery().in(target).select(getEl(ref))
+          } else {
+            refs[rKey] = ref
+          }
         }
       }
-    }
-  })
+    })
+  }
 }
 
 export default function getRefsMixin () {
   return {
     [BEFOREMOUNT] () {
-      processRefs(this.$refs || {})
+      processRefs(this)
     },
     [UPDATED] () {
-      processRefs(this.$refs || {})
+      processRefs(this)
     }
   }
 }

package/src/platform/export/index.web.js

@@ -1,61 +1,3 @@
-import { EffectScope } from 'vue'
-import { hasOwn } from '@mpxjs/utils'
-import { PausedState } from '../../helper/const'
-
-const hackEffectScope = () => {
-  EffectScope.prototype.pause = function () {
-    if (this.active) {
-      let i, l
-      for (i = 0, l = this.effects.length; i < l; i++) {
-        const effect = this.effects[i]
-        // vue2.7中存在对于watcher实例方法的重写(doWatch)，因此无法通过修改Watcher.prototype统一实现pause和resume，只能逐个实例修改实现
-        if (!hasOwn(effect, 'pausedState')) {
-          effect.pausedState = PausedState.resumed
-          const rawUpdate = effect.update
-          effect.update = function () {
-            if (effect.pausedState !== PausedState.resumed) {
-              effect.pausedState = PausedState.dirty
-            } else {
-              rawUpdate.call(effect)
-            }
-          }
-        }
-        if (effect.pausedState !== PausedState.dirty) {
-          effect.pausedState = PausedState.paused
-        }
-      }
-      if (this.scopes) {
-        for (i = 0, l = this.scopes.length; i < l; i++) {
-          this.scopes[i].pause()
-        }
-      }
-    }
-  }
-
-  EffectScope.prototype.resume = function (ignoreDirty = false) {
-    if (this.active) {
-      let i, l
-      for (i = 0, l = this.effects.length; i < l; i++) {
-        const effect = this.effects[i]
-        if (hasOwn(effect, 'pausedState')) {
-          const lastPausedState = effect.pausedState
-          effect.pausedState = PausedState.resumed
-          if (!ignoreDirty && lastPausedState === PausedState.dirty) {
-            effect.update()
-          }
-        }
-      }
-      if (this.scopes) {
-        for (i = 0, l = this.scopes.length; i < l; i++) {
-          this.scopes[i].resume(ignoreDirty)
-        }
-      }
-    }
-  }
-}
-
-hackEffectScope()
-
 export {
   // watch
   watchEffect,

package/src/vuePlugin.js

@@ -1,5 +1,60 @@
 import { walkChildren, parseSelector, error, hasOwn } from '@mpxjs/utils'
 import { createSelectorQuery, createIntersectionObserver } from '@mpxjs/api-proxy'
+import { EffectScope } from 'vue'
+import { PausedState } from './helper/const'
+
+const hackEffectScope = () => {
+  EffectScope.prototype.pause = function () {
+    if (this.active) {
+      let i, l
+      for (i = 0, l = this.effects.length; i < l; i++) {
+        const effect = this.effects[i]
+        // vue2.7中存在对于watcher实例方法的重写(doWatch)，因此无法通过修改Watcher.prototype统一实现pause和resume，只能逐个实例修改实现
+        if (!hasOwn(effect, 'pausedState')) {
+          effect.pausedState = PausedState.resumed
+          const rawUpdate = effect.update
+          effect.update = function () {
+            if (effect.pausedState !== PausedState.resumed) {
+              effect.pausedState = PausedState.dirty
+            } else {
+              rawUpdate.call(effect)
+            }
+          }
+        }
+        if (effect.pausedState !== PausedState.dirty) {
+          effect.pausedState = PausedState.paused
+        }
+      }
+      if (this.scopes) {
+        for (i = 0, l = this.scopes.length; i < l; i++) {
+          this.scopes[i].pause()
+        }
+      }
+    }
+  }
+
+  EffectScope.prototype.resume = function (ignoreDirty = false) {
+    if (this.active) {
+      let i, l
+      for (i = 0, l = this.effects.length; i < l; i++) {
+        const effect = this.effects[i]
+        if (hasOwn(effect, 'pausedState')) {
+          const lastPausedState = effect.pausedState
+          effect.pausedState = PausedState.resumed
+          if (!ignoreDirty && lastPausedState === PausedState.dirty) {
+            effect.update()
+          }
+        }
+      }
+      if (this.scopes) {
+        for (i = 0, l = this.scopes.length; i < l; i++) {
+          this.scopes[i].resume(ignoreDirty)
+        }
+      }
+    }
+  }
+}
+
 const datasetReg = /^data-(.+)$/
 
 function collectDataset (attrs) {
@@ -55,4 +110,5 @@ export default function install (Vue) {
   Vue.prototype.createIntersectionObserver = function (options) {
     return createIntersectionObserver(this, options)
   }
+  hackEffectScope()
 }