@mpxjs/core 2.9.47 → 2.9.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.47",
+  "version": "2.9.50",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.9.41",
+    "@mpxjs/utils": "^2.9.50",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
@@ -81,5 +81,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "3fe5773884ffeb99732414fe5d2d64b7f76d4c78"
+  "gitHead": "d8b89e0ba1f29a16244b247f6c7a8d8197e0d732"
 }

package/src/core/proxy.js

@@ -27,8 +27,7 @@ import {
   callWithErrorHandling,
   warn,
   error,
-  getEnvObj,
-  isReact
+  getEnvObj
 } from '@mpxjs/utils'
 import {
   BEFORECREATE,
@@ -136,8 +135,10 @@ export default class MpxProxy {
   }
 
   created () {
-    // 缓存上下文，在 destoryed 阶段删除
-    contextMap.set(this.uid, this.target)
+    if (__mpx_dynamic_runtime__) {
+      // 缓存上下文，在 destoryed 阶段删除
+      contextMap.set(this.uid, this.target)
+    }
     if (__mpx_mode__ !== 'web') {
       // web中BEFORECREATE钩子通过vue的beforeCreate钩子单独驱动
       this.callHook(BEFORECREATE)
@@ -153,7 +154,7 @@ export default class MpxProxy {
     this.state = CREATED
     this.callHook(CREATED)
 
-    if (__mpx_mode__ !== 'web' && !isReact) {
+    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'ios' && __mpx_mode__ !== 'android') {
       this.initRender()
     }
 
@@ -197,8 +198,10 @@ export default class MpxProxy {
   }
 
   unmounted () {
-    // 页面/组件销毁清除上下文的缓存
-    contextMap.remove(this.uid)
+    if (__mpx_dynamic_runtime__) {
+      // 页面/组件销毁清除上下文的缓存
+      contextMap.remove(this.uid)
+    }
     this.callHook(BEFOREUNMOUNT)
     this.scope?.stop()
     if (this.update) this.update.active = false
@@ -239,7 +242,7 @@ export default class MpxProxy {
   }
 
   initProps () {
-    if (isReact) {
+    if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
       // react模式下props内部对象透传无需深clone，依赖对象深层的数据响应触发子组件更新
       this.props = this.target.__getProps()
     } else {
@@ -650,7 +653,7 @@ export default class MpxProxy {
       this.forceUpdateAll = true
     }
 
-    if (isReact) {
+    if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
       // rn中不需要setdata
       this.forceUpdateData = {}
       this.forceUpdateAll = false

package/src/external/vuePlugin.js

@@ -74,6 +74,13 @@ export default function install (Vue) {
     }
   })
 
+  Vue.prototype.__ensureString = function (val) {
+    if (typeof val === 'string') {
+      return val
+    }
+    return JSON.stringify(val) + 'MpxEscape'
+  }
+
   Vue.prototype.triggerEvent = function (eventName, eventDetail) {
     // 输出Web时自定义组件绑定click事件会和web原生事件冲突，组件内部triggerEvent时会导致事件执行两次，将click事件改为_click来规避此问题
     const escapeEvents = ['click']

package/src/platform/builtInMixins/index.js

@@ -13,16 +13,16 @@ import pageRouteMixin from './pageRouteMixin'
 import { dynamicRefsMixin, dynamicRenderHelperMixin, dynamicSlotMixin } from '../../dynamic/dynamicRenderMixin.empty'
 import styleHelperMixin from './styleHelperMixin'
 import directiveHelperMixin from './directiveHelperMixin'
-import { isReact } from '@mpxjs/utils'
 
 export default function getBuiltInMixins (options, type) {
   let bulitInMixins
-  if (isReact) {
+  if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
     bulitInMixins = [
       proxyEventMixin(),
       directiveHelperMixin(),
       styleHelperMixin(type),
-      refsMixin()
+      refsMixin(),
+      i18nMixin()
     ]
   } else if (__mpx_mode__ === 'web') {
     bulitInMixins = [

package/src/platform/patch/index.js

@@ -5,14 +5,14 @@ import { getDefaultOptions as getAliDefaultOptions } from './ali/getDefaultOptio
 import { getDefaultOptions as getSwanDefaultOptions } from './swan/getDefaultOptions'
 import { getDefaultOptions as getWebDefaultOptions } from './web/getDefaultOptions'
 import { getDefaultOptions as getReactDefaultOptions } from './react/getDefaultOptions'
-import { error, isReact } from '@mpxjs/utils'
+import { error } from '@mpxjs/utils'
 
 export default function createFactory (type) {
   return (options = {}, { isNative, customCtor, customCtorType } = {}) => {
     options.__nativeRender__ = !!isNative
     options.__type__ = type
     let ctor
-    if (__mpx_mode__ !== 'web' && !isReact) {
+    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'ios' && __mpx_mode__ !== 'android') {
       if (customCtor) {
         ctor = customCtor
         customCtorType = customCtorType || type
@@ -40,7 +40,7 @@ export default function createFactory (type) {
     }
 
     let getDefaultOptions
-    if (isReact) {
+    if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
       getDefaultOptions = getReactDefaultOptions
     } else if (__mpx_mode__ === 'web') {
       getDefaultOptions = getWebDefaultOptions
@@ -60,7 +60,7 @@ export default function createFactory (type) {
     // 将合并后的用户定义的rawOptions传入获取当前应该注入的内建mixins
     rawOptions.mixins = getBuiltInMixins(rawOptions, type)
     const defaultOptions = getDefaultOptions({ type, rawOptions, currentInject })
-    if (__mpx_mode__ === 'web' || isReact) {
+    if (__mpx_mode__ === 'web' || __mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
       global.__mpxOptionsMap = global.__mpxOptionsMap || {}
       global.__mpxOptionsMap[currentInject.moduleId] = defaultOptions
     } else if (ctor) {