Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

detail+同步镜像type=2的才不需要合并请求

This commit is contained in:
caishi 2021-05-07 17:33:41 +08:00
parent a408d435f3
commit 037a79de67
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/About/Index.jsx
View File

@ -117,7 +117,7 @@ function Index(props){
{content ? {content ?
<RenderHtml className="break_word_comments imageLayerParent" value={content} url={props.history.location}/> <RenderHtml className="break_word_comments imageLayerParent" value={content} url={props.history.location}/>
: :
<div>暂无简介~</div> <div>暂无概览~</div>
} }
{attachments && attachments.length > 0 && {attachments && attachments.length > 0 &&
<Attachments <Attachments

2
src/forge/Main/Index.scss
View File

@ -227,7 +227,7 @@
margin-bottom: 0px!important; margin-bottom: 0px!important;
} }
} }
li{ & > li{
height: 42px; height: 42px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

9
src/forge/Main/IndexItem.js
View File

@ -1,6 +1,7 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Tooltip } from 'antd'; import { Tooltip } from 'antd';
import { getImageUrl } from 'educoder'; import { getImageUrl } from 'educoder';
import { AlignCenter } from '../Component/layout';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import '../css/index.scss'; import '../css/index.scss';
import Nodata from '../Nodata'; import Nodata from '../Nodata';
@ -33,8 +34,10 @@ class IndexItem extends Component {
} }
<div className="p-r-Infos"> <div className="p-r-Infos">
<div className="p-r-name"> <div className="p-r-name">
<Link to={`/projects/${item.author.login}/${item.identifier}`} className="hide-1 color-grey-3 font-18 task-hide " style={{ whiteSpace: "wrap", display: 'flex', width: 400 }}> <AlignCenter>
{item.author.name}/{item.name} <Link to={`/projects/${item.author.login}/${item.identifier}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 490 }}>
{item.author.name}/{item.name}
</Link>
{ {
item.forked_from_project_id ? item.forked_from_project_id ?
<span className="ml5"> <span className="ml5">
@ -52,7 +55,7 @@ class IndexItem extends Component {
<i className="iconfont icon-jingxiang font-18 color-green" /> <i className="iconfont icon-jingxiang font-18 color-green" />
</span>:"" </span>:""
} }
</Link> </AlignCenter>
<span className="p-r-tags"> <span className="p-r-tags">
<span className="pariseTag"><img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}</span> <span className="pariseTag"><img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}</span>
<span><i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}</span> <span><i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}</span>

2
src/forge/Main/sub/UpdateDescModal.jsx
View File

@ -39,7 +39,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
{getFieldDecorator("desc",{ {getFieldDecorator("desc",{
rules:[] rules:[]
})( })(
<TextArea placeholder="项目简介" rows={4} maxLength={200}/> <TextArea placeholder="请输入项目简介" rows={4} maxLength={200}/>
)} )}
</Form.Item> </Form.Item>
<Form.Item label="website"> <Form.Item label="website">

3
src/forge/Settings/Setting.js
View File

@ -232,6 +232,7 @@ class Setting extends Component {
const { CategoryList, LanguageList, private_check ,loading , divertVisible , is_transfering, transfer } = this.state; const { CategoryList, LanguageList, private_check ,loading , divertVisible , is_transfering, transfer } = this.state;
let mirror = projectDetail && projectDetail.mirror; let mirror = projectDetail && projectDetail.mirror;
let type = projectDetail && projectDetail.type;
return ( return (
<div> <div>
<DivertModal <DivertModal
@ -311,7 +312,7 @@ class Setting extends Component {
<Checkbox <Checkbox
key={key} key={key}
value={item.index} value={item.index}
disabled={item.index === "home" || item.index === "activity" || item.index === "code" || (mirror && item.index === "pulls")} disabled={item.index === "home" || item.index === "activity" || item.index === "code" || (mirror && (type && type===2) && item.index === "pulls")}
>{item.name}</Checkbox> >{item.name}</Checkbox>
) )
}) })