Skip to content

Commit 5d06316

Browse files
faultaddrfaultaddr
committed
fix: fix some small issues about icon
Signed-off-by: farmer <cuferpan@gmail.com>
1 parent 538b259 commit 5d06316

File tree

14 files changed

+103
-83
lines changed

14 files changed

+103
-83
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ import SvgIcon from '@/components/SvgIcon'
117117

118118
import Href from '@/components/Href'
119119
import MyInfo from '@/views/web/about/MyInfo'
120-
120+
import {GithubFill} from 'utils/antdIcon'
121121
// API_BASE_URL
122122
export const API_BASE_URL = 'http://120.79.229.207:6060'
123123
// export const API_BASE_URL = 'http://127.0.0.1:6060'
@@ -133,7 +133,7 @@ export const SIDEBAR = {
133133
homepages: {
134134
github: {
135135
link: 'https://github.com/panyunyi97',
136-
icon: <Icon type='github' theme='filled' className='homepage-icon' />
136+
icon: <GithubFill className='homepage-icon' />
137137
},
138138
juejin: {
139139
link: 'https://juejin.im/user/96412755827687',

‎README.zh-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export const SIDEBAR = {
132132
homepages: {
133133
github: {
134134
link: 'https://github.com/panyunyi97',
135-
icon: <Icon type='github' theme='filled' className='homepage-icon' />
135+
icon: <GithubFill className='homepage-icon' />
136136
},
137137
juejin: {
138138
link: 'https://juejin.im/user/96412755827687',

‎src/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import SvgIcon from '@/components/SvgIcon'
44

55
import Href from '@/components/Href'
66
import MyInfo from '@/views/web/about/MyInfo'
7-
7+
import {GithubFill} from 'utils/antdIcon'
88
// API_BASE_URL
99
export const SERVER_URL = 'http://www.panyunyi.cn'
1010
// export const SERVER_URL = 'http://127.0.0.1'
@@ -22,7 +22,7 @@ export const SIDEBAR = {
2222
homepages: {
2323
github: {
2424
link: 'https://github.com/panyunyi97',
25-
icon: <Icon type='github' theme='filled' className='homepage-icon' />
25+
icon: <GithubFill className='homepage-icon' />
2626
},
2727
juejin: {
2828
link: 'https://juejin.im/user/96412755827687',

‎src/layout/admin/sidebar/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function AdminSidebar(props) {
3131
key={item.path}
3232
title={
3333
<span>
34-
{item.icon && <Icon type={item.icon} />}
34+
{item.icon}
3535
<span>{item.name}</span>
3636
</span>
3737
}>
@@ -43,7 +43,7 @@ function AdminSidebar(props) {
4343
item.name && (
4444
<Menu.Item key={item.path}>
4545
<NavLink to={item.path}>
46-
{item.icon && <Icon type={item.icon} />}
46+
{item.icon}
4747
<span>{item.name}</span>
4848
</NavLink>
4949
</Menu.Item>

‎src/layout/web/header/left/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const HeaderLeft = props => {
3838
{navList.map(nav => (
3939
<Menu.Item key={nav.link}>
4040
<Link to={nav.link}>
41-
{nav.icon && <Icon type={nav.icon} style={{ marginRight: 15 }} />}
41+
{nav.icon}
4242
<span className='nav-text'>{nav.title}</span>
4343
</Link>
4444
</Menu.Item>

‎src/layout/web/header/right/Navbar.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
22
import PropTypes from 'prop-types'
33

44
import { Link, useLocation } from 'react-router-dom'
5-
import { Menu, Icon } from 'antd'
5+
import { Menu } from 'antd'
66

77
import navList from './navList'
88

@@ -14,7 +14,7 @@ function NavBar(props) {
1414
{navList.map(nav => (
1515
<Menu.Item key={nav.link}>
1616
<Link to={nav.link}>
17-
{nav.icon && <Icon type={nav.icon} />}
17+
{nav.icon}
1818
<span className='nav-text'>{nav.title}</span>
1919
</Link>
2020
</Menu.Item>

‎src/layout/web/header/right/navList.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/layout/web/header/right/navList.jsx

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import React from 'react'
2+
import { EditOutline, FolderOutline, HomeOutline, MessageOutline, UserOutline } from 'utils/antdIcon'
3+
4+
export default [
5+
{
6+
icon: <HomeOutline style={{ marginRight: 15 }} />,
7+
title: '首页',
8+
link: '/home'
9+
},
10+
{
11+
icon: <EditOutline style={{ marginRight: 15 }} />,
12+
title: '归档',
13+
link: '/archives'
14+
},
15+
{
16+
icon: <FolderOutline style={{ marginRight: 15 }} />,
17+
title: '分类',
18+
link: '/categories'
19+
},
20+
{
21+
icon: <UserOutline style={{ marginRight: 15 }} />,
22+
title: '关于',
23+
link: '/about'
24+
},
25+
{
26+
icon: <MessageOutline style={{ marginRight: 15 }} />,
27+
title: '碎🐡',
28+
link: '/fragment'
29+
}
30+
]

‎src/utils/antdIcon.js

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
11
// 解决 antd icon 打包不能按需加载的问题
22
// https://github.com/ant-design/ant-design/issues/12011
33

4-
export { default as GithubFill } from '@ant-design/icons/lib/fill/GithubFill'
5-
export { default as GithubOutline } from '@ant-design/icons/lib/outline/GithubOutline'
4+
export { default as GithubFill } from '@ant-design/icons/lib/icons/GithubFilled'
5+
export { default as GithubOutline } from '@ant-design/icons/lib/icons/GithubOutlined'
66

7-
export { default as LoadingOutline } from '@ant-design/icons/lib/outline/LoadingOutline'
8-
export { default as FileSync } from '@ant-design/icons/lib/outline/FileSyncOutline'
7+
export { default as LoadingOutline } from '@ant-design/icons/lib/icons/LoadingOutlined'
8+
export { default as FileSync } from '@ant-design/icons/lib/icons/FileSyncOutlined'
99

10-
export { default as FolderOpenOutline } from '@ant-design/icons/lib/outline/FolderOpenOutline'
10+
export { default as FolderOpenOutline } from '@ant-design/icons/lib/icons/FolderOpenOutlined'
1111

12-
export { default as FolderOutline } from '@ant-design/icons/lib/outline/FolderOutline'
12+
export { default as FolderOutline } from '@ant-design/icons/lib/icons/FolderOutlined'
1313

14-
export { default as DownOutline } from '@ant-design/icons/lib/outline/DownOutline'
14+
export { default as DownOutline } from '@ant-design/icons/lib/icons/DownOutlined'
1515

16-
export { default as DeleteOutline } from '@ant-design/icons/lib/outline/DeleteOutline'
16+
export { default as DeleteOutline } from '@ant-design/icons/lib/icons/DeleteOutlined'
1717

18-
export { default as InboxOutline } from '@ant-design/icons/lib/outline/InboxOutline'
18+
export { default as InboxOutline } from '@ant-design/icons/lib/icons/InboxOutlined'
1919

20-
export { default as HomeOutline } from '@ant-design/icons/lib/outline/HomeOutline'
20+
export { default as HomeOutline } from '@ant-design/icons/lib/icons/HomeOutlined'
2121

22-
export { default as SwitcherOutline } from '@ant-design/icons/lib/outline/SwitcherOutline'
22+
export { default as SwitcherOutline } from '@ant-design/icons/lib/icons/SwitcherOutlined'
2323

24-
export { default as EditOutline } from '@ant-design/icons/lib/outline/EditOutline'
24+
export { default as EditOutline } from '@ant-design/icons/lib/icons/EditOutlined'
2525

26-
export { default as UserOutline } from '@ant-design/icons/lib/outline/UserOutline'
26+
export { default as UserOutline } from '@ant-design/icons/lib/icons/UserOutlined'
2727

28-
export { default as SearchOutline } from '@ant-design/icons/lib/outline/SearchOutline'
28+
export { default as SearchOutline } from '@ant-design/icons/lib/icons/SearchOutlined'
2929

30-
export { default as MenuOutline } from '@ant-design/icons/lib/outline/MenuOutline'
30+
export { default as MenuOutline } from '@ant-design/icons/lib/icons/MenuOutlined'
3131

32-
export { default as PlusOutline } from '@ant-design/icons/lib/outline/PlusOutline'
32+
export { default as PlusOutline } from '@ant-design/icons/lib/icons/PlusOutlined'
3333

34-
export { default as QqOutline } from '@ant-design/icons/lib/outline/QqOutline'
34+
export { default as QqOutline } from '@ant-design/icons/lib/icons/QqOutlined'
3535

36-
export { default as ClockCircleOutline } from '@ant-design/icons/lib/outline/ClockCircleOutline'
36+
export { default as ClockCircleOutline } from '@ant-design/icons/lib/icons/ClockCircleOutlined'
3737

38-
export { default as CloseOutline } from '@ant-design/icons/lib/outline/CloseOutline'
39-
export { default as CheckOutline } from '@ant-design/icons/lib/outline/CheckOutline'
40-
export { default as InfoCircleOutline } from '@ant-design/icons/lib/outline/InfoCircleOutline'
41-
export { default as ExclamationCircleOutline } from '@ant-design/icons/lib/outline/ExclamationCircleOutline'
42-
export { default as QuestionOutline } from '@ant-design/icons/lib/outline/QuestionOutline'
43-
export { default as StarOutline } from '@ant-design/icons/lib/outline/StarOutline'
44-
export { default as LeftOutline } from '@ant-design/icons/lib/outline/LeftOutline'
45-
export { default as RightOutline } from '@ant-design/icons/lib/outline/RightOutline'
46-
export { default as UpOutline } from '@ant-design/icons/lib/outline/UpOutline'
47-
export { default as CaretUpOutline } from '@ant-design/icons/lib/outline/CaretUpOutline'
48-
export { default as CaretDownOutline } from '@ant-design/icons/lib/outline/CaretDownOutline'
49-
export { default as CloseCircleOutline } from '@ant-design/icons/lib/outline/CloseCircleOutline'
50-
export { default as CheckCircleOutline } from '@ant-design/icons/lib/outline/CheckCircleOutline'
38+
export { default as CloseOutline } from '@ant-design/icons/lib/icons/CloseOutlined'
39+
export { default as CheckOutline } from '@ant-design/icons/lib/icons/CheckOutlined'
40+
export { default as InfoCircleOutline } from '@ant-design/icons/lib/icons/InfoCircleOutlined'
41+
export { default as ExclamationCircleOutline } from '@ant-design/icons/lib/icons/ExclamationCircleOutlined'
42+
export { default as QuestionOutline } from '@ant-design/icons/lib/icons/QuestionOutlined'
43+
export { default as StarOutline } from '@ant-design/icons/lib/icons/StarOutlined'
44+
export { default as LeftOutline } from '@ant-design/icons/lib/icons/LeftOutlined'
45+
export { default as RightOutline } from '@ant-design/icons/lib/icons/RightOutlined'
46+
export { default as UpOutline } from '@ant-design/icons/lib/icons/UpOutlined'
47+
export { default as CaretUpOutline } from '@ant-design/icons/lib/icons/CaretUpOutlined'
48+
export { default as CaretDownOutline } from '@ant-design/icons/lib/icons/CaretDownOutlined'
49+
export { default as CloseCircleOutline } from '@ant-design/icons/lib/icons/CloseCircleOutlined'
50+
export { default as CheckCircleOutline } from '@ant-design/icons/lib/icons/CheckCircleOutlined'
5151

52-
export { default as ExclamationCircleFill } from '@ant-design/icons/lib/fill/ExclamationCircleFill'
53-
export { default as CheckCircleFill } from '@ant-design/icons/lib/fill/CheckCircleFill'
54-
export { default as CloseCircleFill } from '@ant-design/icons/lib/fill/CloseCircleFill'
55-
export { default as InfoCircleFill } from '@ant-design/icons/lib/fill/InfoCircleFill'
56-
export { default as StarFill } from '@ant-design/icons/lib/fill/StarFill'
57-
export { default as MessageOutline } from '@ant-design/icons/lib/outline/MessageOutline'
58-
export { default as LineOutline} from '@ant-design/icons/lib/outline/LineChartOutline'
52+
export { default as ExclamationCircleFill } from '@ant-design/icons/lib/icons/ExclamationCircleFilled'
53+
export { default as CheckCircleFill } from '@ant-design/icons/lib/icons/CheckCircleFilled'
54+
export { default as CloseCircleFill } from '@ant-design/icons/lib/icons/CloseCircleFilled'
55+
export { default as InfoCircleFill } from '@ant-design/icons/lib/icons/InfoCircleFilled'
56+
export { default as StarFill } from '@ant-design/icons/lib/icons/StarFilled'
57+
export { default as MessageOutline } from '@ant-design/icons/lib/icons/MessageOutlined'
58+
export { default as LineOutline} from '@ant-design/icons/lib/icons/LineChartOutlined'

‎src/views/admin/article/edit/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { connect, useSelector } from 'react-redux'
33
import './index.less'
44

55
import axios from '@/utils/axios'
6-
import { Button, Input, Modal, BackTop, message, Switch, Icon } from 'antd'
7-
import { CheckCircleFilled } from '@ant-design/icons'
6+
import { Button, Input, Modal, BackTop, message, Switch} from 'antd'
87
import MdEditor from '@/components/MdEditor'
98
import List from './Tag'
109
import useBreadcrumb from '@/hooks/useBreadcrumb'
10+
import { CheckCircleOutline, CheckCircleFill } from 'utils/antdIcon'
1111
function Edit(props) {
1212
const store = useSelector(state => ({
1313
tagList: state.article.tagList,
@@ -152,7 +152,7 @@ function Edit(props) {
152152
disabled={!title}
153153
className='action-icon'
154154
title={editId ? '更新' : '新增'}
155-
icon={<Icon type={editId ? <CheckCircleFilled /> : <CheckCircleFilled />} />}
155+
icon={editId ? <CheckCircleFill /> : <CheckCircleOutline />}
156156
onClick={() => {
157157
editId ? update() : add()
158158
}}

0 commit comments

Comments
 (0)