fix: 修改routerChange判断条件

moligit · Apr 1, 2020 · 1f89653 · 1f89653
1 parent c2ff736
commit 1f89653
Show file tree

Hide file tree

Showing 2 changed files with 3 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.1",
+  "version": "3.6.2",
   "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
@@ -17,7 +17,7 @@ function GetInitialProps (WrappedComponent: FC): React.ComponentClass {
       if (!routerChanged) {
         // csr渲染模式下无论是首次打开页面还是路由跳转都需要客户端需要调用getInitialProps
         // 进行过history push或者reaplace操作之后，每次进行单页跳转客户端都需要调用getInitialProps
-        routerChanged = !window.__USE_SSR__ || props.history && /push|replace/i.test(props.history.action)
+        routerChanged = !window.__USE_SSR__ || props.history && props.history.action !== 'POP'
       }
     }
 
@@ -41,7 +41,7 @@ function GetInitialProps (WrappedComponent: FC): React.ComponentClass {
 
     render () {
       // 只有在首次进入页面需要将window.__INITIAL_DATA__作为props，路由切换时不需要
-      return <WrappedComponent {...Object.assign({}, this.props, getProps ? {} : window.__INITIAL_DATA__, this.state.extraProps)} />
+      return <WrappedComponent {...Object.assign({}, this.props, routerChanged ? {} : window.__INITIAL_DATA__, this.state.extraProps)} />
     }
   }
   return withRouter(GetInitialPropsClass)