From d25306e5409069495eb8aeb715de51e2eaf8a96c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 27 二月 2024 14:29:55 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/components/RightContent/AvatarDropdown.jsx | 55 +++++++++++++++++++++++--------------------------------
zy-asrs-flow/tsconfig.json | 2 +-
2 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/zy-asrs-flow/src/components/RightContent/AvatarDropdown.tsx b/zy-asrs-flow/src/components/RightContent/AvatarDropdown.jsx
similarity index 82%
rename from zy-asrs-flow/src/components/RightContent/AvatarDropdown.tsx
rename to zy-asrs-flow/src/components/RightContent/AvatarDropdown.jsx
index 7dee603..6e4c9cb 100644
--- a/zy-asrs-flow/src/components/RightContent/AvatarDropdown.tsx
+++ b/zy-asrs-flow/src/components/RightContent/AvatarDropdown.jsx
@@ -4,23 +4,11 @@
import { Spin } from 'antd';
import { createStyles } from 'antd-style';
import { stringify } from 'querystring';
-import type { MenuInfo } from 'rc-menu/lib/interface';
import React, { useCallback } from 'react';
import { flushSync } from 'react-dom';
import HeaderDropdown from '../HeaderDropdown';
import { setRemoteMenu } from '@/services/route'
import { removeToken } from '@/utils/token-util'
-
-export type GlobalHeaderRightProps = {
- menu?: boolean;
- children?: React.ReactNode;
-};
-
-export const AvatarName = () => {
- const { initialState } = useModel('@@initialState');
- const { currentUser } = initialState || {};
- return <span className="anticon">{currentUser?.name}</span>;
-};
const useStyles = createStyles(({ token }) => {
return {
@@ -40,10 +28,17 @@
};
});
-export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu, children }) => {
- /**
- * 閫�鍑虹櫥褰曪紝骞朵笖灏嗗綋鍓嶇殑 url 淇濆瓨
- */
+export const AvatarName = () => {
+ const { initialState } = useModel('@@initialState');
+ const { currentUser } = initialState || {};
+ return <span className="anticon">{currentUser?.name}</span>;
+};
+
+export const AvatarDropdown = ({ menu, children }) => {
+ const { styles } = useStyles();
+ const { initialState, setInitialState } = useModel('@@initialState');
+
+ // 閫�鍑虹櫥褰曪紝骞朵笖灏嗗綋鍓嶇殑 url 淇濆瓨
const loginOut = async () => {
// await outLogin();
removeToken();
@@ -62,22 +57,18 @@
});
}
};
- const { styles } = useStyles();
- const { initialState, setInitialState } = useModel('@@initialState');
-
- const onMenuClick = useCallback(
- (event: MenuInfo) => {
- const { key } = event;
- if (key === 'logout') {
- flushSync(() => {
- setInitialState((s) => ({ ...s, currentUser: undefined }));
- });
- loginOut();
- return;
- }
- history.push(`/account/${key}`);
- },
+ const onMenuClick = useCallback((event) => {
+ const { key } = event;
+ if (key === 'logout') {
+ flushSync(() => {
+ setInitialState((s) => ({ ...s, currentUser: undefined }));
+ });
+ loginOut();
+ return;
+ }
+ history.push(`/account/${key}`);
+ },
[setInitialState],
);
@@ -127,7 +118,7 @@
label: '涓汉璁剧疆',
},
{
- type: 'divider' as const,
+ type: 'divider'
},
{
key: 'logout',
diff --git a/zy-asrs-flow/tsconfig.json b/zy-asrs-flow/tsconfig.json
index 704800f..773d6da 100644
--- a/zy-asrs-flow/tsconfig.json
+++ b/zy-asrs-flow/tsconfig.json
@@ -19,5 +19,5 @@
"@@test/*": ["./src/.umi-test/*"]
}
},
- "include": ["./**/*.d.ts", "./**/*.ts", "./**/*.tsx", "src/app.tsx", "src/utils/icon-util.js", "src/pages/User/Login/index1.jsx", "src/components/Footer/index.jsx", "src/components/HeaderDropdown/index.jsx", "src/pages/system/host/components/UpdateForm.jsx", "src/pages/system/host/index.jsx", "src/utils/tree-util.js", "src/components/RightContent/index.jsx"]
+ "include": ["./**/*.d.ts", "./**/*.ts", "./**/*.tsx", "src/app.tsx", "src/utils/icon-util.js", "src/pages/User/Login/index1.jsx", "src/components/Footer/index.jsx", "src/components/HeaderDropdown/index.jsx", "src/pages/system/host/components/UpdateForm.jsx", "src/pages/system/host/index.jsx", "src/utils/tree-util.js", "src/components/RightContent/index.jsx", "src/components/RightContent/AvatarDropdown.jsx"]
}
--
Gitblit v1.9.1