add notPreventFirstFetchOnBroswer to fetchData

Author: 方永乐

README.md

@@ -74,11 +74,15 @@ export default Example;
 import React from 'react';
 import { reduxConnect, withRouter, fetchData } from 'react-web-helper';
 
-@fetchData()
+@fetchData(/*notPreventFirstFetchOnBroswer*/)
 @withRouter()
 @reduxConnect(/*mapStateToProps, etc.*/)
 class Example extends React.Component {
  //...
 }
 export default Example;
 ```
+
+* @params {boolean} notPreventFirstFetchOnBroswer
+
+not frevent first load fetchData on broswer, default value is `false`.

lib/fetchDataDecoretor.js

@@ -36,7 +36,10 @@ var _reactRedux = require('react-redux');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var isFirstLoadOnServer = true;
 var fetchData = function fetchData() {
+ var notPreventFirstFetchOnBroswer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
  return function (WrappedComponent) {
  var Enhance = function (_React$Component) {
  (0, _inherits3.default)(Enhance, _React$Component);
@@ -49,11 +52,14 @@ var fetchData = function fetchData() {
  (0, _createClass3.default)(Enhance, [{
  key: 'componentDidMount',
  value: function componentDidMount() {
- if (WrappedComponent.fetchData instanceof Function) {
- WrappedComponent.fetchData({
- dispatch: this.props.dispatch,
- match: this.props.match
- });
+ if (isFirstLoadOnServer || notPreventFirstFetchOnBroswer) {
+ isFirstLoadOnServer = false;
+ if (WrappedComponent.fetchData instanceof Function) {
+ WrappedComponent.fetchData({
+ dispatch: this.props.dispatch,
+ match: this.props.match
+ });
+ }
  }
  }
  }, {

src/fetchDataDecoretor.js

@@ -2,15 +2,19 @@ import React from 'react';
 import hoistNonReactStatic from 'hoist-non-react-statics';
 import { connect } from 'react-redux';
 
-const fetchData = () => {
+let isFirstLoadOnServer = true;
+const fetchData = (notPreventFirstFetchOnBroswer = false) => {
  return (WrappedComponent) => {
  class Enhance extends React.Component {
  componentDidMount() {
- if (WrappedComponent.fetchData instanceof Function) {
- WrappedComponent.fetchData({
- dispatch: this.props.dispatch,
- match: this.props.match
- });
+ if (isFirstLoadOnServer || notPreventFirstFetchOnBroswer) {
+ isFirstLoadOnServer = false;
+ if (WrappedComponent.fetchData instanceof Function) {
+ WrappedComponent.fetchData({
+ dispatch: this.props.dispatch,
+ match: this.props.match
+ });
+ }
  }
  }
  render() {