@mpxjs/core 2.8.18 → 2.8.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.18",
+  "version": "2.8.20",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "fd022afc8f403756de44c9eaab105a5a689e9b07"
+  "gitHead": "c330d3938cc0c37843761df8b1f2deb9b6c618fc"
 }

package/src/core/mergeOptions.js

@@ -47,7 +47,7 @@ export default function mergeOptions (options = {}, type, needConvert) {
 
 export function getMixin (mixin = {}) {
   // 用于ts反向推导mixin类型
-  return mixin.mixins ? extractMixins({}, mixin, true) : mixin
+  return mixin
 }
 
 function extractMixins (mergeOptions, options, needConvert) {
@@ -214,7 +214,7 @@ function mergeMixins (parent, child) {
       mergeHooks(parent, child, key)
     } else if (/^(data|dataFn)$/.test(key)) {
       mergeDataFn(parent, child, key)
-    } else if (/^(computed|properties|props|methods|proto|options|relations)$/.test(key)) {
+    } else if (/^(computed|properties|props|methods|proto|options|relations|initData)$/.test(key)) {
       mergeShallowObj(parent, child, key)
     } else if (/^(watch|observers|pageLifetimes|events)$/.test(key)) {
       mergeToArray(parent, child, key)

package/src/core/proxy.js

@@ -121,11 +121,12 @@ export default class MpxProxy {
       this.currentRenderTask = null
     }
     this.initApi()
-    this.callHook(BEFORECREATE)
   }
 
   created () {
     if (__mpx_mode__ !== 'web') {
+      // web中BEFORECREATE钩子通过vue的beforeCreate钩子单独驱动
+      this.callHook(BEFORECREATE)
       setCurrentInstance(this)
       this.initProps()
       this.initSetup()

package/src/platform/patch/ali/getDefaultOptions.js

@@ -74,8 +74,14 @@ function filterOptions (options, type) {
     if (builtInKeysMap[key]) {
       return
     }
-    if (key === 'properties' || key === 'props') {
-      newOptions.props = Object.assign({}, options.props, options.properties)
+    if (key === 'data' || key === 'initData') {
+      if (!hasOwn(newOptions, 'data')) {
+        newOptions.data = Object.assign({}, options.initData, options.data)
+      }
+    } else if (key === 'properties' || key === 'props') {
+      if (!hasOwn(newOptions, 'props')) {
+        newOptions.props = Object.assign({}, options.props, options.properties)
+      }
     } else if (key === 'methods' && type === 'page') {
       Object.assign(newOptions, options[key])
     } else {

package/src/platform/patch/builtInKeysMap.js

@@ -1,10 +1,10 @@
 import { INNER_LIFECYCLES } from '../../core/innerLifecycle'
 import { makeMap } from '@mpxjs/utils'
 
-let bulitInKeys
+let builtInKeys
 
 if (__mpx_mode__ === 'web') {
-  bulitInKeys = [
+  builtInKeys = [
     'proto',
     'mixins',
     'mpxCustomKeysForBlend',
@@ -15,7 +15,7 @@ if (__mpx_mode__ === 'web') {
     '__pageCtor__'
   ]
 } else {
-  bulitInKeys = [
+  builtInKeys = [
     'setup',
     'dataFn',
     'proto',
@@ -31,4 +31,4 @@ if (__mpx_mode__ === 'web') {
   ]
 }
 
-export default makeMap(bulitInKeys.concat(INNER_LIFECYCLES))
+export default makeMap(builtInKeys.concat(INNER_LIFECYCLES))

package/src/platform/patch/web/getDefaultOptions.js

@@ -1,9 +1,9 @@
 import builtInKeysMap from '../builtInKeysMap'
 import mergeOptions from '../../../core/mergeOptions'
-import { diffAndCloneA } from '@mpxjs/utils'
+import { diffAndCloneA, hasOwn } from '@mpxjs/utils'
 import { getCurrentInstance as getCurrentVueInstance } from '../../export/index'
 import MpxProxy, { setCurrentInstance, unsetCurrentInstance } from '../../../core/proxy'
-import { BEFOREUPDATE, UPDATED, BEFOREUNMOUNT, UNMOUNTED } from '../../../core/innerLifecycle'
+import { BEFORECREATE, BEFOREUPDATE, UPDATED, BEFOREUNMOUNT, UNMOUNTED } from '../../../core/innerLifecycle'
 
 function filterOptions (options) {
   const newOptions = {}
@@ -12,11 +12,13 @@ function filterOptions (options) {
       return
     }
     if (key === 'data' || key === 'dataFn') {
-      newOptions.data = function mergeFn () {
-        return Object.assign(
-          diffAndCloneA(options.data || {}).clone,
-          options.dataFn && options.dataFn.call(this)
-        )
+      if (!hasOwn(newOptions, 'data')) {
+        newOptions.data = function mergeFn () {
+          return Object.assign(
+            diffAndCloneA(options.data || {}).clone,
+            options.dataFn && options.dataFn.call(this)
+          )
+        }
       }
     } else {
       newOptions[key] = options[key]
@@ -28,8 +30,10 @@ function filterOptions (options) {
 function initProxy (context, rawOptions) {
   if (!context.__mpxProxy) {
     context.__mpxProxy = new MpxProxy(rawOptions, context)
+    context.__mpxProxy.callHook(BEFORECREATE)
   } else if (context.__mpxProxy.isUnmounted()) {
     context.__mpxProxy = new MpxProxy(rawOptions, context, true)
+    context.__mpxProxy.callHook(BEFORECREATE)
   }
 }
 

package/src/platform/patch/wx/getDefaultOptions.js

@@ -112,8 +112,14 @@ export function filterOptions (options) {
     if (builtInKeysMap[key]) {
       return
     }
-    if (key === 'properties' || key === 'props') {
-      newOptions.properties = transformProperties(Object.assign({}, options.properties, options.props))
+    if (key === 'data' || key === 'initData') {
+      if (!hasOwn(newOptions, 'data')) {
+        newOptions.data = Object.assign({}, options.initData, options.data)
+      }
+    } else if (key === 'properties' || key === 'props') {
+      if (!hasOwn(newOptions, 'properties')) {
+        newOptions.properties = transformProperties(Object.assign({}, options.props, options.properties))
+      }
     } else if (key === 'methods' && options.__pageCtor__) {
       // 构造器为Page时抽取所有methods方法到顶层
       Object.assign(newOptions, options[key])