support properties.observer

didi · Nov 1, 2024 · af3b9f2 · af3b9f2
1 parent 87e034d
commit af3b9f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/core/src/core/proxy.js b/packages/core/src/core/proxy.js
@@ -137,13 +137,13 @@ export default class MpxProxy {
   }
 
   processIgnoreReactive (obj) {
-    if (isObject(obj) && this.ignoreReactivePattern) {
+    if (this.ignoreReactivePattern && isObject(obj)) {
       Object.keys(obj).forEach((key) => {
         if (this.ignoreReactivePattern.test(key)) {
           Object.defineProperty(obj, key, {
             enumerable: true,
             // set configurable to false to skip defineReactive
-            configurable: false,
+            configurable: false
           })
         }
       })
@@ -435,7 +435,7 @@ export default class MpxProxy {
       if (hasOwn(renderData, key)) {
         const data = renderData[key]
         const firstKey = getFirstKey(key)
-        if (!this.localKeysMap[firstKey] || (this.ignoreReactivePattern && this.this.ignoreReactivePattern.test(firstKey))) {
+        if (!this.localKeysMap[firstKey] || (this.ignoreReactivePattern && this.ignoreReactivePattern.test(firstKey))) {
           continue
         }
         // 外部clone，用于只需要clone的场景

diff --git a/packages/core/src/platform/patch/wx/getDefaultOptions.js b/packages/core/src/platform/patch/wx/getDefaultOptions.js
@@ -23,11 +23,13 @@ function transformProperties (properties) {
     } else {
       newFiled = Object.assign({}, rawFiled)
     }
-    newFiled.observer = function (value) {
+    const rawObserver = rawFiled?.observer
+    newFiled.observer = function (value, oldValue) {
       if (this.__mpxProxy) {
         this[key] = value
         this.__mpxProxy.propsUpdated()
       }
+      rawObserver && rawObserver.call(this, value, oldValue)
     }
     newProps[key] = newFiled
   })