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
linweijiong
jinfa-platform
Commits
72969146
Commit
72969146
authored
Dec 23, 2020
by
Bill
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
89a7ece2
8a3511ae
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
17 deletions
+33
-17
OuterSide.tsx
src/layouts/components/OuterSide.tsx
+13
-7
RightContent.tsx
src/layouts/components/RightContent.tsx
+1
-4
MenuSlider.less
src/layouts/styles/MenuSlider.less
+5
-0
index.tsx
src/pages/home/components/UserCenter/index.tsx
+7
-5
index.ts
src/store/user/index.ts
+7
-1
No files found.
src/layouts/components/OuterSide.tsx
View file @
72969146
import
React
from
'react'
import
React
from
'react'
import
{
Layout
,
Menu
}
from
'antd'
import
{
Layout
,
Menu
,
Avatar
,
Image
}
from
'antd'
import
{
AppstoreOutlined
}
from
'@ant-design/icons'
import
{
AppstoreOutlined
}
from
'@ant-design/icons'
import
{
Link
}
from
'umi'
import
{
Link
}
from
'umi'
import
styles
from
'../styles/MenuSlider.less'
import
styles
from
'../styles/MenuSlider.less'
import
{
getRouters
}
from
'@/utils/auth'
import
{
getRouters
}
from
'@/utils/auth'
import
{
isDev
}
from
'@/constants'
import
{
isDev
}
from
'@/constants'
import
{
observer
,
inject
}
from
'mobx-react'
;
const
{
Sider
}
=
Layout
const
{
Sider
}
=
Layout
export
interface
OuterSiderProps
{
export
interface
OuterSiderProps
{
...
@@ -14,7 +14,7 @@ export interface OuterSiderProps {
...
@@ -14,7 +14,7 @@ export interface OuterSiderProps {
}
}
const
OuterSider
:
React
.
FC
<
OuterSiderProps
>
=
(
props
)
=>
{
const
OuterSider
:
React
.
FC
<
OuterSiderProps
>
=
observer
(
(
props
)
=>
{
const
{
menuData
,
pathname
=
"/"
}
=
props
const
{
menuData
,
pathname
=
"/"
}
=
props
const
authRouters
=
getRouters
()
const
authRouters
=
getRouters
()
let
defaultSelectedKeys
:
string
=
""
let
defaultSelectedKeys
:
string
=
""
...
@@ -45,7 +45,13 @@ const OuterSider: React.FC<OuterSiderProps> = (props) => {
...
@@ -45,7 +45,13 @@ const OuterSider: React.FC<OuterSiderProps> = (props) => {
const
siderMenu
=
getSubMenu
()
const
siderMenu
=
getSubMenu
()
return
<>
return
<>
<
Sider
collapsed=
{
true
}
collapsedWidth=
{
64
}
className=
{
styles
.
wrapperSilder
}
>
<
Sider
collapsed=
{
true
}
collapsedWidth=
{
64
}
className=
{
styles
.
wrapperSilder
}
>
<
div
className=
{
styles
.
userPic
}
/>
{
props
.
UserStore
.
avatar
?
<
div
className=
{
styles
.
userPic
}
>
<
img
src=
{
props
.
UserStore
.
avatar
}
className=
{
styles
.
avatar
}
/>
</
div
>
:
<
div
className=
{
styles
.
userPic
}
/>
}
<
ul
className=
{
styles
.
menuBox
}
>
<
ul
className=
{
styles
.
menuBox
}
>
{
{
siderMenu
.
map
(
item
=>
(
siderMenu
.
map
(
item
=>
(
...
@@ -60,8 +66,9 @@ const OuterSider: React.FC<OuterSiderProps> = (props) => {
...
@@ -60,8 +66,9 @@ const OuterSider: React.FC<OuterSiderProps> = (props) => {
</
ul
>
</
ul
>
</
Sider
>
</
Sider
>
</>
</>
}
}
)
OuterSider
.
defaultProps
=
{}
OuterSider
.
defaultProps
=
{}
export
default
OuterSider
// export default OuterSider
\ No newline at end of file
export
default
inject
(
'UserStore'
)(
OuterSider
)
src/layouts/components/RightContent.tsx
View file @
72969146
...
@@ -33,11 +33,8 @@ const GlobalHeaderRight: React.FC<{}> = (props) => {
...
@@ -33,11 +33,8 @@ const GlobalHeaderRight: React.FC<{}> = (props) => {
if
(
SOCKET_URL
&&
(
!
ws
.
current
||
ws
.
current
.
readyState
===
3
)
&&
userInfo
)
{
if
(
SOCKET_URL
&&
(
!
ws
.
current
||
ws
.
current
.
readyState
===
3
)
&&
userInfo
)
{
const
url
=
`
${
SOCKET_URL
}
/report/websocket?memberId=
${
userInfo
.
memberId
}
&roleId=
${
userInfo
.
memberRoleId
}
&token=
${
userInfo
.
token
}
&source=
${
1
}
`
;
const
url
=
`
${
SOCKET_URL
}
/report/websocket?memberId=
${
userInfo
.
memberId
}
&roleId=
${
userInfo
.
memberRoleId
}
&token=
${
userInfo
.
token
}
&source=
${
1
}
`
;
ws
.
current
=
new
WebSocket
(
url
);
ws
.
current
=
new
WebSocket
(
url
);
ws
.
current
.
onopen
=
(
e
)
=>
{
ws
.
current
.
onopen
=
(
e
)
=>
{}
console
.
log
(
e
)
}
ws
.
current
.
onmessage
=
(
e
)
=>
{
ws
.
current
.
onmessage
=
(
e
)
=>
{
console
.
log
(
e
)
const
data
=
JSON
.
parse
(
e
.
data
);
const
data
=
JSON
.
parse
(
e
.
data
);
if
(
data
.
type
===
NOT_READ_MESSAGE
)
{
if
(
data
.
type
===
NOT_READ_MESSAGE
)
{
setMessage
(
data
.
data
);
setMessage
(
data
.
data
);
...
...
src/layouts/styles/MenuSlider.less
View file @
72969146
...
@@ -48,6 +48,11 @@
...
@@ -48,6 +48,11 @@
background: rgba(255, 255, 255, 0.2);
background: rgba(255, 255, 255, 0.2);
margin: 16px;
margin: 16px;
border-radius: 50%;
border-radius: 50%;
overflow: hidden;
.avatar {
width: 32px;
height: 32px;
}
}
}
.wrapperSilder {
.wrapperSilder {
...
...
src/pages/home/components/UserCenter/index.tsx
View file @
72969146
...
@@ -12,6 +12,7 @@ import StatusTag from '@/components/StatusTag';
...
@@ -12,6 +12,7 @@ import StatusTag from '@/components/StatusTag';
import
home_user
from
'@/assets/imgs/home_user.png'
;
import
home_user
from
'@/assets/imgs/home_user.png'
;
import
{
UPLOAD_TYPE
}
from
'@/constants'
import
{
UPLOAD_TYPE
}
from
'@/constants'
import
{
PublicApi
}
from
'@/services/api'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
observer
,
inject
}
from
'mobx-react'
;
interface
Iprops
{}
interface
Iprops
{}
const
WEEKDAYS
=
[
"天"
,
"一"
,
"二"
,
"三"
,
"四"
,
"五"
,
"六"
];
const
WEEKDAYS
=
[
"天"
,
"一"
,
"二"
,
"三"
,
"四"
,
"五"
,
"六"
];
...
@@ -31,12 +32,11 @@ function reducer(state, action) {
...
@@ -31,12 +32,11 @@ function reducer(state, action) {
}
}
}
}
const
UserCenter
:
React
.
FC
<
Iprops
>
=
()
=>
{
const
UserCenter
:
React
.
FC
<
Iprops
>
=
(
props
)
=>
{
// const [uploadLoading, setUpload]
const
today
=
moment
();
const
today
=
moment
();
const
userAuth
=
getAuth
();
const
userAuth
=
getAuth
();
const
hasChangeMemberAuth
=
userAuth
?.
urls
.
includes
(
EDIT_USER_URL
);
//
const hasChangeMemberAuth = userAuth?.urls.includes(EDIT_USER_URL);
const
hasCenterAuth
=
userAuth
?.
urls
.
includes
(
USER_CENTER_URL
);
//
const hasCenterAuth = userAuth?.urls.includes(USER_CENTER_URL);
const
currentRole
=
userAuth
.
roles
.
filter
((
item
)
=>
item
.
memberRoleId
===
userAuth
.
memberRoleId
)
const
currentRole
=
userAuth
.
roles
.
filter
((
item
)
=>
item
.
memberRoleId
===
userAuth
.
memberRoleId
)
const
[
state
,
dispatch
]
=
useReducer
(
reducer
,
{
loading
:
false
,
logo
:
userAuth
.
logo
})
const
[
state
,
dispatch
]
=
useReducer
(
reducer
,
{
loading
:
false
,
logo
:
userAuth
.
logo
})
if
(
!
userAuth
)
{
if
(
!
userAuth
)
{
...
@@ -65,6 +65,7 @@ const UserCenter: React.FC<Iprops> = () => {
...
@@ -65,6 +65,7 @@ const UserCenter: React.FC<Iprops> = () => {
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
dispatch
({
type
:
'done'
,
payload
:
{
url
:
data
}})
dispatch
({
type
:
'done'
,
payload
:
{
url
:
data
}})
props
.
UserStore
.
setUserAvatar
(
data
)
}
}
})
})
}
}
...
@@ -146,4 +147,5 @@ const UserCenter: React.FC<Iprops> = () => {
...
@@ -146,4 +147,5 @@ const UserCenter: React.FC<Iprops> = () => {
)
)
}
}
export
default
UserCenter
// export default UserCenter
export
default
inject
(
'UserStore'
)(
observer
(
UserCenter
))
src/store/user/index.ts
View file @
72969146
...
@@ -10,7 +10,8 @@ class LoginStore implements ILoginModule {
...
@@ -10,7 +10,8 @@ class LoginStore implements ILoginModule {
@
observable
public
username
:
string
=
'admin'
;
@
observable
public
username
:
string
=
'admin'
;
@
observable
public
password
:
string
=
"123456"
;
@
observable
public
password
:
string
=
"123456"
;
@
observable
public
res
:
object
=
{};
@
observable
public
res
:
object
=
{};
@
observable
public
userInfo
=
getAuth
()
@
observable
public
userInfo
=
getAuth
();
@
observable
public
avatar
=
this
.
userInfo
.
logo
;
// 可以改变对应的状态值
// 可以改变对应的状态值
// @todo 接入更新用户信息接口
// @todo 接入更新用户信息接口
...
@@ -62,6 +63,11 @@ class LoginStore implements ILoginModule {
...
@@ -62,6 +63,11 @@ class LoginStore implements ILoginModule {
return
error
return
error
}
}
}
}
// 改变用户的头像
@
action
.
bound
public
setUserAvatar
(
link
:
string
)
{
this
.
avatar
=
link
;
}
}
}
export
default
LoginStore
export
default
LoginStore
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