@mpxjs/core 2.9.33 → 2.9.36

package/package.json

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

package/src/platform/builtInMixins/refsMixin.js

@@ -1,32 +1,17 @@
-import { BEFORECREATE, BEFOREUPDATE } from '../../core/innerLifecycle'
+import { BEFORECREATE } from '../../core/innerLifecycle'
 import { noop, getEnvObj } from '@mpxjs/utils'
 
 const envObj = getEnvObj()
 
-const setNodeRef = function (target, ref) {
-  Object.defineProperty(target.$refs, ref.key, {
-    enumerable: true,
-    configurable: true,
-    get () {
-      // for nodes, every time being accessed, returns as a new selector.
-      return target.__getRefNode(ref)
-    }
-  })
-}
-
-const setComponentRef = function (target, ref, isAsync) {
+const setRef = function (target, ref, isAsync) {
   const targetRefs = isAsync ? target.$asyncRefs : target.$refs
-  const cacheMap = isAsync ? target.__asyncRefCacheMap : target.__refCacheMap
-  const key = ref.key
-  Object.defineProperty(targetRefs, key, {
+  Object.defineProperty(targetRefs, ref.key, {
     enumerable: true,
     configurable: true,
     get () {
-      // wx由于分包异步化的存在，每次访问refs都需要重新执行selectComponent，避免一直拿到缓存中的placeholder
-      if (__mpx_mode__ === 'wx' || !cacheMap.get(key)) {
-        cacheMap.set(key, target.__getRefNode(ref, isAsync))
-      }
-      return cacheMap.get(key)
+      // 对于组件，由于分包异步化的存在，每次都需要重新执行selectComponent，避免一直获取到placeholder
+      // 对于节点，每次都需要获取全新的selectorQuery
+      return target.__getRefNode(ref, isAsync)
     }
   })
 }
@@ -36,8 +21,6 @@ export default function getRefsMixin () {
     [BEFORECREATE] () {
       this.$refs = {}
       this.$asyncRefs = {}
-      this.__refCacheMap = new Map()
-      this.__asyncRefCacheMap = new Map()
       this.__getRefs()
 
       if (__mpx_mode__ === 'ali') {
@@ -45,19 +28,14 @@ export default function getRefsMixin () {
         this.createSelectorQuery = this._createSelectorQuery
       }
     },
-    [BEFOREUPDATE] () {
-      this.__refCacheMap.clear()
-      this.__asyncRefCacheMap.clear()
-    },
     methods: {
       __getRefs () {
         if (this.__getRefsData) {
           const refs = this.__getRefsData()
           refs.forEach(ref => {
-            const setRef = ref.type === 'node' ? setNodeRef : setComponentRef
             setRef(this, ref)
             if (__mpx_mode__ === 'tt' && ref.type === 'component') {
-              setComponentRef(this, ref, true)
+              setRef(this, ref, true)
             }
           })
         }
@@ -94,9 +72,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) {