From 778217022a2b3cfecfa9994e336d6ec96b42d068 Mon Sep 17 00:00:00 2001
From: fantasticit <fantasticit@163.com>
Date: Fri, 3 Jun 2022 15:39:44 +0800
Subject: [PATCH] client: keep router query

---
 packages/client/src/hooks/use-router-query.tsx | 6 +++---
 packages/client/src/pages/login/index.tsx      | 9 ++++++++-
 packages/client/src/pages/register/index.tsx   | 9 ++++++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/hooks/use-router-query.tsx b/packages/client/src/hooks/use-router-query.tsx
index 59065bfb..2374a201 100644
--- a/packages/client/src/hooks/use-router-query.tsx
+++ b/packages/client/src/hooks/use-router-query.tsx
@@ -1,6 +1,6 @@
-import { useRouter } from 'next/router';
+import { Router, useRouter } from 'next/router';
 
-export function useRouterQuery<T>() {
+export function useRouterQuery<T extends Router['query']>() {
   const router = useRouter();
-  return router.query as unknown as T;
+  return router.query as T;
 }
diff --git a/packages/client/src/pages/login/index.tsx b/packages/client/src/pages/login/index.tsx
index feca9414..6d314e22 100644
--- a/packages/client/src/pages/login/index.tsx
+++ b/packages/client/src/pages/login/index.tsx
@@ -3,6 +3,7 @@ import { Author } from 'components/author';
 import { LogoImage, LogoText } from 'components/logo';
 import { Seo } from 'components/seo';
 import { useUser } from 'data/user';
+import { useRouterQuery } from 'hooks/use-router-query';
 import { useToggle } from 'hooks/use-toggle';
 import Link from 'next/link';
 import React, { useCallback } from 'react';
@@ -14,6 +15,7 @@ const { Title, Text } = Typography;
 
 const Page = () => {
   const { login } = useUser();
+  const query = useRouterQuery();
   const [loading, toggleLoading] = useToggle(false);
 
   const toLogin = useCallback(
@@ -66,7 +68,12 @@ const Page = () => {
           </Button>
           <footer>
             <Text link style={{ textAlign: 'center' }}>
-              <Link href="/register">
+              <Link
+                href={{
+                  pathname: '/register',
+                  query,
+                }}
+              >
                 <a>注册用户以登录</a>
               </Link>
             </Text>
diff --git a/packages/client/src/pages/register/index.tsx b/packages/client/src/pages/register/index.tsx
index ec9fda14..e4dd3aa2 100644
--- a/packages/client/src/pages/register/index.tsx
+++ b/packages/client/src/pages/register/index.tsx
@@ -3,6 +3,7 @@ import { Author } from 'components/author';
 import { LogoImage, LogoText } from 'components/logo';
 import { Seo } from 'components/seo';
 import { useAsyncLoading } from 'hooks/use-async-loading';
+import { useRouterQuery } from 'hooks/use-router-query';
 import Link from 'next/link';
 import Router from 'next/router';
 import React from 'react';
@@ -14,6 +15,7 @@ const { Content, Footer } = Layout;
 const { Title, Text } = Typography;
 
 const Page = () => {
+  const query = useRouterQuery();
   const [registerWithLoading, loading] = useAsyncLoading(registerApi);
 
   const onFinish = (values) => {
@@ -75,7 +77,12 @@ const Page = () => {
           </Button>
           <footer>
             <Text link style={{ textAlign: 'center' }}>
-              <Link href="/login">
+              <Link
+                href={{
+                  pathname: '/login',
+                  query,
+                }}
+              >
                 <a>使用其他账户登录</a>
               </Link>
             </Text>