fix(taro-weapp): 修正 props 中 redux 函数传递

NervJS · Jul 29, 2018 · 6841694 · 6841694
1 parent 756a6d5
commit 6841694
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/packages/taro-weapp/src/create-component.js b/packages/taro-weapp/src/create-component.js
@@ -12,7 +12,7 @@ function bindProperties (weappComponentConf, ComponentClass) {
     type: null,
     observer: function () {
       if (!this.$component || !this.$component.__isAttached) return
-      const nextProps = filterProps(ComponentClass.properties, ComponentClass.defaultProps, this.data)
+      const nextProps = filterProps(ComponentClass.properties, ComponentClass.defaultProps, this.$component.props, this.data)
       this.$component.props = nextProps
       this.$component._unsafeCallUpdate = true
       updateComponent(this.$component)
@@ -108,11 +108,14 @@ function bindEvents (weappComponentConf, events, isPage) {
   })
 }
 
-function filterProps (properties, defaultProps = {}, weappComponentData) {
+function filterProps (properties, defaultProps = {}, componentProps, weappComponentData) {
   let res = {}
   Object.getOwnPropertyNames(properties).forEach(name => {
     if (name !== privatePropValName) {
-      res[name] = name in weappComponentData ? weappComponentData[name] : defaultProps[name]
+      if (typeof componentProps[name] === 'function') {
+        return res[name] = componentProps[name]
+      }
+      res[name] = (name in weappComponentData && weappComponentData[name] !== undefined) ? weappComponentData[name] : defaultProps[name]
     }
   })
   return res
@@ -144,7 +147,7 @@ function createComponent (ComponentClass, isPage) {
       _componentProps: 1
     },
     attached (options = {}) {
-      const props = filterProps(ComponentClass.properties, ComponentClass.defaultProps, this.data)
+      const props = filterProps(ComponentClass.properties, ComponentClass.defaultProps, {}, this.data)
       this.$component = new ComponentClass(props)
       this.$component._init(this)
       Object.assign(this.$component.$router.params, options)