@mpxjs/core 2.9.32 → 2.9.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.32",
+  "version": "2.9.35",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "61ac5a85a2b75304d8b989d4291b4f606f50d82f"
+  "gitHead": "eb9647625e82c7dc7058fa35f5d1fe2233d40142"
 }

package/src/platform/builtInMixins/refsMixin.js

@@ -94,9 +94,26 @@ export default function getRefsMixin () {
 
     Object.assign(refsMixin.methods, {
       _createSelectorQuery (...args) {
-        const selectorQuery = this._originCreateSelectorQuery(...args)
+        let selectorQuery = this._originCreateSelectorQuery(...args)
         const cbs = []
 
+        if (typeof selectorQuery === 'undefined') {
+          // 兜底 selectorQuery 在ali为 undefined 情况
+          // 调用 createSelectorQuery时，组件实例已经被销毁，ali this._originCreateSelectorQuery 返回 undefined。导致后续 selectorQuery[name] 报错
+          // 方案：对齐微信，微信实例销毁时，其他调用正常，仅 createSelectorQuery.exec 不执行回调
+          // 复现：setTimeout 中调用，倒计时未回调时切换页面
+          selectorQuery = {}
+          // ['boundingClientRect', 'context', 'exec', 'fields', 'in', 'node', 'scrollOffset', 'select', 'selectAll', 'selectViewport', 'toImage']
+          const backupMethodKeys = Object.keys(envObj.createSelectorQuery())
+          const backupFn = function () {
+            return selectorQuery
+          }
+          backupMethodKeys.forEach(key => {
+            selectorQuery[key] = backupFn
+          })
+          return selectorQuery
+        }
+
         proxyMethods.forEach((name) => {
           const originalMethod = selectorQuery[name]
           selectorQuery[name] = function (cb = noop) {

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()
 }