diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js index 6a5bb67f..4952d429 100644 --- a/src/forge/Main/Index.js +++ b/src/forge/Main/Index.js @@ -277,7 +277,7 @@ class Index extends Component {
{item.visits} - 项目类型:{item.category && item.category.name} + {item.category && item.category.name}
) diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index 14744ae2..cb006f67 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -68,7 +68,7 @@ overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - text-align: center; + text-align: right; } } } \ No newline at end of file diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 698f0bed..87f336b1 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -53,16 +53,16 @@ class IndexItem extends Component { } - 赞 ({item.praises_count}) - fork ({item.forked_count}) + 赞 {item.praises_count} + fork {item.forked_count}

{item.description}

- {item.visits} - {item.category && item.category.id && {item.category.name}} + {/* {item.visits} */} + {/* {item.category && item.category.id && {item.category.name}} */} {item.last_update_time ? {item.time_ago} : ""} {item.language && item.language.id ? {item.language.name} : ""} diff --git a/src/forge/Settings/BranchRule.jsx b/src/forge/Settings/BranchRule.jsx index c6464a6a..9cdb951b 100644 --- a/src/forge/Settings/BranchRule.jsx +++ b/src/forge/Settings/BranchRule.jsx @@ -13,16 +13,14 @@ const Div = styled.div` `; export default Form.create()( forwardRef(({ form, match, history }) => { - const [ pullMember, setPullMember ] = useState(undefined); - const [ pushMember, setPushMember ] = useState(undefined); + const [ list, setList ] = useState(undefined); const { projectsId, owner } = match.params; const { getFieldDecorator, validateFields } = form; useEffect(() => { const url = `/${owner}/${projectsId}/collaborators.json`; axios.get(url).then((result) => { - setPullMember(result.data.members); - setPushMember(result.data.members); + setList(result.data.members); }) .catch((error) => {}); }, []); @@ -48,10 +46,6 @@ export default Form.create()( }); } - function changePull(e){ - console.log("dddd",e); - } - const helper = useCallback( (label, name, rules, widget, className, isRequired) => (
@@ -84,7 +78,7 @@ export default Form.create()( [{ required: true, message: "请选择可推送代码成员" }], , "setSelectWidth" )} @@ -92,9 +86,9 @@ export default Form.create()( "可合并Pull Request成员", "pullmember", [{ required: true, message: "请选择可合并Pull Request成员" }], - - {getMember(pullMember)} + {getMember(list)} , "setSelectWidth" )} diff --git a/src/forge/Settings/Index.js b/src/forge/Settings/Index.js index 31ecdefd..db80c8b3 100644 --- a/src/forge/Settings/Index.js +++ b/src/forge/Settings/Index.js @@ -128,7 +128,7 @@ class Index extends Component { ( - + )} >