fix: csr getinitialProps

moligit · Apr 13, 2020 · cb88ed7 · cb88ed7
1 parent ecb81c2
commit cb88ed7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/ykfe-utils/package.json b/packages/ykfe-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ykfe-utils",
-  "version": "3.6.5",
+  "version": "3.6.6",
   "description": "utils for ykfe",
   "main": "lib/index.js",
   "module": "es/index.js",

diff --git a/packages/ykfe-utils/src/components/getinitialProps.tsx b/packages/ykfe-utils/src/components/getinitialProps.tsx
@@ -35,13 +35,15 @@ function GetInitialProps (WrappedComponent: FC): React.ComponentClass {
     }
 
     async componentDidMount () {
-      // history push的时候需要调用getInitialProps
-      if (this.props.history && this.props.history.action === 'PUSH') {
+      console.log('xx')
+      // csr 或者 history push的时候需要调用getInitialProps
+      if ((this.props.history && this.props.history.action !== 'POP' || !window.__USE_SSR__)) {
         await this.getInitialProps()
       }
     }
 
     async getInitialProps () {
+      console.log('hoc get')
       // csr首次进入页面以及csr/ssr切换路由时才调用getInitialProps
       const props = this.props
       if (WrappedComponent.preload) {