Gitlink
/
forgeplus-react
39
0
Fork 30
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request '解决tag加载的问题' (#464) from tongChong/forgeplus-react:hotfix into gitlink_server

This commit is contained in:
tongChong 2022-10-25 17:33:58 +08:00
parent 8004d78033 a73ea7338a
commit 5025182aac
9 changed files with 2671 additions and 3674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6156
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
src/forge/GetData/getData.jsx
View File

@ -6,7 +6,7 @@ export const getBranch = async (id,owner)=>{
} }
// 获取标签列表 // 获取标签列表
export const getTag = async (id,owner)=>{ export const getTag = async (id,owner)=>{
return (await axios.get(`/${owner}/${id}/tags.json`)).data; return (await axios.get(`/${owner}/${id}/tags.json`,{params:{only_name:true}})).data.tags;
} }
// 获取hooks（仓库设置-管理web钩子）列表 // 获取hooks（仓库设置-管理web钩子）列表
export const getHooks = async (id,params)=>{ export const getHooks = async (id,params)=>{

6
src/forge/Main/CoderRootTag.js
View File

@ -14,10 +14,10 @@ export default (( props, { projectDetail }) => {
useEffect(() => { useEffect(() => {
if (projectsId) { if (projectsId) {
const url = `/${owner}/${projectsId}/tags.json`; const url = `/${owner}/${projectsId}/tags.json`;
axios.get(url).then((result) => { axios.get(url,{params:{page:1,limit:1000}}).then((result) => {
if (result) { if (result.data) {
setSpin(false); setSpin(false);
setData(result.data); setData(result.data.tags);
} }
}).catch(error => { }).catch(error => {
console.log(error); console.log(error);

8
src/forge/Main/Index.js
View File

@ -253,11 +253,11 @@ class Index extends Component {
newItem = ()=>{ newItem = ()=>{
return( return(
<ul> <ul>
<li> <li onClick={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目
<CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目</CheckProfile> {/* <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目</CheckProfile> */}
</li> </li>
<li> <li onClick={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目
<CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目</CheckProfile> {/* <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目</CheckProfile> */}
</li> </li>
</ul> </ul>
) )

145
src/forge/Main/tag/Index.jsx
View File

@ -1,6 +1,6 @@
import React,{ useEffect , useState } from 'react'; import React, { useEffect, useState } from 'react';
import SubMenu from '../sub/SubMenu'; import SubMenu from '../sub/SubMenu';
import { Table , Tooltip , Spin } from 'antd'; import { Table, Tooltip, Spin,Pagination } from 'antd';
import axios from 'axios'; import axios from 'axios';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { truncateCommitId } from '../../common/util'; import { truncateCommitId } from '../../common/util';
@ -12,32 +12,41 @@ import moment from 'moment';
function Tags(props) { function Tags(props) {
const [ source , setSource ] = useState(undefined); const [source, setSource] = useState(undefined);
const [ isSpin , setIsSpin ] = useState(true); const [isSpin, setIsSpin] = useState(true);
const [page, setPage] = useState(1);
const { projectsId , owner } = props.match.params; const [total,setTotal] =useState(0);
const [limit,setLimit] =useState(10);
const { projectsId, owner } = props.match.params;
useEffect(() => { useEffect(() => {
if (projectsId) { if (projectsId) {
setIsSpin(true);
const url = `/${owner}/${projectsId}/tags.json`; const url = `/${owner}/${projectsId}/tags.json`;
axios.get(url).then((result) => { axios.get(url, {
params: {
limit,
page: page
}
}).then((result) => {
if (result) { if (result) {
setSource(result.data); setSource(result.data.tags);
setTotal(result.data.total_count);
setIsSpin(false); setIsSpin(false);
} }
}).catch(error => {}) }).catch(error => { })
} }
}, [owner, projectsId]); }, [owner, projectsId,page]);
const columns=[ const columns = [
{ {
title:"标签名", title: "标签名",
dataIndex:"name", dataIndex: "name",
key:1, key: 1,
ellipsis:true, ellipsis: true,
width:"200px", width: "200px",
render:(txt,item)=>{ render: (txt, item) => {
return( return (
<div className="tagBranch"> <div className="tagBranch">
<Link className="hover tagClass" to={`/${owner}/${projectsId}/tree/${item.name}`}>{item.name}</Link> <Link className="hover tagClass" to={`/${owner}/${projectsId}/tree/${item.name}`}>{item.name}</Link>
</div> </div>
@ -45,11 +54,11 @@ function Tags(props) {
} }
}, },
{ {
title:"创建时间", title: "创建时间",
dataIndex:"time_ago", dataIndex: "time_ago",
key:2, key: 2,
ellipsis:true, ellipsis: true,
render:(txt,item)=>{ render: (txt, item) => {
return ( return (
<span className="color-grey-3 tagModel"> <span className="color-grey-3 tagModel">
{ {
@ -57,13 +66,13 @@ function Tags(props) {
<Tooltip placement="top" title={item.tagger.name}> <Tooltip placement="top" title={item.tagger.name}>
{ {
item.tagger.id ? item.tagger.id ?
<Link className="mr3 tagModelImg" to={`/${item.tagger.login}`} > <Link className="mr3 tagModelImg" to={`/${item.tagger.login}`} >
<img src={getImageUrl(`/${item.tagger && item.tagger.image_url}`)} alt=""/> <img src={getImageUrl(`/${item.tagger && item.tagger.image_url}`)} alt="" />
</Link> </Link>
: :
<span className="mr3 tagModelImg" style={{cursor:"default"}}> <span className="mr3 tagModelImg" style={{ cursor: "default" }}>
<img src={getImageUrl(`/${item.tagger && item.tagger.image_url}`)} alt=""/> <img src={getImageUrl(`/${item.tagger && item.tagger.image_url}`)} alt="" />
</span> </span>
} }
</Tooltip> </Tooltip>
} }
@ -73,36 +82,36 @@ function Tags(props) {
} }
}, },
{ {
title:"提交ID", title: "提交ID",
dataIndex:"id", dataIndex: "id",
key:3, key: 3,
ellipsis:true, ellipsis: true,
render:(txt,item)=>{ render: (txt, item) => {
return ( return (
<Tooltip placement="top" title={`最后提交日期:${item.created_at_unix ? moment(item.created_at_unix*1000).format('YYYY-MM-DD'):''}`}> <Tooltip placement="top" title={`最后提交日期:${item.created_at_unix ? moment(item.created_at_unix * 1000).format('YYYY-MM-DD') : ''}`}>
<img src={Tree} alt="提交ID" width="22px" className="mr4"/> <img src={Tree} alt="提交ID" width="22px" className="mr4" />
<Link className="hover color-blue" to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`}>{truncateCommitId(item.id)}</Link> <Link className="hover color-blue" to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`}>{truncateCommitId(item.id)}</Link>
</Tooltip> </Tooltip>
) )
} }
}, },
{ {
title:"描述信息", title: "描述信息",
dataIndex:"message", dataIndex: "message",
key:4, key: 4,
ellipsis:true, ellipsis: true,
render:(txt,item)=>{ render: (txt, item) => {
return item.message || "--" return item.message || "--"
} }
}, },
{ {
title:"下载", title: "下载",
dataIndex:"stage_type", dataIndex: "stage_type",
key:5, key: 5,
ellipsis:true, ellipsis: true,
align:"center", align: "center",
width:"204px", width: "204px",
render:(txt,item)=>{ render: (txt, item) => {
return ( return (
<React.Fragment> <React.Fragment>
<a href={`${item.tarball_url}`} download className="btn-83"> <a href={`${item.tarball_url}`} download className="btn-83">
@ -116,20 +125,36 @@ function Tags(props) {
} }
} }
] ]
return(
return (
<div> <div>
<SubMenu tab={"tags"} projectsId={projectsId} owner={owner}/> <SubMenu tab={"tags"} projectsId={projectsId} owner={owner} />
<Spin spinning={isSpin}> <Spin spinning={isSpin}>
<div className="tagSpin"> <div className="tagSpin">
{ {
source && source.length > 0 && source && source.length > 0 &&
<Table <Table
className="tagTable" rowKey={(record) => record.id}
dataSource={source} columns={columns} pagination={false}></Table> className="tagTable"
} dataSource={source} columns={columns} pagination={false}></Table>
{ }
source && source.length === 0 && <Nonedata _html={'暂无数据~'}/> {total > limit ? (
} <div className="mt30 mb50 edu-txt-center">
<Pagination
simple
current={page}
total={total}
pageSize={limit}
onChange={(e)=>{setPage(e)}}
></Pagination>
</div>
) : (
""
)}
{
source && source.length === 0 && <Nonedata _html={'暂无数据~'} />
}
</div> </div>
</Spin> </Spin>
</div> </div>

8
src/forge/Main/version/New.jsx
View File

@ -61,12 +61,12 @@ export default Form.create()(
const url = `/${owner}/${projectsId}/tags.json`; const url = `/${owner}/${projectsId}/tags.json`;
axios axios
.get(url,{params:{ .get(url,{params:{
limit:1000 page:1,limit:1000
}}) }})
.then(result => { .then(result => {
if (result) { if (result.data) {
setTagList(result.data); setTagList(result.data.tags);
setOptions(renderTagList(result.data)); setOptions(renderTagList(result.data.tags));
} }
}) })
.catch(error => { .catch(error => {

8
src/forge/Team/List.jsx
View File

@ -61,11 +61,11 @@ function List(props){
) )
const menu_new=( const menu_new=(
<ul> <ul>
<li> <li onClick={()=>{this.props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目
<CheckProfile {...props} sureFunc={()=>{props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目</CheckProfile> {/* <CheckProfile {...props} sureFunc={()=>{props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目</CheckProfile> */}
</li> </li>
<li> <li onClick={()=>{this.props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目
<CheckProfile {...props} sureFunc={()=>{props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目</CheckProfile> {/* <CheckProfile {...props} sureFunc={()=>{props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目</CheckProfile> */}
</li> </li>
</ul> </ul>
) )

2
src/forge/users/GeneralView/ConcentrateBox.jsx
View File

@ -170,7 +170,7 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed , his
{ {
(list && list.length === 0) && (copyList && copyList.length === 0) && (list && list.length === 0) && (copyList && copyList.length === 0) &&
<div style={{textAlign:"center"}}>您还没有公开的{search && `“${search}”`}项目，先去 <div style={{textAlign:"center"}}>您还没有公开的{search && `“${search}”`}项目，先去
<CheckProfile <CheckProfile
showCompeleteDialog={showCompeleteDialog} showCompeleteDialog={showCompeleteDialog}
completeProfile={completeProfile} completeProfile={completeProfile}
sureFunc={()=>{history.push(`/projects/deposit/new`)}} sureFunc={()=>{history.push(`/projects/deposit/new`)}}

10
src/forge/users/InfosUser.js
View File

@ -115,12 +115,18 @@ class InfosUser extends Component {
newItem =()=> ( newItem =()=> (
<ul> <ul>
<li> <li onClick={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目
{/* <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目</CheckProfile> */}
</li>
<li onClick={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目
{/* <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目</CheckProfile> */}
</li>
{/* <li>
<CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}} >新建项目</CheckProfile> <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}} >新建项目</CheckProfile>
</li> </li>
<li> <li>
<CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目</CheckProfile> <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目</CheckProfile>
</li> </li> */}
</ul> </ul>
); );