Merge branch 'master' of github.com:uiwjs/uiw-admin

uiwjs · Jan 16, 2022 · 4bb0e3a · 4bb0e3a
2 parents 4440a6d + d6bb593
commit 4bb0e3a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/examples/base/mocker/index.js b/examples/base/mocker/index.js
@@ -1,13 +1,14 @@
 const { login, verify, logout, selectDemoPage, reloadAuth } = require('./login');
 
+
 const proxy = {
   'GET /api/user': { id: 1, username: 'kenny', sex: 6 },
   'POST /api/user': { id: 1, username: 'kenny', sex: 6 },
   'POST /api/login': login,
   'POST /api/logout': logout,
   'GET /api/user/verify': verify,
   'POST /api/selectDemoPage': selectDemoPage,
-  "POST /api/reloadAuth": reloadAuth
+  "POST /api/reloadAuth": reloadAuth,
 };
 
 module.exports = proxy;
diff --git a/packages/basic-layouts/src/HeaderRightMenu/index.tsx b/packages/basic-layouts/src/HeaderRightMenu/index.tsx
@@ -1,9 +1,16 @@
 import React from 'react'
 import { Menu, Avatar, Popover } from 'uiw';
 import { useNavigate } from 'react-router-dom';
-import { HeaderMenuItemsProps } from '../'
 import './index.css';
 
+
+export interface HeaderMenuItemsProps {
+  title: React.ReactNode;
+  icon: JSX.Element | string | false | null;
+  onClick?: () => void;
+  divider?: boolean;
+  render?: React.ReactNode;
+}
 export interface HeaderRightProps {
   /**
   * 菜单
@@ -27,7 +34,7 @@ export default function HeaderRightMenu(props: HeaderRightProps) {
 
   const navigate = useNavigate()
 
-  const { menus = [], profile = {} } = props
+  const { menus = [], profile = {}, onReloadAuth } = props
 
   const menuData: Array<HeaderMenuItemsProps & any> = [
     {
@@ -40,7 +47,7 @@ export default function HeaderRightMenu(props: HeaderRightProps) {
     {
       title: '刷新权限',
       icon: "reload",
-      onClick: props.onReloadAuth,
+      onClick: onReloadAuth?.(),
     },
     {
       title: '修改密码',
@@ -54,7 +61,7 @@ export default function HeaderRightMenu(props: HeaderRightProps) {
     {
       title: '退出登录',
       icon: "logout",
-      onClick: () => navigate("/", { replace: true })
+      onClick: () => navigate("/login", { replace: true })
     },
   ];
 

diff --git a/packages/basic-layouts/src/index.tsx b/packages/basic-layouts/src/index.tsx
@@ -15,15 +15,6 @@ import FullScreen from './FullScreen'
 
 const { Header, Footer, Sider, Content } = Layout;
 
-
-export interface HeaderMenuItemsProps {
-  title: React.ReactNode;
-  icon: JSX.Element | string | false | null;
-  onClick?: () => void;
-  divider?: boolean;
-  render?: React.ReactNode;
-}
-
 export type BasicLayoutProps = {
   logo?: string;
   projectName?: string;
@@ -41,6 +32,7 @@ export default function BasicLayout(props: BasicLayoutProps) {
     projectName = 'UIW Admin',
     profile = {},
     menus = [],
+    onReloadAuth
   } = props || {};
 
   const [collapsed, setCollapsed] = useState(false);
@@ -62,7 +54,7 @@ export default function BasicLayout(props: BasicLayoutProps) {
       <div style={{ display: 'flex', justifyItems: 'center', alignItems: "center" }}>
         {profile?.menuLeft}
         <FullScreen />
-        <HeaderRightMenu onReloadAuth={props.onReloadAuth} profile={profile} menus={menus} />
+        <HeaderRightMenu onReloadAuth={onReloadAuth} profile={profile} menus={menus} />
       </div>
     )
   }, [profile, menus])