Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈智峰
jinfa-platform
Commits
4d1bd2c4
Commit
4d1bd2c4
authored
Dec 30, 2020
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加自定义的icon, 主要修改config/config.ts的配置
parent
66628f55
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
69 additions
and
14 deletions
+69
-14
config.ts
config/config.ts
+11
-0
default_avatar.svg
src/assets/imgs/default_avatar.svg
+17
-0
AvatarDropdown.tsx
src/layouts/components/AvatarDropdown.tsx
+8
-1
OuterSide.tsx
src/layouts/components/OuterSide.tsx
+10
-9
MenuSlider.less
src/layouts/styles/MenuSlider.less
+5
-0
RightContent.less
src/layouts/styles/RightContent.less
+6
-2
index.tsx
src/pages/balance/settleRules/memberSettle/schema/index.tsx
+7
-1
index.tsx
src/pages/home/components/UserCenter/index.tsx
+5
-1
No files found.
config/config.ts
View file @
4d1bd2c4
...
...
@@ -53,6 +53,17 @@ const config: any = {
inlineLimit
:
10000
,
chunks
:
isProduction
&&
[
'vendors'
,
'umi'
],
chainWebpack
:
function
(
config
,
{
webpack
})
{
config
.
module
.
rule
(
'svg'
)
.
exclude
.
add
(
/pages/
).
end
();
// 给内置的添加 exclude,这里根据自己的情况处理
config
.
module
.
rule
(
'svgr'
)
.
test
(
/.svg$/
)
.
include
.
add
(
/pages/
).
end
()
// include 指定需要直接 svgr 的情况
.
use
(
'@svgr/webpack'
)
.
loader
(
require
.
resolve
(
'@svgr/webpack'
));
isProduction
&&
config
.
merge
({
optimization
:
{
minimize
:
true
,
...
...
src/assets/imgs/default_avatar.svg
0 → 100644
View file @
4d1bd2c4
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"56px"
height=
"56px"
viewBox=
"0 0 56 56"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<title>
我
</title>
<defs>
<circle
id=
"path-1"
cx=
"28"
cy=
"28"
r=
"28"
></circle>
</defs>
<g
id=
"我"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g>
<mask
id=
"mask-2"
fill=
"white"
>
<use
xlink:href=
"#path-1"
></use>
</mask>
<use
id=
"Mask"
fill=
"#E6E7EB"
xlink:href=
"#path-1"
></use>
<path
d=
"M33.6555679,41.9707886 C33.6555679,39.4830014 35.5358268,40.29543 36.3612399,35.7393901 C36.7035576,33.8493771 38.3642448,35.7089168 38.6821448,31.3941714 C38.6821448,29.6745403 37.7757776,29.2472439 37.7757776,29.2472439 C37.7757776,29.2472439 38.2364274,26.702535 38.4170246,24.7441009 C38.640259,22.3042277 37.0383622,16 28.4925336,16 C19.9463292,16 18.3434933,22.3042277 18.5680425,24.7441009 C18.7482641,26.702535 19.2089139,29.2472439 19.2089139,29.2472439 C19.2089139,29.2472439 18.3025467,29.6745403 18.3025467,31.3941714 C18.6196954,35.7089168 20.2801947,33.8493771 20.6227003,35.7393901 C21.4491464,40.2953342 23.3279966,39.4830014 23.3279966,41.9707886 C23.3279966,46.1150562 21.3612426,48.0505874 15.2037493,50.3452814 C9.02681572,52.6468751 4,55.4864395 4,57.0869565 L4,61 L52.9999992,61 C52.9999992,61 53,58.6864194 53,57.0869565 C53,55.4864395 47.9580635,52.6468751 41.78113,50.3452814 C35.6234488,48.0505874 33.6555679,46.1150562 33.6555679,41.9707886 Z"
fill=
"#FAFAFA"
mask=
"url(#mask-2)"
></path>
</g>
</g>
</svg>
\ No newline at end of file
src/layouts/components/AvatarDropdown.tsx
View file @
4d1bd2c4
...
...
@@ -6,6 +6,8 @@ import PersonDropdown from './PersonDropdown'
import
styles
from
'../styles/RightContent.less'
;
import
{
removeAuth
,
removeRouters
,
getAuth
}
from
'@/utils/auth'
;
import
{
inject
,
observer
}
from
'mobx-react'
import
Icon
from
'@ant-design/icons'
;
import
{
ReactComponent
as
DefaultAvatar
}
from
'@/assets/imgs/default_avatar.svg'
;
const
AvatarDropdown
=
(
props
)
=>
{
...
...
@@ -44,7 +46,12 @@ const AvatarDropdown = (props) => {
return
(
<
PersonDropdown
overlay=
{
menuHeaderDropdown
}
>
<
span
className=
{
`${styles.action} ${styles.account}`
}
>
<
Avatar
size=
"small"
className=
{
styles
.
avatar
}
src=
{
currentUser
.
avatar
}
alt=
"avatar"
/>
{
currentUser
.
avatar
?
<
Avatar
size=
"small"
className=
{
styles
.
avatar
}
src=
{
currentUser
.
avatar
}
alt=
"avatar"
/>
:
<
Icon
component=
{
()
=>
<
DefaultAvatar
className=
{
styles
.
logo
}
/>
}
/>
}
<
span
className=
{
styles
.
name
}
>
{
currentUser
.
name
}
</
span
>
</
span
>
</
PersonDropdown
>
...
...
src/layouts/components/OuterSide.tsx
View file @
4d1bd2c4
import
React
from
'react'
import
{
Layout
,
Menu
,
Avatar
,
Image
}
from
'antd'
import
{
AppstoreOutlined
}
from
'@ant-design/icons'
import
{
Link
}
from
'umi'
import
styles
from
'../styles/MenuSlider.less'
import
{
getRouters
}
from
'@/utils/auth'
import
{
isDev
}
from
'@/constants'
import
{
observer
,
inject
}
from
'mobx-react'
;
import
CustomIcon
from
'./CustomIcon'
import
CustomIcon
from
'./CustomIcon'
;
import
Icon
from
'@ant-design/icons'
;
import
{
ReactComponent
as
DefaultAvatar
}
from
'@/assets/imgs/default_avatar.svg'
;
const
{
Sider
}
=
Layout
export
interface
OuterSiderProps
{
...
...
@@ -46,13 +47,13 @@ const OuterSider: React.FC<OuterSiderProps> = observer((props) => {
const
siderMenu
=
getSubMenu
()
return
<>
<
Sider
collapsed=
{
true
}
collapsedWidth=
{
64
}
className=
{
styles
.
wrapperSilder
}
>
{
props
.
UserStore
.
avatar
?
<
div
className=
{
styles
.
userPic
}
>
<
img
src=
{
props
.
UserStore
.
avatar
}
className=
{
styles
.
avatar
}
/>
</
div
>
:
<
div
className=
{
styles
.
userPic
}
/>
}
<
div
className=
{
styles
.
userPic
}
>
{
props
.
UserStore
.
avatar
?
<
img
src=
{
props
.
UserStore
.
avatar
}
className=
{
styles
.
avatar
}
/>
:
<
Icon
component=
{
()
=>
<
DefaultAvatar
className=
{
styles
.
logo
}
/>
}
/
>
}
</
div
>
<
ul
className=
{
styles
.
menuBox
}
>
{
siderMenu
.
map
(
item
=>
(
...
...
src/layouts/styles/MenuSlider.less
View file @
4d1bd2c4
...
...
@@ -53,6 +53,11 @@
width: 32px;
height: 32px;
}
.logo {
width: 32px;
height: 32px;
}
}
.wrapperSilder {
...
...
src/layouts/styles/RightContent.less
View file @
4d1bd2c4
...
...
@@ -58,6 +58,11 @@
vertical-align: top;
background: rgba(255, 255, 255, 0.85);
}
.logo {
width: 24px;
height: 24px;
margin-right: 8px;
}
}
}
...
...
@@ -120,4 +125,4 @@
display: none;
}
}
}
\ No newline at end of file
}
src/pages/balance/settleRules/memberSettle/schema/index.tsx
View file @
4d1bd2c4
...
...
@@ -133,7 +133,13 @@ export const addSchema = {
prefix
:
"{{tableAddButton}}"
,
columns
:
"{{tableColumns}}"
// columns: "{{tableColumns}}",
}
},
'x-rules'
:
[
{
required
:
true
,
message
:
'请选择使用会员'
}
]
}
}
}
...
...
src/pages/home/components/UserCenter/index.tsx
View file @
4d1bd2c4
...
...
@@ -13,6 +13,10 @@ import home_user from '@/assets/imgs/home_user.png';
import
{
UPLOAD_TYPE
}
from
'@/constants'
import
{
PublicApi
}
from
'@/services/api'
;
import
{
observer
,
inject
}
from
'mobx-react'
;
// import Icon from '@ant-design/icons';
import
Icon
from
'@ant-design/icons'
;
import
{
ReactComponent
as
DefaultAvatar
}
from
'@/assets/imgs/default_avatar.svg'
;
interface
Iprops
{}
const
WEEKDAYS
=
[
"天"
,
"一"
,
"二"
,
"三"
,
"四"
,
"五"
,
"六"
];
...
...
@@ -102,7 +106,7 @@ const UserCenter: React.FC<Iprops> = (props) => {
{
state
.
logo
?
<
img
src=
{
state
.
logo
||
''
}
className=
{
styles
.
logo
}
/>
:
<
span
className=
{
styles
.
text
}
>
H
</
span
>
:
<
Icon
component=
{
()
=>
<
DefaultAvatar
className=
{
styles
.
logo
}
/>
}
/
>
}
<
span
className=
{
styles
.
upload
}
>
修改
</
span
>
</
Upload
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment