- {item.name}
+ {item.name}
+
)
}
},
- {
- title: "创建时间",
- dataIndex: "time_ago",
- key: 2,
- ellipsis: true,
- render: (txt, item) => {
- return (
-
- {
- item.tagger &&
-
+ {
+ item.tagger &&
+
+ {
+ item.tagger.id ?
+
+ 
+
+ :
+
+
+
+ }
+
+ }
+ 最后一次提交于{item.time_ago}
+
+
)
}
},
@@ -116,24 +119,39 @@ function Tags(props) {
title: "下载",
dataIndex: "stage_type",
key: 5,
- ellipsis: true,
align: "center",
- width: "204px",
+ width: "460px",
render: (txt, item) => {
return (
+
+ 
+
+ {truncateCommitId(item.id)}
+
+
+
+
+
+
@@ -147,24 +165,54 @@ function Tags(props) {
className="tagTable"
dataSource={source} columns={columns} pagination={false}>
}
- {total > limit ? (
-
+
-
+ {total > limit && {setPage(e)}}
- >
+ showSizeChanger={true}
+ onShowSizeChange={(current, pageSize)=>{setPage(1);setLimit(pageSize);}}
+ showQuickJumper={true}
+ > }
+
+ {/* {total > limit ? (
+
+ {total > limit && {setPage(e)}}
+ showSizeChanger={true}
+ onShowSizeChange={(current, pageSize)=>{setPage(1);setLimit(pageSize);}}
+ showQuickJumper={true}
+ > }
) : (
""
- )}
+ )} */}
{
source && source.length === 0 &&
+
+
+
+ }
+ >
+
+
+
+ 确定删除{visible.name}标签?
+
+ {
+ txt && txt.committer && txt.committer.id?
+
+ 
+ {txt && txt.committer && txt.committer.name}
+
+ :
+
+
+ {txt && txt.committer && txt.committer.name}
+
+ }
+ 更新于{txt && txt.time_ago}
+
+ )
+ }
+ },
+ {
+ title: "commit信息",
+ dataIndex: "commit_id",
+ key: 4,
+ ellipsis: true,
+ width: "300px",
+ render: (txt, item) => {
+ return
+
+ }
+ },
+ {
+ title: "分支类型",
+ dataIndex: "default_branch",
+ key: 5,
+ render: (txt, item) => {
+ return isManager ? txt === item.name ? 默认分支 : : txt === item.name ? '默认分支' : '普通分支'
+ }
+ },
+ {
+ title: "操作",
+ dataIndex: "name",
+ key: 6,
+ align: "center",
+ width: "320px",
+ className: "branchActionColumn",
+ render: (txt, item) => {
+ return (
+
+
+
+ {truncateCommitId(txt)}
+
+
+
+
+
+ {
+ (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
+ + 合并请求
+ }
+
+ 下载
+
+ {txt === item.default_branch ?
+ )
+ }
+ }
+ ];
+
function getList() {
const url = `/${owner}/${projectsId}/branches_slice.json`;
Axios.get(url).then(result=>{
@@ -45,10 +175,109 @@ function Index(props) {
}).catch(error=>{setIsSpin(false);})
}
+ // 删除分支确认函数
+ function deleteLabel(){
+ Axios.delete(`/v1/${owner}/${projectsId}/branches/${visible.name}.json`).then(res=>{
+ if(res && res.data){
+ if(current>1 && (list && list.length===1)){
+ setCurrent(current-1);
+ }else{
+ setReload(Math.random());
+ }
+ setVisible(false);
+ !res.data.status && message.success('删除成功');
+ }
+ })
+ }
+
+ // 新建分支确认函数
+ function createBranch(){
+ setNewBranchError(undefined);
+ if(!newBranchName){
+ setNewBranchError("请输入新建分支名称");
+ }else{
+ Axios.post(`/v1/${owner}/${projectsId}/branches.json`, {
+ new_branch_name: newBranchName,
+ old_branch_name: newFormBranchName
+ }).then(res=>{
+ if(res && res.data){
+ // 重新请求仓库详情接口，更新分支总数信息
+ getDetail();
+ setReload(Math.random());
+ setAddBranch(false);
+ message.success('新建分支成功');
+ }
+ })
+ }
+ }
+
+ // 新建分支名检查格式
+ function checkNewBranchName(e) {
+ setNewBranchError(undefined);
+ const value = e.target.value;
+ if (value) {
+ const str = '^*/';
+ let reg = /\\/g;
+ if(reg.test(value)){
+ setNewBranchError('分支名不能包含下列任何字符：^ * \\ /');
+ }else{
+ for(var i=0;i
- {
+
+
+ {/* {
list && list.length>0 && list.map((item,key)=>{
return(
@@ -112,8 +341,47 @@ function Index(props) {
)
})
- }
+ } */}
+
+ {setName(value)}} allowClear/>
+
+
+ {isManager && 分支设置}
+
+
+
+
+
+
+ }
+ >
+
+
+
+ 确定删除{visible.name}分支?
+
+
+ 分支名称
+
+ {newBranchError}
+ 分支起点
+
+ {newBranchError}
分支起点
-