fix(taro-weapp): 修复父组件 setState null 时，传到子组件时被过滤掉的问题 fix #1151

NervJS · Nov 21, 2018 · 0ec931d · 0ec931d · flappyjet · Nov 21, 2018
1 parent 84315ea
commit 0ec931d
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/packages/taro-weapp/src/create-component.js b/packages/taro-weapp/src/create-component.js
@@ -191,8 +191,7 @@ function filterProps (properties, defaultProps = {}, componentProps = {}, weappC
     }
     if (typeof componentProps[propName] === 'function') {
       newProps[propName] = componentProps[propName]
-    } else if (propName in weappComponentData &&
-      (properties[propName].value !== null || weappComponentData[propName] !== null)) {
+    } else if (propName in weappComponentData) {
       newProps[propName] = weappComponentData[propName]
     }
     if (componentFnReg.test(propName)) {
@@ -205,7 +204,7 @@ function filterProps (properties, defaultProps = {}, componentProps = {}, weappC
   }
   if (!isEmptyObject(defaultProps)) {
     for (const propName in defaultProps) {
-      if (newProps[propName] === undefined) {
+      if (newProps[propName] === undefined || newProps[propName] === null) {
         newProps[propName] = defaultProps[propName]
       }
     }