Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
new-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
e07eb017
authored
May 16, 2023
by
JustSong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: limit the shown text's length (close #80)
parent
fa2bac9a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
8 deletions
+31
-8
controller/user.go
+7
-0
web/src/components/UsersTable.js
+17
-8
web/src/helpers/render.js
+7
-0
No files found.
controller/user.go
View file @
e07eb017
...
...
@@ -467,6 +467,13 @@ func CreateUser(c *gin.Context) {
})
return
}
if
err
:=
common
.
Validate
.
Struct
(
&
user
);
err
!=
nil
{
c
.
JSON
(
http
.
StatusOK
,
gin
.
H
{
"success"
:
false
,
"message"
:
"输入不合法 "
+
err
.
Error
(),
})
return
}
if
user
.
DisplayName
==
""
{
user
.
DisplayName
=
user
.
Username
}
...
...
web/src/components/UsersTable.js
View file @
e07eb017
...
...
@@ -4,6 +4,7 @@ import { Link } from 'react-router-dom';
import
{
API
,
showError
,
showSuccess
}
from
'../helpers'
;
import
{
ITEMS_PER_PAGE
}
from
'../constants'
;
import
{
renderText
}
from
'../helpers/render'
;
function
renderRole
(
role
)
{
switch
(
role
)
{
...
...
@@ -64,7 +65,7 @@ const UsersTable = () => {
(
async
()
=>
{
const
res
=
await
API
.
post
(
'/api/user/manage'
,
{
username
,
action
,
action
});
const
{
success
,
message
}
=
res
.
data
;
if
(
success
)
{
...
...
@@ -161,18 +162,18 @@ const UsersTable = () => {
<
Table
.
HeaderCell
style
=
{{
cursor
:
'pointer'
}}
onClick
=
{()
=>
{
sortUser
(
'
username
'
);
sortUser
(
'
id
'
);
}}
>
用户名
ID
<
/Table.HeaderCell
>
<
Table
.
HeaderCell
style
=
{{
cursor
:
'pointer'
}}
onClick
=
{()
=>
{
sortUser
(
'
display_
name'
);
sortUser
(
'
user
name'
);
}}
>
显示名称
用户名
<
/Table.HeaderCell
>
<
Table
.
HeaderCell
style
=
{{
cursor
:
'pointer'
}}
...
...
@@ -220,9 +221,17 @@ const UsersTable = () => {
if
(
user
.
deleted
)
return
<><
/>
;
return
(
<
Table
.
Row
key
=
{
user
.
id
}
>
<
Table
.
Cell
>
{
user
.
username
}
<
/Table.Cell
>
<
Table
.
Cell
>
{
user
.
display_name
}
<
/Table.Cell
>
<
Table
.
Cell
>
{
user
.
email
?
user
.
email
:
'无'
}
<
/Table.Cell
>
<
Table
.
Cell
>
{
user
.
id
}
<
/Table.Cell
>
<
Table
.
Cell
>
<
Popup
content
=
{
user
.
email
?
user
.
email
:
'未绑定邮箱地址'
}
key
=
{
user
.
display_name
}
header
=
{
user
.
display_name
?
user
.
display_name
:
user
.
username
}
trigger
=
{
<
span
>
{
renderText
(
user
.
username
,
10
)}
<
/span>
}
hoverable
/>
<
/Table.Cell
>
<
Table
.
Cell
>
{
user
.
email
?
renderText
(
user
.
email
,
30
)
:
'无'
}
<
/Table.Cell
>
<
Table
.
Cell
>
{
user
.
quota
}
<
/Table.Cell
>
<
Table
.
Cell
>
{
renderRole
(
user
.
role
)}
<
/Table.Cell
>
<
Table
.
Cell
>
{
renderStatus
(
user
.
status
)}
<
/Table.Cell
>
...
...
web/src/helpers/render.js
0 → 100644
View file @
e07eb017
export
function
renderText
(
text
,
limit
)
{
if
(
text
.
length
>
limit
)
{
return
text
.
slice
(
0
,
limit
-
3
)
+
'...'
;
}
return
text
;
}
\ No newline at end of file
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