@mpxjs/core 2.8.27 → 2.8.28-beta.11

package/@types/index.d.ts

@@ -128,6 +128,8 @@ interface ComponentOpt<D, P, C, M, Mi extends Array<any>, S extends Record<any,
 
   pageHide?: () => void
 
+  initData?: Record<string, any>
+
   [index: string]: any
 }
 
@@ -484,6 +486,8 @@ export function reactive<T extends object> (target: T): Reactive<T>
 
 export function isReactive (value: unknown): boolean
 
+export function markRaw<T extends object>(value: T): T
+
 export function shallowReactive<T extends object> (target: T): ShallowReactive<T>
 
 export function computed<T> (

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.27",
+  "version": "2.8.28-beta.11",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
     "mpx"
   ],
   "author": "donghongping",
-  "license": "Apache",
+  "license": "Apache-2.0",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
   "directories": {
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.8.15",
+    "@mpxjs/utils": "^2.8.28-beta.11",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.0.2"
   },
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "f5b31d1f4f7602f103e5757f910f267d46bb91b1"
+  "gitHead": "8c7fa579da9c3e71908eb9bfb5833a7d9477505d"
 }

package/src/core/mergeOptions.js

@@ -132,7 +132,9 @@ function extractObservers (options) {
         },
         deep: true,
         // 延迟触发首次回调，处理转换支付宝时在observer中查询组件的行为，如vant/picker中，如不考虑该特殊情形可用immediate代替
-        immediateAsync: true
+        // immediateAsync: true
+        // 为了数据响应的标准化，不再提供immediateAsync选项，之前处理vant等原生组件跨平台转换遇到的问题推荐使用条件编译patch进行处理
+        immediate: true
       })
     }
   })
@@ -174,7 +176,9 @@ function extractObservers (options) {
             }
           },
           deep,
-          immediateAsync: watchProp
+          // immediateAsync: watchProp
+          // 为了数据响应的标准化，不再提供immediateAsync选项，之前处理vant等原生组件跨平台转换遇到的问题推荐使用条件编译patch进行处理
+          immediate: watchProp
         })
       }
     })

package/src/core/proxy.js

@@ -183,6 +183,7 @@ export default class MpxProxy {
   unmounted () {
     this.callHook(BEFOREUNMOUNT)
     this.scope?.stop()
+    if (this.update) this.update.active = false
     this.callHook(UNMOUNTED)
     this.state = UNMOUNTED
   }
@@ -409,6 +410,7 @@ export default class MpxProxy {
             }
             const subPath = aIsSubPathOfB(key, tarKey)
             if (subPath) {
+              if (!this.miniRenderData[tarKey]) this.miniRenderData[tarKey] = {}
               // setByPath 更新miniRenderData中的子数据
               doGetByPath(this.miniRenderData[tarKey], subPath, (current, subKey, meta) => {
                 if (meta.isEnd) {

package/src/observer/effect.js

@@ -105,10 +105,10 @@ export class ReactiveEffect {
     this.pausedState = PausedState.paused
   }
 
-  resume () {
+  resume (ignoreDirty = false) {
     const lastPausedState = this.pausedState
     this.pausedState = PausedState.resumed
-    if (lastPausedState === PausedState.dirty) {
+    if (!ignoreDirty && lastPausedState === PausedState.dirty) {
       this.scheduler ? this.scheduler() : this.run()
     }
   }

package/src/observer/effectScope.js

@@ -73,15 +73,15 @@ class EffectScope {
     }
   }
 
-  resume () {
+  resume (ignoreDirty = false) {
     if (this.active) {
       let i, l
       for (i = 0, l = this.effects.length; i < l; i++) {
-        this.effects[i].resume()
+        this.effects[i].resume(ignoreDirty)
       }
       if (this.scopes) {
         for (i = 0, l = this.scopes.length; i < l; i++) {
-          this.scopes[i].resume()
+          this.scopes[i].resume(ignoreDirty)
         }
       }
     }

package/src/observer/watch.js

@@ -42,7 +42,7 @@ const processWatchOptionsCompat = (options) => {
 }
 
 export function watch (source, cb, options = {}) {
-  let { immediate, deep, flush, immediateAsync } = processWatchOptionsCompat(options)
+  let { immediate, deep, flush } = processWatchOptionsCompat(options)
   const instance = currentInstance
   let getter
   let isMultiSource = false
@@ -139,8 +139,6 @@ export function watch (source, cb, options = {}) {
   if (cb) {
     if (immediate) {
       job()
-    } else if (immediateAsync) {
-      queuePreFlushCb(job)
     } else {
       oldValue = effect.run()
     }

package/src/platform/builtInMixins/refsMixin.js

@@ -99,6 +99,7 @@ export default function getRefsMixin () {
       createSelectorQuery (...args) {
         const selectorQuery = envObj.createSelectorQuery(...args)
         const cbs = []
+
         proxyMethods.forEach((name) => {
           const originalMethod = selectorQuery[name]
           selectorQuery[name] = function (cb = noop) {

package/src/platform/export/index.web.js

@@ -38,6 +38,7 @@ const noop = () => {
 const fixEffectScope = (scope) => {
   scope.pause = noop
   scope.resume = noop
+  return scope
 }
 
 const effectScope = (detached) => fixEffectScope(vueEffectScope(detached))