@mpxjs/core 2.9.26 → 2.9.32

package/package.json

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

package/src/platform/builtInMixins/refsMixin.js

@@ -1,5 +1,5 @@
-import { CREATED, BEFORECREATE, BEFOREUPDATE, UNMOUNTED } from '../../core/innerLifecycle'
-import { noop, error, getEnvObj } from '@mpxjs/utils'
+import { BEFORECREATE, BEFOREUPDATE } from '../../core/innerLifecycle'
+import { noop, getEnvObj } from '@mpxjs/utils'
 
 const envObj = getEnvObj()
 
@@ -39,6 +39,11 @@ export default function getRefsMixin () {
       this.__refCacheMap = new Map()
       this.__asyncRefCacheMap = new Map()
       this.__getRefs()
+
+      if (__mpx_mode__ === 'ali') {
+        this._originCreateSelectorQuery = this.createSelectorQuery
+        this.createSelectorQuery = this._createSelectorQuery
+      }
     },
     [BEFOREUPDATE] () {
       this.__refCacheMap.clear()
@@ -82,22 +87,14 @@ export default function getRefsMixin () {
         return {
           mpxCid: this.__mpxProxy.uid
         }
-      },
-      [CREATED] () {
-        this.__updateRef()
-      },
-      [UNMOUNTED] () {
-        // 销毁ref
-        this.__updateRef(true)
       }
     })
 
     const proxyMethods = ['boundingClientRect', 'scrollOffset']
 
     Object.assign(refsMixin.methods, {
-      // todo 支付宝基础库升级至2.7.4以上可去除
-      createSelectorQuery (...args) {
-        const selectorQuery = envObj.createSelectorQuery(...args)
+      _createSelectorQuery (...args) {
+        const selectorQuery = this._originCreateSelectorQuery(...args)
         const cbs = []
 
         proxyMethods.forEach((name) => {
@@ -118,61 +115,14 @@ export default function getRefsMixin () {
           }
           return originalExec.call(this, cb)
         }
+
         return selectorQuery
       },
-      // todo 支付宝基础库升级至2.7.4以上可去除
-      createIntersectionObserver (...args) {
-        return envObj.createIntersectionObserver(...args)
-      },
-      selectComponent (selector, all) {
-        const children = this.__children__ || []
-        const result = []
-        for (const child of children) {
-          if (child.identifiers.indexOf(selector) > -1) {
-            result.push(child.component)
-            if (!all) {
-              break
-            }
-          }
-        }
-        if (selector.lastIndexOf('.') > 0) {
-          const location = this.__mpxProxy.options.mpxFileResource
-          error('The selectComponent or selectAllComponents only supports the single selector, a composed selector is not supported.', location)
-        }
-        return all ? result : result[0]
+      selectComponent (selector) {
+        return this.$selectComponent(selector)
       },
       selectAllComponents (selector) {
-        return this.selectComponent(selector, true)
-      },
-      __updateRef (destroyed) {
-        this.triggerEvent && this.triggerEvent('updateRef', {
-          component: this,
-          destroyed
-        })
-      },
-      __handleUpdateRef (e) {
-        if (!this.__children__) {
-          this.__children__ = []
-        }
-        const component = e.detail.component
-        const destroyed = e.detail.destroyed
-        const className = component.props.className || component.className
-        const identifiers = className
-          ? className.trim().split(/\s+/).map(item => {
-            return `.${item}`
-          })
-          : []
-        if (component.props.id) {
-          identifiers.push(`#${component.props.id}`)
-        }
-        if (destroyed) {
-          this.__children__ = this.__children__.filter(item => item.component !== component)
-        } else {
-          this.__children__.push({
-            component,
-            identifiers
-          })
-        }
+        return this.$selectAllComponents(selector)
       }
     })
   }

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/builtInMixins/relationsMixin.js

@@ -1,181 +1,12 @@
-import { isObject } from '@mpxjs/utils'
 import { BEFORECREATE, MOUNTED, BEFOREUNMOUNT } from '../../core/innerLifecycle'
 
-const targets = []
-let curTarget = null
-
-function pushTarget (cur) {
-  targets.push(curTarget)
-  curTarget = cur
-}
-
-function popTarget () {
-  curTarget = targets.pop()
-}
-
-function parsePath (path, absolute) {
-  if (path.indexOf('/') === 0) {
-    return path
-  }
-  const dirs = absolute.split('/').slice(0, -1)
-  let relatives = path.split('/')
-  relatives = relatives.filter(path => {
-    if (path === '..') {
-      dirs.pop()
-      return false
-    } else {
-      return path !== '.'
-    }
-  })
-  return dirs.concat(relatives).join('/')
-}
-
-function transferPath (relations, base) {
-  const newRelations = {}
-  Object.keys(relations).forEach(key => {
-    newRelations[parsePath(key, base)] = relations[key]
-  })
-  return newRelations
-}
-
 const relationTypeMap = {
   parent: 'child',
   ancestor: 'descendant'
 }
 
 export default function relationsMixin (mixinType) {
-  if (__mpx_mode__ === 'ali' && mixinType === 'component') {
-    return {
-      methods: {
-        getRelationNodes (path) {
-          const realPath = parsePath(path, this.is)
-          return (this.$relationNodesMap && this.$relationNodesMap[realPath]) || []
-        },
-        mpxCollectChildComponent (children, list) {
-          if (this.$mpxRelations) {
-            children.forEach(child => {
-              if (child && child.props) {
-                if (child.props.$isCustomComponent) {
-                  // 只有relations中声明为后代的节点才能被作为有效子节点
-                  const relation = this.$mpxRelations[child.type.displayName]
-                  if (relation && (relation.type === 'child' || relation.type === 'descendant')) {
-                    child.props.$mpxIsSlot = true
-                    list.push(child)
-                  }
-                } else {
-                  const children = child.props.children
-                  if (isObject(children)) {
-                    const slotChildren = Array.isArray(children) ? children : [children]
-                    this.mpxCollectChildComponent(slotChildren, list)
-                  }
-                }
-              }
-            })
-          }
-        },
-        mpxSlotNotify () {
-          if (this.mpxSlotLinkNum < this.mpxSlotChildren.length) {
-            this.mpxSlotLinkNum++
-            if (this.mpxSlotLinkNum === this.mpxSlotChildren.length) {
-              popTarget()
-            }
-          }
-        },
-        mpxExecAllRelations (type) {
-          this.mpxRelationContexts.forEach(context => {
-            context.mpxExecRelation(this, type)
-            this.mpxExecRelation(context, type)
-          })
-        },
-        mpxExecRelation (target, type) {
-          this.mpxCacheRelationNode(target, type)
-          const relations = this.$mpxRelations || {}
-          const path = target.is
-          if (relations[path]) {
-            typeof relations[path][type] === 'function' && relations[path][type].call(this, target)
-          }
-        },
-        mpxCacheRelationNode (target, type) {
-          const path = target.is
-          const nodes = this.$relationNodesMap[path] || []
-          if (type === 'linked') {
-            nodes.push(target)
-          } else {
-            const index = nodes.indexOf(target)
-            index > -1 && nodes.splice(index, 1)
-          }
-          this.$relationNodesMap[path] = nodes
-        },
-        mpxGetRelation (child) {
-          const parentRelations = this.$mpxRelations || {}
-          const childRelations = child.$mpxRelations || {}
-          if (parentRelations[child.is] && childRelations[this.is]) {
-            const parentType = parentRelations[child.is].type
-            const childType = childRelations[this.is].type
-            return {
-              parentType,
-              childType
-            }
-          }
-        },
-        mpxPropagateFindRelation (child) {
-          let cur = this
-          const contexts = []
-          let depth = 1
-          // 向上查找所有可能匹配的父级relation上下文
-          while (cur) {
-            const relations = cur.mpxGetRelation(child)
-            if (relations) {
-              if ((relations.parentType === 'child' && relations.childType === 'parent' && depth === 1) ||
-                (relations.parentType === 'descendant' && relations.childType === 'ancestor')) {
-                contexts.push(cur)
-              }
-            }
-            cur = cur.mpxSlotParent
-            depth++
-          }
-          return contexts
-        }
-      },
-      onInit () {
-        const options = this.__mpxProxy.options
-        if (options.relations) {
-          this.$mpxRelations = transferPath(options.relations, this.is)
-          this.$relationNodesMap = {}
-        }
-        if (curTarget && this.props.$mpxIsSlot) {
-          this.mpxSlotParent = curTarget // slot 父级
-          if (this.$mpxRelations) {
-            const contexts = curTarget.mpxPropagateFindRelation(this) // relation 父级|祖先
-            if (contexts) {
-              this.mpxRelationContexts = contexts
-              this.mpxExecAllRelations('linked')
-            }
-          }
-        }
-      },
-      deriveDataFromProps (nextProps) {
-        this.mpxSlotParent && this.mpxSlotParent.mpxSlotNotify() // 通知slot父级，确保父级能执行popTarget
-        const slots = nextProps.$slots || {}
-        const slotKeys = Object.keys(slots)
-        if (slotKeys.length) {
-          this.mpxSlotChildren = []
-          this.mpxSlotLinkNum = 0
-          slotKeys.forEach(key => {
-            this.mpxCollectChildComponent(slots[key], this.mpxSlotChildren)
-          })
-          if (this.mpxSlotChildren.length) {
-            pushTarget(this)
-          }
-        }
-      },
-      didUnmount () {
-        if (this.mpxRelationContexts) {
-          this.mpxExecAllRelations('unlinked')
-        }
-      }
-    }
-  } else if (__mpx_mode__ === 'web' && mixinType === 'component') {
+  if (__mpx_mode__ === 'web' && mixinType === 'component') {
     return {
       [BEFORECREATE] () {
         this.__mpxRelations = {}