diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx index 17535e43b..67bb1cb1c 100644 --- a/src/forge/Main/Diff.jsx +++ b/src/forge/Main/Diff.jsx @@ -85,7 +85,7 @@ export default (props) => {
{commit && commit.message && -
{commit.message}
+
').replaceAll('\n\r','
').replaceAll('\n','
')}} className="task-hide">
} {data.branch}
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx index 88cca13b5..66e6f24cf 100644 --- a/src/forge/Main/tag/Index.jsx +++ b/src/forge/Main/tag/Index.jsx @@ -7,7 +7,7 @@ import { truncateCommitId } from '../../common/util'; import './Index.scss'; import Tree from '../img/tree.png' import moment from 'moment'; - +import Loading from '../../../Loading'; function Tags(props) { @@ -59,7 +59,7 @@ function Tags(props) { return ( 提交ID - {truncateCommitId(item.commit && item.commit.sha)} + {truncateCommitId(item.id)} ) } diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss index 3bd487db6..5ce43cf24 100644 --- a/src/forge/Main/tag/Index.scss +++ b/src/forge/Main/tag/Index.scss @@ -4,6 +4,7 @@ tr th{ background-color: #fff; padding:5px 0px; + width: 172px; .ant-table-column-title{ font-size: 16px; font-weight: 500; @@ -20,6 +21,9 @@ padding:0px; height: 69px; line-height: 69px; + div{ + padding-left: 69px; + } } &:last-child{ td{ diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js index 68cfd7746..2896899fc 100644 --- a/src/forge/Main/version/version.js +++ b/src/forge/Main/version/version.js @@ -15,10 +15,9 @@ function version(props) { const [ releases , setReleases ] = useState(undefined); const [ isSpin , setIsSpin ] = useState(true); const { projectsId ,owner } = props.match.params; - const { isManager, isDeveloper, location , user } = props; + const { location } = props; const type = props.projectDetail && props.projectDetail.type; const turnFromNew = location && location.query && location.query.turnFromNew; - const current_user_login = user && user.login; useEffect(()=>{ getIssueList(); },[]) @@ -34,7 +33,6 @@ function version(props) { setReleases(result.data.releases); setIsSpin(false); } - }).catch((error) => { console.log(error); }) @@ -130,6 +128,8 @@ function version(props) { addFunc={addFunc} /> ) + } else{ + return (
) } } diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx index 172038b21..87260cdd8 100644 --- a/src/forge/Merge/Files.jsx +++ b/src/forge/Merge/Files.jsx @@ -1,7 +1,7 @@ -import React ,{useEffect,useRef,useState } from 'react'; +import React ,{useEffect,useState } from 'react'; import { truncateCommitId } from '../common/util'; import { AlignCenter , FlexAJ } from '../Component/layout'; -import { Button, Tooltip,Progress, Popover, Anchor } from 'antd'; +import { Tooltip,Progress } from 'antd'; import './merge.css'; import './Index.scss'; @@ -16,6 +16,10 @@ function Files({ data,history,owner,projectsId , parentsSha }){ } },[data]); + useEffect(()=>{ + document.addEventListener('click',()=>{setIsOpen(false)}) + }) + function showDown(flag,index,isBin){ if(!isBin){ var lists = files.concat(); @@ -63,7 +67,7 @@ function Files({ data,history,owner,projectsId , parentsSha }){ ) return( -
+
{e.nativeEvent.stopImmediatePropagation()}}>
{setIsOpen(!isOpen)}}> diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx index ea23ab079..48a19c227 100644 --- a/src/forge/Team/List.jsx +++ b/src/forge/Team/List.jsx @@ -19,7 +19,6 @@ function List(props){ const [ search , setSearch ] = useState(undefined); const [ page , setPage ] = useState(1); const [ sortBy , setSortBy ] = useState("updated_on"); - const [ sortDirection , setSortDirection ] = useState("asc"); const OIdentifier = props.match.params.OIdentifier; const organizeDetail = props.organizeDetail; @@ -37,7 +36,7 @@ function List(props){ params:{ search,page,limit, sort_by:sortBy, - sort_direction:sortDirection + sort_direction:"desc" } }).then(result=>{ if(result && result.data){