Gitlink
/
forgeplus-react
32
0
Fork 29
Code Issues Pull Requests 1 Releases 1 Wiki Activity

merging

This commit is contained in:
caishi 2024-11-07 09:29:29 +08:00
parent 95b8f92cb2 0f25ae8c12
commit 9e1ee4c062
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/forge/Information/Pages/homepage/component/specialProjects.jsx
View File

@ -64,25 +64,27 @@ function SpecialProjects({data, subTitle}) {
setSelectedItem(selectedItem === id ? null : id);
};
const list = (title, table1, table2, list)=>{
const list = (title, table1, table2,table3, list)=>{
return !!list.length && <React.Fragment>
<p className='leftBox font-16 font-bd'>{title}</p>
<Divider dashed className="margin0-20"/>
<Row className='s_p_rowList mb30 font-15'>
<Col span={14} className='s_p_rowList_t font-bd'>{table1}</Col>
<Col span={10} className='s_p_rowList_t font-bd'>{table2}</Col>
<Col span={12} className='s_p_rowList_t font-bd'>{table1}</Col>
<Col span={6} className='s_p_rowList_t font-bd'>{table2}</Col>
<Col span={6} className='s_p_rowList_t font-bd'>{table3}</Col>
{list.map(item=>{
const {author} = item;
const {author, company} = item;
const detail = item.relevancyObject;
const {name, createUser, id} = detail
return <React.Fragment>
<Col span={14} className='task-hide'>
<Col span={12} className='task-hide'>
<a href={`/zone/${key}/source/${id}`}>
{title === "论文" ? <img src={require('../image/s_project1.png')} width={24} className='mr10'/> : title === "专利" ? <img src={require('../image/s_project2.png')} width={24} className='mr10'/> : <img src={createUser.avatar}/>}
{name}
</a>
</Col>
<Col span={10} className='task-hide'>{author}</Col>
<Col span={6} className='task-hide'>{author}</Col>
<Col span={6} className='task-hide'>{company}</Col>
</React.Fragment>
})}
</Row>
@ -151,8 +153,8 @@ function SpecialProjects({data, subTitle}) {
<p className='font-15 pb5'>摘要：<span className='color212'>{description}</span></p>
</div>
<div style={{padding: '22px 33px'}}>
{list("论文", "论文标题", "作者", PAPER)}
{list("专利", "专利标题", "作者", PATENT)}
{list("论文", "论文标题", "作者", "单位", PAPER)}
{list("专利", "专利标题", "作者", "单位", PATENT)}
{list2("开源项目", "项目名称", "参与者", PROJECT)}
{!PAPER.length && !PATENT.length && !PROJECT.length && <Nodata _html="暂无数据" small/>}
</div>

8
src/forge/Main/CoderDepot.jsx
View File

@ -26,10 +26,14 @@ import RenderHtml from '../../components/render-html';
import Loadable from 'react-loadable';
import Loading from '../../Loading';
import ProjectPortrait from '../Component/projectPortrait';
// import ProjectCompass from '../Component/projectCompass';
import imNoneImg from './img/importNone.png';
import moment from 'moment';
const ProjectCompass = Loadable({
loader: () => import('../Component/projectCompass'),
loading: Loading,
})
const format = "YYYY-MM-DD HH:mm"
const CoderRootFileDetail = Loadable({
loader: () => import("./CoderRootFileDetail"),
@ -695,7 +699,7 @@ function CoderDepot(props){
/>
</React.Fragment>
}
{/* {__CLIENT__ && <ProjectCompass owner={owner} projectsId={projectsId} />} */}
{__CLIENT__ && <ProjectCompass owner={owner} projectsId={projectsId} />}
{/* 贡献者 */}
{mirror_status ===0 && <Contributors owner={owner} projectsId={projectsId} /> }
{/* 项目画像: 导入/fork项目不展示, open_portrait后台配置是否开启仓库 */}