fix(taro): 优化数据结构

NervJS · Apr 25, 2018 · 8781395 · 8781395
1 parent 487d9a5
commit 8781395
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/taro/src/component.js b/packages/taro/src/component.js
@@ -23,7 +23,7 @@ class Component {
 
   _initData ($root, $parent) {
     this.$app = getApp()
-    this.$root = $root || this
+    this.$root = $root || null
     this.$parent = $parent || null
     this.defaultData = {}
     this.$data = $parent ? $parent.$data : {}
@@ -42,7 +42,7 @@ class Component {
 
     if (this.$$components && !isEmptyObject(this.$$components)) {
       Object.getOwnPropertyNames(this.$$components).forEach(name => {
-        this.$$components[name]._initData(this.$root, this)
+        this.$$components[name]._initData(this.$root || this, this)
       })
     }
   }

diff --git a/packages/taro/src/lifecycle.js b/packages/taro/src/lifecycle.js
@@ -41,8 +41,9 @@ export function updateComponent (component, update) {
 }
 
 function doUpdate (component, update) {
+  const $data = component.$root ? component.$root.$data : component.$data
   component.$scope._setData(
-    { ...component.$root.$data },
+    { ...$data },
     function () {
       if (component._pendingCallbacks) {
         while (component._pendingCallbacks.length) {