feat(redux): bind mapState to context

WeBankFinTech · Apr 17, 2019 · 43143cf · 43143cf
1 parent 8f71a7f
commit 43143cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/wxa-redux/src/index.js b/packages/wxa-redux/src/index.js
@@ -12,7 +12,7 @@ let mountRedux = function (originHook) {
  let connectState = ()=>{
  let newState = this.$store.getState();
  let source = this.$$storeLastState;
- let data = mapState(this.mapState, newState, source);
+ let data = mapState(this.mapState, newState, source, this);
 
  if (data !== null) {
  // 有效state
@@ -77,7 +77,7 @@ export const wxaRedux = (options = {}) => {
  vm.onLoad = mountRedux(onLoad);
  vm.onShow = function (...args) {
  this.$$isCurrentPage = true;
- let data = mapState(this.mapState, this.$store.getState(), this.$$storeLastState);
+ let data = mapState(this.mapState, this.$store.getState(), this.$$storeLastState, this);
  if (data != null) {
  let diffData = this.$$reduxDiff(data)
  this.setData(diffData)

diff --git a/packages/wxa-redux/src/mapState.js b/packages/wxa-redux/src/mapState.js
@@ -1,13 +1,17 @@
 import shallowequal from 'shallowequal'
 
-export default function mapState(map, state, source={}) {
+export default function mapState(map, state, source={}, context) {
  if(map == null) return null;
+
  let {newState, oldState} = Object.keys(map).reduce((ret, key)=>{
  if(typeof map[key] !== 'function') {
  console.log(`mapState中的${key}必须为函数`);
  return ret;
  }
+
  try {
+ if (context) map[key].bind(context);
+
  ret.newState[key] = map[key](state);
  ret.oldState[key] = map[key](source);
  } catch(e) {