diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx index 6d4d0acf..2e4e22b0 100644 --- a/src/forge/Component/Releases.jsx +++ b/src/forge/Component/Releases.jsx @@ -17,7 +17,8 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType} key === 0 &&

- {item.name} + {/* 如果是点击最新则发行版列表页只展示最新的一个 */} + {item.name} 最新

{item.created_at}

diff --git a/src/forge/Main/version/New.jsx b/src/forge/Main/version/New.jsx index b8b179b8..d9028b84 100644 --- a/src/forge/Main/version/New.jsx +++ b/src/forge/Main/version/New.jsx @@ -215,7 +215,7 @@ export default Form.create()( {versionId ? "保存" : "创建"}发行版

@@ -223,7 +223,7 @@ export default Form.create()(

标签命名建议

-

+

通常的做法是在版本名称前加上字母 v 前缀, v1.0 或者 v2.3.4。

diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js index 9feec889..7b5aaf29 100644 --- a/src/forge/Main/version/version.js +++ b/src/forge/Main/version/version.js @@ -2,19 +2,25 @@ import React, { useEffect , useState } from "react"; import { Link } from 'react-router-dom'; import { Spin , Button } from 'antd'; import { getImageUrl } from 'educoder'; +import {truncateCommitId} from '../../common/util'; import Empty from './Empty'; import './version.scss'; import axios from 'axios'; +import Tree from '../img/tree.png'; import RenderHtml from '../../../components/render-html'; +import { result } from "lodash"; function version(props) { + console.log(props); const [ data , setData ] = useState(undefined); const [ releases , setReleases ] = useState(undefined); const [ isSpin , setIsSpin ] = useState(true); const { projectsId ,owner } = props.match.params; - const { isManager , isDeveloper } = props; + const { isManager, isDeveloper, location , user } = props; const type = props.projectDetail && props.projectDetail.type; - + const turnFromNew = location && location.query && location.query.turnFromNew; + const current_user_login = user && user.login; + owner && console.log(owner); useEffect(()=>{ getIssueList(); },[]) @@ -24,6 +30,9 @@ function version(props) { axios.get(url).then((result) => { if (result) { setData(result.data); + const { releases = [] } = result.data; + //默认第一个展开(body参数) + releases.length && (releases[0].bodyshow = true); setReleases(result.data.releases); setIsSpin(false); } @@ -31,7 +40,6 @@ function version(props) { console.log(error); }) } - // 显示版本描述 function showBody(key,flag){ var lists = releases.concat(); @@ -39,7 +47,67 @@ function version(props) { lists.splice(); setReleases(lists); } - + //删除 + function deleteRelease(releaseId) { + console.log(releaseId); + if(releaseId){ + axios.delete(`/${owner}/${projectsId}/releases/${releaseId}.json`).then((result)=>{ + if(result){ + getIssueList(); + } + }) + } + } + function release(item,key){ + return ( +

+ + {item.draft} + + + {item.tag_name}{item.draft === "预发行" ?"(standalone)":""} + + + + {truncateCommitId(item.sha)} + + +
+
+ 发布{item.name}{item.draft === "预发行" ?"(standalone)版本":""} + + { + (isManager || isDeveloper) && type !==2 && + + } + {current_user_login == owner && {deleteRelease(item.version_id)}}>} + +
+ + showBody(key,item.bodyshow)}> + + {item.user_name} + 发布于{item.created_at} + + { + item.bodyshow && +
+ +
+ } + +

+ {item.tag_name}.TAR.gz + {item.tag_name}.ZIP +

+ {/* 发行版附件下载 */} + {item.attachments && item.attachments.map((item)=>{ + return({item.title}) + })} +
+
+ ) + } function renderList(releases){ if (releases && releases.length > 0) { return ( @@ -51,47 +119,7 @@ function version(props) {
}
- { - releases.map((item, key) => { - return ( -
- - {item.draft} - - - {item.tag_name}{item.draft === "预发行" ?"(standalone)":""} - - -
-
- 发布{item.name}{item.draft === "预发行" ?"(standalone)版本":""} - { - (isManager || isDeveloper) && type !==2 && - - } -
- - showBody(key,item.bodyshow)}> - - {item.user_name} - 发布于{item.created_at} - - { - item.bodyshow && -
- -
- } - -

- {item.tag_name}.TAR.gz - {item.tag_name}.ZIP -

-
-
- ) - }) - } + {!turnFromNew ? releases.map((item, key) => release(item,key)) : release(releases[0],0)}
) diff --git a/src/forge/Main/version/version.scss b/src/forge/Main/version/version.scss index aee6c1f8..7985f374 100644 --- a/src/forge/Main/version/version.scss +++ b/src/forge/Main/version/version.scss @@ -51,6 +51,9 @@ border-radius: 50%; margin-right: 5px; } + .body-show{ + padding: 5px 10px 10px 10px; + } } .versionTag{ display: inline; diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx index 19d0502c..c5bd1768 100644 --- a/src/forge/Merge/Files.jsx +++ b/src/forge/Merge/Files.jsx @@ -88,7 +88,7 @@ function Files({data,history,owner,projectsId}){ - {!item.isBin ? showDown(item.flag,key,item.isBin)}>:""} + {!item.isBin ? showDown(item.flag,key,item.isBin)}>:""} showDown(item.flag,key,item.isBin)}>{item.name}