diff --git a/src/forge/Issues/Component/comments/list.jsx b/src/forge/Issues/Component/comments/list.jsx index 45fd42437..d78eb46d7 100644 --- a/src/forge/Issues/Component/comments/list.jsx +++ b/src/forge/Issues/Component/comments/list.jsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import { Button, Popconfirm, Radio, Input, message, Tooltip, Spin } from 'antd'; +import { Button, Popconfirm, Radio, Input, message, Tooltip, Spin, Pagination } from 'antd'; import axios from 'axios'; import { getImageUrl, timeAgo } from 'educoder'; import RenderHtml from '../../../../components/render-html'; @@ -27,6 +27,10 @@ function IssueCommentList(props){ const [spin, setSpin] = useState(false); // issue 评论总数 const [journalsCount, setJournalsCount] = useState(undefined); + // 分页 + const limit = 50; + const [page, setPage] = useState(1); + const [totalCount, setTotalCount] = useState(undefined); // 操作记录 icon const journalsIcon ={ 'issue': 'icon-chuangjianqianbao', @@ -46,10 +50,12 @@ function IssueCommentList(props){ useEffect(()=>{ setSpin(true); axios.get(`/v1/${owner}/${projectsId}/issues/${index}/journals`,{params:{ - category + category, + page, + limit }}).then(res=>{ if(res && res.data){ - const {journals, total_comment_journals_count} = res.data; + const {journals, total_comment_journals_count, total_count} = res.data; if(category === 'all'){ const array = []; let start = undefined; @@ -74,12 +80,13 @@ function IssueCommentList(props){ } }) } + setTotalCount(total_count); setJournalsCount(total_comment_journals_count); setJournals(journals); setSpin(false) } }) - }, [reload, category]) + }, [reload, category, page]) function commentCtx(v){ return ; @@ -104,7 +111,7 @@ function IssueCommentList(props){
{/* 全部 / 评论 / 操作日志 */}
- {setSpin(true);setCategory(e.target.value)}} value={category}> + {setSpin(true);setPage(1);setCategory(e.target.value)}} value={category}> 评论{journalsCount} 操作日志 全部 @@ -130,10 +137,10 @@ function IssueCommentList(props){ {journals && (journals.length > 0 && journals.map(item=>{return item.is_journal_detail ? (!item.closeAndSpan || item.id === item.start || open === item.start) ?
{/* 操作日志 */}
-
+
-
+
{item.user.name}  {(item.user.name.length + item.operate_content.length) > 62 ? {item.user.name}
}> : } @@ -222,6 +229,9 @@ function IssueCommentList(props){
}))}
+ {totalCount>limit &&
+ setPage(page)}/> +
} {/* 无数据 */} {journals && !journals.length && }
diff --git a/src/forge/Issues/Component/comments/list.scss b/src/forge/Issues/Component/comments/list.scss index 69fd1cbf9..d614d409c 100644 --- a/src/forge/Issues/Component/comments/list.scss +++ b/src/forge/Issues/Component/comments/list.scss @@ -189,4 +189,7 @@ width: 100%; height: 30px; border: none; +} +.paginationIssueComment{ + text-align: center; } \ No newline at end of file diff --git a/src/forge/users/contribution/index.jsx b/src/forge/users/contribution/index.jsx index 1e8cd22ee..0bafa2860 100644 --- a/src/forge/users/contribution/index.jsx +++ b/src/forge/users/contribution/index.jsx @@ -28,12 +28,12 @@ function Contribution(props){ const [error2, setError2] = useState(undefined); // 操作仓库id const [proId, setProId] = useState(undefined); - const {current_user:{user_id, login}, current_user} = props; + const {current_user:{user_id, login, open_blockchain}, current_user} = props; const {user} = props; const username = props.match.params.username; useEffect(()=>{ - if((username && current_user && (current_user.login !== username))){ + if((username && current_user && (current_user.login !== username)) || !open_blockchain){ props.history.push(`/${username}`); } },[current_user,username])