fix(okam-core): fix watch not work in wx custom component

ecomfe · Nov 4, 2018 · 0a7cdd0 · 0a7cdd0
1 parent 583bf02
commit 0a7cdd0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/packages/okam-core/src/extend/data/watch.js b/packages/okam-core/src/extend/data/watch.js
@@ -88,7 +88,7 @@ export default {
             /**
              * Watch the given expression or function
              *
-             * @param {string|Function} expressOrFunc the expression or functon to watch
+             * @param {string|Function} expressOrFunc the expression or function to watch
              * @param {Function|Object} callback the callback to execute when the
              *        expression or function value changes
              * @param {Object=} options watch options
@@ -115,8 +115,12 @@ export default {
              * @private
              */
             afterObserverInit() {
+                let watch = this.$rawWatch;
+                if (typeof watch === 'function') {
+                    watch = this.$rawWatch();
+                }
                 this.__computedObserver.addWatchComputed(
-                    normalizeWatch.call(this, this.watch)
+                    normalizeWatch.call(this, watch)
                 );
             }
         }

diff --git a/packages/okam-core/src/helper/methods.js b/packages/okam-core/src/helper/methods.js
@@ -11,9 +11,13 @@
  * @type {Array.<string>}
  */
 const extendPropMethods = [
-    'beforeCreate', 'beforeMount', 'mounted',
-    'beforeDestroy', 'destroyed', 'beforeUpdate',
-    'updated', ['computed', '$computed'], '$rawRefData'
+    'beforeCreate',
+    'beforeMount', 'mounted',
+    'beforeDestroy', 'destroyed',
+    'beforeUpdate', 'updated',
+    ['computed', '$rawComputed'],
+    ['watch', '$rawWatch'],
+    '$rawRefData'
 ];
 
 /**

diff --git a/packages/okam-core/src/helper/page.js b/packages/okam-core/src/helper/page.js
@@ -25,9 +25,15 @@ export function normalizePage(pageInfo) {
 
     let computed = pageInfo.computed;
     if (computed) {
-        pageInfo.$computed = computed;
+        pageInfo.$rawComputed = computed;
         delete pageInfo.computed;
     }
 
+    let watch = pageInfo.watch;
+    if (watch) {
+        pageInfo.$rawWatch = watch;
+        delete pageInfo.watch;
+    }
+
     return pageInfo;
 }