From 54ad1535d6480873190326870326572085808bcb Mon Sep 17 00:00:00 2001 From: chenos Date: Wed, 30 Mar 2022 13:26:41 +0800 Subject: [PATCH 1/2] fix: destroy token on signout --- packages/client/src/user/CurrentUser.tsx | 3 ++- packages/plugin-users/src/actions/users.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/client/src/user/CurrentUser.tsx b/packages/client/src/user/CurrentUser.tsx index 28fb5423b..6e5f313e6 100644 --- a/packages/client/src/user/CurrentUser.tsx +++ b/packages/client/src/user/CurrentUser.tsx @@ -32,7 +32,8 @@ export const CurrentUser = () => { { + onClick={async () => { + await api.resource('users').signout(); api.setBearerToken(null); history.push('/signin'); }} diff --git a/packages/plugin-users/src/actions/users.ts b/packages/plugin-users/src/actions/users.ts index 1805b01d5..45cea6c03 100644 --- a/packages/plugin-users/src/actions/users.ts +++ b/packages/plugin-users/src/actions/users.ts @@ -44,7 +44,8 @@ export async function signin(ctx: Context, next: Next) { } export async function signout(ctx: Context, next: Next) { - ctx.body = {}; + await ctx.state.currentUser.update({ token: null }); + ctx.body = ctx.state.currentUser; await next(); } From cf1fb16638f357dab55a77fd4d24880549aebab2 Mon Sep 17 00:00:00 2001 From: chenos Date: Wed, 30 Mar 2022 14:21:25 +0800 Subject: [PATCH 2/2] fix(client): auto collapse menu items when overflow --- .../route-switch/antd/admin-layout/index.tsx | 64 +++++----- .../src/schema-component/antd/menu/Menu.tsx | 118 ++++++++++-------- 2 files changed, 98 insertions(+), 84 deletions(-) diff --git a/packages/client/src/route-switch/antd/admin-layout/index.tsx b/packages/client/src/route-switch/antd/admin-layout/index.tsx index e6264570b..d5bd104db 100644 --- a/packages/client/src/route-switch/antd/admin-layout/index.tsx +++ b/packages/client/src/route-switch/antd/admin-layout/index.tsx @@ -13,7 +13,7 @@ import { RemoteSchemaTemplateManagerProvider, useDocumentTitle, useRoute, - useSystemSettings, + useSystemSettings } from '../../../'; const InternalAdminLayout = (props: any) => { @@ -58,36 +58,42 @@ const InternalAdminLayout = (props: any) => { /> {/* {result?.data?.data?.title} */} -