Browse Source

fix: fix typescript error

pull/9891/head
陈帅 4 years ago
parent
commit
a806c0135c
  1. 1
      package.json
  2. 40
      src/components/NoticeIcon/NoticeList.tsx
  3. 7
      src/components/RightContent/AvatarDropdown.tsx

1
package.json

@ -77,6 +77,7 @@
"devDependencies": { "devDependencies": {
"@ant-design/pro-cli": "^2.1.0", "@ant-design/pro-cli": "^2.1.0",
"@playwright/test": "^1.17.0", "@playwright/test": "^1.17.0",
"@types/classnames": "^2.3.1",
"@types/express": "^4.17.0", "@types/express": "^4.17.0",
"@types/history": "^4.7.0", "@types/history": "^4.7.0",
"@types/jest": "^26.0.0", "@types/jest": "^26.0.0",

40
src/components/NoticeIcon/NoticeList.tsx

@ -61,30 +61,30 @@ const NoticeList: React.FC<NoticeIconTabProps> = ({
) : null; ) : null;
return ( return (
<List.Item <div
className={itemCls}
key={item.key || i}
onClick={() => { onClick={() => {
onClick?.(item); onClick?.(item);
}} }}
> >
<List.Item.Meta <List.Item className={itemCls} key={item.key || i}>
className={styles.meta} <List.Item.Meta
avatar={leftIcon} className={styles.meta}
title={ avatar={leftIcon}
<div className={styles.title}> title={
{item.title} <div className={styles.title}>
<div className={styles.extra}>{item.extra}</div> {item.title}
</div> <div className={styles.extra}>{item.extra}</div>
} </div>
description={ }
<div> description={
<div className={styles.description}>{item.description}</div> <div>
<div className={styles.datetime}>{item.datetime}</div> <div className={styles.description}>{item.description}</div>
</div> <div className={styles.datetime}>{item.datetime}</div>
} </div>
/> }
</List.Item> />
</List.Item>
</div>
); );
}} }}
/> />

7
src/components/RightContent/AvatarDropdown.tsx

@ -7,6 +7,7 @@ import HeaderDropdown from '../HeaderDropdown';
import styles from './index.less'; import styles from './index.less';
import { outLogin } from '@/services/ant-design-pro/api'; import { outLogin } from '@/services/ant-design-pro/api';
import type { MenuInfo } from 'rc-menu/lib/interface'; import type { MenuInfo } from 'rc-menu/lib/interface';
import type { ItemType } from 'antd/lib/menu/hooks/useItems';
export type GlobalHeaderRightProps = { export type GlobalHeaderRightProps = {
menu?: boolean; menu?: boolean;
@ -68,7 +69,7 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
return loading; return loading;
} }
const menuItems = [ const menuItems: ItemType[] = [
...(menu ...(menu
? [ ? [
{ {
@ -82,7 +83,7 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
label: '个人设置', label: '个人设置',
}, },
{ {
type: 'divider', type: 'divider' as const,
}, },
] ]
: []), : []),
@ -96,7 +97,7 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
const menuHeaderDropdown = ( const menuHeaderDropdown = (
<Menu className={styles.menu} selectedKeys={[]} onClick={onMenuClick} items={menuItems} /> <Menu className={styles.menu} selectedKeys={[]} onClick={onMenuClick} items={menuItems} />
); );
return ( return (
<HeaderDropdown overlay={menuHeaderDropdown}> <HeaderDropdown overlay={menuHeaderDropdown}>
<span className={`${styles.action} ${styles.account}`}> <span className={`${styles.action} ${styles.account}`}>

Loading…
Cancel
Save