+
:
diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js
index 0fb30c4e1..b5d241968 100644
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@@ -1,9 +1,10 @@
import React , { Component } from 'react';
import { Route , Switch } from 'react-router-dom';
-import Top from './DetailTop';
+// import Top from './DetailTop';
import Loadable from 'react-loadable';
import Loading from '../../Loading';
import axios from 'axios';
+import './Index.scss';
const FileNew = Loadable({
loader: () => import('../Newfile/Index'),
@@ -18,25 +19,25 @@ const CoderRootCommit = Loadable({
loading: Loading,
})
const CoderRootBranch = Loadable({
- loader: () => import('./CoderRootBranch'),
+ loader: () => import('./tree/Index'),
loading: Loading,
})
const CoderRootTag = Loadable({
- loader: () => import('./CoderRootTag'),
+ loader: () => import('./tag/Index'),
loading: Loading,
})
const CoderRootVersion = Loadable({
- loader: () => import('../Version/version'),
- loading: Loading,
-})
-const CoderRootVersionNew = Loadable({
- loader: () => import('../Version/New'),
- loading: Loading,
-})
-const CoderRootVersionUpdate = Loadable({
- loader: () => import('../Version/New'),
+ loader: () => import('./version/Index'),
loading: Loading,
})
+// const CoderRootVersionNew = Loadable({
+// loader: () => import('./version/New'),
+// loading: Loading,
+// })
+// const CoderRootVersionUpdate = Loadable({
+// loader: () => import('./version/New'),
+// loading: Loading,
+// })
const Diff = Loadable({
loader: () => import('./Diff'),
loading: Loading,
@@ -83,8 +84,8 @@ class CoderRootIndex extends Component{
}
render(){
return(
-
-
+
+ {/*
*/}
{/* 新建文件 */}
()
}
>
- ()
}
@@ -126,7 +127,7 @@ class CoderRootIndex extends Component{
render={
() => ()
}
- >
+ > */}
()
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index 0daa63193..86cf9384c 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -1,35 +1,55 @@
import React, { useEffect, useState } from "react";
import styled from "styled-components";
import { Button ,Spin } from "antd";
-import { truncateCommitId } from '../common/util';
+import { timeFormat, truncateCommitId } from '../common/util';
import { getImageUrl } from 'educoder';
import Files from '../Merge/Files';
-
+import Tree from "./img/tree.png";
import User from "../Component/User";
-import Keys from "../Component/Keys";
-
import axios from "axios";
+import { Link } from "react-router-dom";
const Infos = styled.div`
- border: 1px solid #dddddd;
+ border: 1px solid #FAFCFF;
margin-bottom:15px;
& .commitinfos {
background-color: #f1f8ff;
- border-bottom: 1px solid #ddd;
- padding: 20px;
+ border: 1px solid rgba(42, 97, 255, 0.23);
+ border-radius: 3px 3px 0px 0px;
+ padding: 10px 20px 10px 16px;
+ & .f-wrap-between{
+ align-items: center;
+ }
+ & .task-hide{
+ width: 65rem;
+ overflow:hidden;
+ white-space:normal;
+ word-break:break-all;
+ font-weight: bold;
+ color: #333333;
+ font-size: 16px;
+ }
}
& > .f-wrap-between {
- padding: 10px 20px;
+ padding: 14px 20px 14px 16px;
+ border-radius: 3px 3px 0px 0px;
+ border: 1px solid #D0D0D0;
+ .df{
+ align-items: center;
+ & .underline:hover{
+ text-decoration: underline;
+ }
+ }
}
`;
-
-export default ({ match , history }) => {
+//提交详情页
+export default (props) => {
+ const {match , history } = props;
const [data, setData] = useState({undefined});
const [commit, setCommit] = useState(undefined);
const [parents, setParents] = useState(undefined);
const [committer, setCommitter] = useState(undefined);
const [isSpin, setIsSpin] = useState(true);
-
const { sha , projectsId, owner } = match.params;
useEffect(() => {
if (projectsId && owner && sha) {
@@ -43,6 +63,7 @@ export default ({ match , history }) => {
setParents(result.data.parents);
setCommitter(result.data.committer || (result.data.commit && result.data.commit.committer));
setIsSpin(false);
+
}
})
.catch(error => {
@@ -56,29 +77,42 @@ export default ({ match , history }) => {
- {commit && commit.message &&
-
{commit.message}
- }
-
+
+ {commit && commit.message &&
+
{commit.message}
+ }
+
{data.branch}
+
+
- {committer && committer.time_from_now && - {committer.time_from_now}
}
+ {commit && commit.timestamp && - 提交于{timeFormat(commit.timestamp)}
}
{
parents && parents.length > 0 && parents.map((item,key)=>{
return(
-
+
+
+
+
{truncateCommitId(item.sha)}
+
+
+
+
{truncateCommitId(sha)}
+
@@ -87,6 +121,7 @@ export default ({ match , history }) => {
data={data}
owner={owner}
projectsId={projectsId}
+ parentsSha={parents && parents.length > 0 && parents[0].sha}
/>
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 1158c38e6..a19bd80da 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -189,13 +189,13 @@
flex-wrap: wrap;
padding-bottom: 2px;
a{
- margin: 0px 17px 0px 0px;
+ margin: 0px 17px 10px 0px;
img{
border-radius: 50%;
width: 40px;
height: 40px;
}
- &:nth-child(6){
+ &:nth-child(5){
margin-right: 0px;
}
}
@@ -253,7 +253,7 @@
background-color: #FAFCFF;
.ellipsistxt{
margin-top: 6px;
- cursor: pointer;
+ // cursor: pointer;
#ptxt{
margin-bottom: 0px;
word-break: break-all;
@@ -402,6 +402,16 @@
cursor: pointer;
background: #FAFBFC;
border-radius: 4px;
+ .ant-dropdown-menu-item{
+ border-radius: 8px;
+ text-align: left!important;
+ a{
+ width: 350px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
border: 1px solid #D0D0D0;
font-size: 15px;
font-weight: normal;
@@ -447,4 +457,28 @@
.ant-anchor-ink::before{
background-color: #fff;
}
+}
+.coderSubPage{
+ width: 1200px;
+ margin:0px auto;
+}
+.griditemAnchor{
+ margin-left: 0px;
+ padding: 0px;
+ border-bottom: 1px solid #ddd;
+ .ant-anchor{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 10px 20px;
+ }
+ .griditemCate{
+ color: #333;
+ font-size: 16px;
+ display: flex;
+ align-items: center;
+ .catelogue{
+ margin-left: 0px;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/forge/Main/img/tree-black.png b/src/forge/Main/img/tree-black.png
new file mode 100644
index 000000000..02aa71c3a
Binary files /dev/null and b/src/forge/Main/img/tree-black.png differ
diff --git a/src/forge/Main/img/tree.png b/src/forge/Main/img/tree.png
new file mode 100644
index 000000000..56247256c
Binary files /dev/null and b/src/forge/Main/img/tree.png differ
diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss
index 017a151c4..73b534de9 100644
--- a/src/forge/Main/list.scss
+++ b/src/forge/Main/list.scss
@@ -575,6 +575,9 @@
border:1px solid #ddd;
margin-top: 18px;
border-radius: 4px;
+ .ant-anchor-wrapper{
+ overflow: unset!important;
+ }
}
.commonBox .commonBox-title{
padding:0px 20px;
@@ -719,12 +722,76 @@ a.color-grey-ccc:hover{
padding:0px 30px;
min-height: 400px;
}
-.commitList > div{
- border-bottom: 1px solid #EEEEEE;
- padding:16px 0px;
-}
-.commitList > div:last-child{
- border-bottom: none;
+
+.main{
+ margin: 30px auto;
+ .ant-timeline{
+ margin-top: 28px;
+ .commitList-item{
+ position: relative;
+ padding: 20px 20px;
+ background: #FAFCFF;
+ border: 1px solid rgba(42, 97, 255, 0.23);
+ border-radius: 4px;
+ margin-left: 16px;
+ align-items: center;
+ &:after,&:before{
+ content: "";
+ position: absolute;
+ left: -10px;
+ top: 10px;
+ border-top: 6px solid transparent;
+ border-bottom: 6px solid transparent;
+ border-right: 10px solid rgba(42, 97, 255, 0.23);
+ }
+ &:after{
+ left: -8px;
+ border-right: 10px solid #FAFCFF;
+ &:hover{
+ border-right: 10px solid #EEF6FF;
+ }
+ }
+ &:hover{
+ background: #EEF6FF;
+ border: 1px solid rgba(42, 97, 255, 0.58);
+ &:after{
+ border-right: 10px solid #EEF6FF;
+ }
+ &:before{
+ border-right: 10px solid rgba(42, 97, 255, 0.58);
+ }
+ }
+ .treecopy-cont{
+ padding: 4px 15px;
+ }
+ .btn-83{
+ margin-left: 20px;
+ }
+ }
+ .ant-timeline-item{
+ padding: 8px 0 20px;
+ }
+ .ant-timeline-item-tail{
+ height: calc(100% - 20px);
+ border-left: 2px solid #EEEEEE;
+ top: 12px;
+ &:after{
+ content: ' ';
+ height: 0;
+ position: absolute;
+ width: 0;
+ border: 7px solid transparent;
+ border-top-color: #EEEEEE;
+ top: 100%;
+ left: 50%;
+ margin-left: -8px;
+ }
+ }
+ .ant-timeline-item-head-custom{
+ top:20px;
+ padding: 0 1px;
+ }
+ }
}
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index 83268b9e9..5e3ab9440 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -86,7 +86,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
:""
}
- {
+ {/* {
item.menu_name === "resources" &&
@@ -95,7 +95,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
{projectDetail && projectDetail.source_count ? {projectDetail.source_count} :""}
- }
+ } */}
{
item.menu_name === "versions" &&
diff --git a/src/forge/Main/sub/ReadmeCatelogue.jsx b/src/forge/Main/sub/ReadmeCatelogue.jsx
index d1e018bb6..6dab7d792 100644
--- a/src/forge/Main/sub/ReadmeCatelogue.jsx
+++ b/src/forge/Main/sub/ReadmeCatelogue.jsx
@@ -1,7 +1,7 @@
-import React , { useState , useEffect } from 'react';
+import React , { useState } from 'react';
import { Anchor , Input } from 'antd';
import './sub.scss';
-import { Base64 } from 'js-base64';
+import { useEffect } from 'react';
const { Link } = Anchor;
@@ -18,7 +18,7 @@ function ReadmeCatelogue({ menuList , hash }) {
function changeValue(e) {
setValue(e.target.value);
if(e.target.value){
- let m = menuList.filter(i=>i.text.indexOf(e.target.value)>-1);
+ let m = menuList.filter(i=>i.text.toLowerCase().indexOf(e.target.value.toLowerCase())>-1);
setMenu(m);
}else{
setMenu(menuList);
diff --git a/src/forge/Main/sub/SubMenu.jsx b/src/forge/Main/sub/SubMenu.jsx
new file mode 100644
index 000000000..78f37b4de
--- /dev/null
+++ b/src/forge/Main/sub/SubMenu.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import'./sub.scss'
+
+function SubMenu({tab,owner,projectsId}) {
+ return(
+
+ )
+}
+export default SubMenu;
\ No newline at end of file
diff --git a/src/forge/Main/sub/sub.scss b/src/forge/Main/sub/sub.scss
index 4e6a3d8ac..7716f0c50 100644
--- a/src/forge/Main/sub/sub.scss
+++ b/src/forge/Main/sub/sub.scss
@@ -64,4 +64,28 @@
background-color: #fff;
}
}
+}
+.subMenu{
+ display: flex;
+ padding-top: 30px;
+ a{
+ width: 83px;
+ font-weight: 500;
+ line-height: 30px;
+ height: 32px;
+ color: #333333!important;
+ text-align: center;
+ border: 1px solid #D0D0D0;
+ border-radius: 0px 4px 4px 0px;
+ background: rgba(250, 251, 252, 0);
+ &:first-child{
+ border-right: none;
+ border-radius: 4px 0px 0px 4px;
+ }
+ &.active{
+ background-color: #466AFF;
+ color: #fff!important;
+ border-color: #466AFF;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
new file mode 100644
index 000000000..5e296e131
--- /dev/null
+++ b/src/forge/Main/tag/Index.jsx
@@ -0,0 +1,105 @@
+import React,{ useEffect , useState } from 'react';
+import SubMenu from '../sub/SubMenu';
+import { Table , Tooltip } from 'antd';
+import axios from 'axios';
+import { Link } from 'react-router-dom';
+import { truncateCommitId } from '../../common/util';
+import './Index.scss';
+import Tree from '../img/tree.png'
+import moment from 'moment';
+
+
+function Tags(props) {
+
+ const [ source , setSource ] = useState([]);
+
+ const { projectsId , owner } = props.match.params;
+
+ useEffect(() => {
+ if (projectsId) {
+ const url = `/${owner}/${projectsId}/tags.json`;
+ axios.get(url).then((result) => {
+ if (result) {
+ setSource(result.data);
+ }
+ }).catch(error => {})
+ }
+ }, [owner, projectsId]);
+
+ const columns=[
+ {
+ title:"标签名",
+ dataIndex:"name",
+ key:1,
+ ellipsis:true,
+ render:(txt,item)=>{
+ return {item.name}
+ }
+ },
+ {
+ title:"创建时间",
+ dataIndex:"time_ago",
+ key:2,
+ ellipsis:true,
+ render:(txt,item)=>{
+ return (
+
+ {item.commit && item.commit.name}
+ 创建于{txt}
+
+ )
+ }
+ },
+ {
+ title:"提交ID",
+ dataIndex:"id",
+ key:3,
+ ellipsis:true,
+ render:(txt,item)=>{
+ return (
+
+
+ {truncateCommitId(item.id)}
+
+ )
+ }
+ },
+ {
+ title:"描述信息",
+ dataIndex:"message",
+ key:4,
+ ellipsis:true,
+ render:(txt,item)=>{
+ return item.message || "--"
+ }
+ },
+ {
+ title:"下载",
+ dataIndex:"stage_type",
+ key:5,
+ ellipsis:true,
+ align:"center",
+ width:"181px",
+ render:(txt,item)=>{
+ return (
+
+ )
+ }
+ }
+ ]
+ return(
+
+ )
+}
+export default Tags;
\ No newline at end of file
diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss
new file mode 100644
index 000000000..3bd487db6
--- /dev/null
+++ b/src/forge/Main/tag/Index.scss
@@ -0,0 +1,31 @@
+.tagTable{
+ margin-top: 30px;
+ thead{
+ tr th{
+ background-color: #fff;
+ padding:5px 0px;
+ .ant-table-column-title{
+ font-size: 16px;
+ font-weight: 500;
+ color: #333333;
+ }
+ }
+ }
+ tbody{
+ tr{
+ &:hover td{
+ background-color: #fff!important;
+ }
+ td{
+ padding:0px;
+ height: 69px;
+ line-height: 69px;
+ }
+ &:last-child{
+ td{
+ border-bottom: none!important;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx
new file mode 100644
index 000000000..84220a0bb
--- /dev/null
+++ b/src/forge/Main/tree/Index.jsx
@@ -0,0 +1,114 @@
+import React , { useEffect , useState } from 'react';
+import CopyTool from '../../Component/CopyTool';
+import { truncateCommitId } from '../../common/util';
+import { Link } from 'react-router-dom';
+import { getImageUrl } from 'educoder';
+import { Dropdown , Menu , Spin } from 'antd';
+import './Index.scss';
+
+import Tree from '../img/tree.png';
+import Axios from 'axios';
+
+function turnbar(str){
+ if(str && str.length>0 && str.indexOf("/")>-1){
+ return str.replaceAll('/','%2F');
+ }
+ return str;
+}
+function Index(props) {
+ const [ list , setList ] = useState([]);
+ const [ isSpin , setIsSpin ] = useState(true);
+
+ const { projectsId , owner } = props.match.params;
+ const { isManager , isDeveloper , projectDetail } = props;
+
+ useEffect(()=>{
+ getList();
+ },[])
+
+
+ const menu =(zip_url,tar_url)=> (
+
+ )
+
+ function getList() {
+ const url = `/${owner}/${projectsId}/branches_slice.json`;
+ Axios.get(url).then(result=>{
+ if(result){
+ setList(result.data);
+ }
+ setIsSpin(false);
+ }).catch(error=>{setIsSpin(false);})
+ }
+
+ return(
+
+
+ {
+ list && list.length>0 && list.map((item,key)=>{
+ return(
+
+ {item.branch_type === "default" ? "默认分支" : item.branch_type==="protected"?"保护分支":"其它分支"}
+ {
+ item.list && item.list.length>0 &&
+
+ {
+ item.list.map((i,k)=>{
+ let last_commit = i.last_commit;
+ return(
+ -
+
+
{i.name}
+
+ {
+ last_commit && last_commit.committer && last_commit.committer.id?
+
+
+
{last_commit && last_commit.committer && last_commit.committer.name}
+
+ :
+
+
+ {last_commit && last_commit.committer && last_commit.committer.name}
+
+ }
+
更新于{last_commit && last_commit.time_from_now}
+
+
+ {
+ (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
+
+ 合并请求
+ }
+
+ 下载
+
+
+ )
+ })
+ }
+
+ }
+
+ )
+ })
+ }
+
+
+
这里暂未发布过任何版本
+
发行版功能基于仓库中的历史标记
建议使用类似 V1.0 的版本标记作为发布点
+
+ {
+ operation ?
+
+ :
+ 该项目暂时没有发布版本
+ }
+
+
+
+
+ ()
+ }
+ >
+ ()
+ }
+ >
+ ()
+ }
+ >
+
+
+ )
+}
+export default Index;
\ No newline at end of file
diff --git a/src/forge/Main/version/New.jsx b/src/forge/Main/version/New.jsx
new file mode 100644
index 000000000..8adde9b01
--- /dev/null
+++ b/src/forge/Main/version/New.jsx
@@ -0,0 +1,266 @@
+import React, { useState, useEffect, forwardRef } from "react";
+import styled from "styled-components";
+import { AutoComplete , Input, Checkbox, Button, Form } from "antd";
+import SelectBranch from '../../Branch/Select';
+
+import Editor from "../../../modules/tpm/challengesnew/tpm-md-editor";
+import Upload from "../../Upload/Index";
+import Attachments from "../../Upload/attachment";
+import axios from "axios";
+import "./version.scss";
+import { trim } from "lodash";
+
+const { Option } = AutoComplete;
+
+const Span = styled.span`
+ margin: 0px 15px;
+ color: #bbb;
+ line-height: 35px;
+ font-size:16px;
+ font-weight:400;
+ color:#666;
+`;
+export default Form.create()(
+ forwardRef(
+ (
+ { form, projectDetail , match, showNotification, history },
+ ref
+ ) => {
+ const { getFieldDecorator, validateFields, setFieldsValue } = form;
+ const [tagList, setTagList] = useState(undefined);
+ const [desc, setDesc] = useState(null);
+ const [branch, setBranch ] = useState(null);
+ const [fileList, setFileList] = useState(undefined);
+ const [attachment, setAttachment] = useState(undefined);
+ const [options , setOptions] = useState(undefined);
+ const stable = history && history.location && history.location.state.stable;
+ const { projectsId, versionId , owner } = match.params;
+
+ useEffect(()=>{
+ if(projectDetail && projectDetail.default_branch){
+ setBranch(projectDetail.default_branch);
+ }
+ },[projectDetail])
+
+
+ useEffect(() => {
+ if (versionId) {
+ const url = `/${owner}/${projectsId}/releases/${versionId}/edit.json`;
+ axios.get(url).then(result => {
+ if (result) {
+ setFieldsValue(result.data);
+ setDesc(result.data.body);
+ setAttachment(result.data.attachments);
+ }
+ });
+ }
+ }, [versionId]);
+
+ useEffect(() => {
+ if (projectsId) {
+ const url = `/${owner}/${projectsId}/tags.json`;
+ axios
+ .get(url,{params:{
+ limit:1000
+ }})
+ .then(result => {
+ if (result) {
+ setTagList(result.data);
+ setOptions(renderTagList(result.data));
+ }
+ })
+ .catch(error => {
+ console.log(error);
+ });
+ }
+ }, [projectsId]);
+
+ function renderTagList(list) {
+ if (list) {
+ let array = list.map((item, key) => {
+ return (
+
+ );
+ });
+ return array || undefined;
+ }
+ }
+ function submit() {
+ validateFields((err, value) => {
+ if(err)return;
+ if (versionId) {
+ let url = `/${owner}/${projectsId}/releases/${versionId}.json`;
+ axios
+ .put(url, {
+ ...value,
+ body: desc,
+ attachment_ids: fileList,
+ target_commitish:branch
+ })
+ .then(result => {
+ if (result) {
+ showNotification("版本修改成功！");
+ history.push(`/${owner}/${projectsId}/releases`);
+ }
+ });
+ } else {
+ let url = `/${owner}/${projectsId}/releases.json`;
+ axios.post(url, {
+ ...value,
+ body: desc,
+ attachment_ids: fileList
+ })
+ .then(result => {
+ if (result) {
+ showNotification("版本发布成功！");
+ history.push(`/${owner}/${projectsId}/releases`);
+ }
+ });
+ }
+ });
+ }
+ // 输入标签名
+ function changeAuto(value){
+ let l = tagList.filter(item=>item.name.indexOf(value) > -1);
+ setOptions(renderTagList(l));
+ }
+
+ function changeBranch(params) {
+ setBranch(params);
+ }
+
+ return (
+
+
+
+
+
标签命名建议
+
+ 通常的做法是在版本名称前加上字母 v 前缀， v1.0 或者 v2.3.4。
+
+
+ 如果标签不适合在生产环境下使用，请在版本名称后添加预发行版本。例如：v0.2-alpha
+ 或者 v5.9-beta.3。
+
+
+
+
语义化版本
+
+ 如果你是第一次发布版本，我们强烈建议你阅读语义化版本。
+
+
+
+
附件大小说明
+
+ 单个附件不能超过 100M（GVP 项目200M），每个仓库总附件不可超过
+ 1G（推荐项目不可超过 5G；GVP 项目不可超过
+ 20G）。附件总容量统计包括仓库附件和发行版附件。
+
+
+
+
+
+ {item.draft}
+
+
+ {item.tag_name}
+
+
+
+ {truncateCommitId(item.sha)}
+
+
+
+
+ {item.name}
+
+ {data && data.user_admin_permission && type !== 2 && }
+ {data && data.user_admin_permission && type !== 2 && {deleteRelease(item.version_id)}}>}
+
+
+
+ showBody(key,item.bodyshow)}>
+
+ 发布于{item.created_at}
+
+ {
+ item.bodyshow &&
+
+
+
+ }
+
+
+ {/* 发行版附件下载 */}
+ {item.attachments && item.attachments.map((item)=>{
+ return(下载 {item.title})
+ })}
+ {/* 发行版下载包 */}
+ 下载 {item.tag_name}.TAR.gz
+ 下载 {item.tag_name}.ZIP
+
+
+
+
+
+ }
+
+ {!turnFromNew ? releases.map((item, key) => release(item,key)) : release(releases[0],0)}
+
+
+ )
+ } else if (releases && releases.length === 0) {
+ return (
+
+ )
+ }
+ }
+
+ function addFunc(){
+ props.history.push({pathname:`/${owner}/${projectsId}/releases/new`,state:{stable:true}});
+ }
+
+ return (
+
+
+
+ {renderList(releases)}
+
+
+
-
-
-
- 共有 {data && data.files_count} 个文件被更改，包括
+
+ {setIsOpen(!isOpen)}}>
+
+
+ 共有 {data && data.files_count} 个文件 被更改，包括
{ data && data.total_addition ? {data && data.total_addition} 次插入:"" }
{ data && data.total_addition && data.total_deletion ? " 和 ":""}
{ data && data.total_deletion ? {data && data.total_deletion} 次删除:""}
-
+
+
+ {isOpen && folderOpen}
{
files && files.length>0 &&
-
+
{
files.map((item,key)=>{
return(
-
showDown(item.flag,key,item.isBin)}>
+
+
- {!item.isBin ? :""}
-
- {item.name}
+ {!item.isBin ? showDown(item.flag,key,item.isBin)}>:""}
+ showDown(item.flag,key,item.isBin)}>{item.name}
+ setCopyfileTipTitle("复制文件路径")}
+ >
+ copyFileName(item.name)}>
+
-
-
- +{item.addition}
- -{item.deletion}
-
+
+
0 && "："} ${item.addition > 0 ? item.addition + "处添加" : ""}${item.addition > 0 && item.deletion > 0 ? "和" : ""}${item.deletion > 0 ? item.deletion + "处删除" : ""}`}>
+
+
{history.push(`/${owner}/${projectsId}${item.isDeleted ? `/commits/${truncateCommitId(parentsSha)}`:`/tree/${truncateCommitId(item.sha)}/${item.name}`}`)}}>查看文件
+
-
+
+
+
-
-
-
- {!readOnly && (
-
-
-
- )}
-
+
+
+ {!readOnly && (
+
+
+
+ )}
);
}
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index d6d3cdc60..b1af2f998 100644
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@@ -16,7 +16,7 @@ const menu = [
{name:"合并请求",index:"pulls"},
{name:"Wiki",index:"wiki"},
{name:"工作流(beta版)",index:"devops"},
- {name:"资源库",index:"resources"},
+ // {name:"资源库",index:"resources"},
{name:"里程碑",index:"versions"},
{name:"动态",index:"activity"},
]
diff --git a/src/forge/Team/New.jsx b/src/forge/Team/New.jsx
index 414a8d158..46e13c3e0 100644
--- a/src/forge/Team/New.jsx
+++ b/src/forge/Team/New.jsx
@@ -87,7 +87,7 @@ export default Form.create()(
}
],
)}
diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx
index 499a00c20..e4f5cf7a6 100644
--- a/src/forge/Team/Setting/TeamSettingCommon.jsx
+++ b/src/forge/Team/Setting/TeamSettingCommon.jsx
@@ -122,7 +122,7 @@ export default Form.create()(
validator:checkname
}
],
- ,true
+ ,true
)}
{helper(
"组织名称：",
diff --git a/src/forge/Upload/Index.js b/src/forge/Upload/Index.js
index 5b09ca071..713803aa3 100644
--- a/src/forge/Upload/Index.js
+++ b/src/forge/Upload/Index.js
@@ -1,7 +1,6 @@
import React, { Component } from "react";
import { Upload, Icon , Button } from 'antd';
import { getUploadActionUrl, appendFileSizeToUploadFileAll } from 'educoder';
-import { AlignCenter } from '../Component/layout';
import axios from 'axios';
const { Dragger } = Upload;
@@ -64,7 +63,6 @@ class Index extends Component {
changeIsComplete && changeIsComplete(true);
if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
let fileList = info.fileList;
-
this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });
this.fileIdList(fileList);
}
@@ -111,7 +109,7 @@ class Index extends Component {
:
{icon || }
- 拖动文件或点击此处上传
+ 拖动文件或点击此处上传
)
}
diff --git a/src/forge/Upload/untitled b/src/forge/Upload/untitled
deleted file mode 100644
index 2796e4d71..000000000
--- a/src/forge/Upload/untitled
+++ /dev/null
@@ -1,21 +0,0 @@
-
-1.请求URL： https://code.ihub.org.cn/api/v1/mirrors/create.json
-
-2.请求方式： POST
-
-3.参数：
-
-{
- "image_url": "xxx.git", #必填，且后缀必为.git,
- "language": "Ruby", #必填，如数据库不存在，则会创建新的记录
-}
-
-
-4. 返回值： {
- "status": 1,
- "message": "同步成功，项目ID===1806"
-}
-
-5. 返回值说明： 仅有当有返回值，且返回值的status 的值为1， 才是创建成功，其余均为创建失败
-
-
diff --git a/src/forge/Version/New.jsx b/src/forge/Version/New.jsx
deleted file mode 100644
index 0678a3457..000000000
--- a/src/forge/Version/New.jsx
+++ /dev/null
@@ -1,278 +0,0 @@
-import React, { useState, useEffect, useCallback, forwardRef } from "react";
-import styled from "styled-components";
-import { AutoComplete, Select, Input, Checkbox, Button, Form } from "antd";
-
-import Editor from "../../modules/tpm/challengesnew/tpm-md-editor";
-import Upload from "../Upload/Index";
-import Attachments from "../Upload/attachment";
-import axios from "axios";
-import "./version.css";
-import UploadImg from "../Images/upload.png";
-import { getBranch } from '../GetData/getData';
-
-const { Option } = AutoComplete;
-
-export default Form.create()(
- forwardRef(
- (
- { form, projectDetail , match, showNotification, history },
- ref
- ) => {
- const { getFieldDecorator, validateFields, setFieldsValue } = form;
- const [tagList, setTagList] = useState(undefined);
- const [branchList, setBranchList] = useState(undefined);
- const [desc, setDesc] = useState(null);
- const [fileList, setFileList] = useState(undefined);
- const [attachment, setAttachment] = useState(undefined);
- const [options , setOptions] = useState(undefined);
-
-
- const repo_id = projectDetail && projectDetail.repo_id;
- const { projectsId, versionId , owner } = match.params;
- useEffect(()=>{
- getBranchs(projectsId,owner);
- },[projectsId])
-
- async function getBranchs(id,owner){
- let result = await getBranch(id,owner);
- setBranchList(result);
- }
-
- const Span = styled.span`
- margin: 0px 15px;
- color: #bbb;
- line-height: 35px;
- `;
-
-
- useEffect(() => {
- if (versionId) {
- const url = `/${owner}/${projectsId}/releases/${versionId}/edit.json`;
- axios.get(url).then(result => {
- if (result) {
- setFieldsValue(result.data);
- setDesc(result.data.body);
- setAttachment(result.data.attachments);
- }
- });
- }
- }, [versionId]);
-
- useEffect(() => {
- if (projectsId) {
- const url = `/${owner}/${projectsId}/tags.json`;
- axios
- .get(url,{params:{
- limit:1000
- }})
- .then(result => {
- if (result) {
- setTagList(result.data);
- setOptions(renderTagList(result.data));
- }
- })
- .catch(error => {
- console.log(error);
- });
- }
- }, [projectsId]);
-
- function renderTagList(list) {
- if (list) {
- let array = list.map((item, key) => {
- return (
-
- );
- });
- return array || undefined;
- }
- }
- function submit() {
- validateFields((err, value) => {
- if(err)return;
- if (versionId) {
- let url = `/${owner}/${projectsId}/releases/${versionId}.json`;
- axios
- .put(url, {
- ...value,
- body: desc,
- attachment_ids: fileList
- })
- .then(result => {
- if (result) {
- showNotification("版本修改成功！");
- history.push(`/${owner}/${projectsId}/releases`);
- }
- });
- } else {
- let url = `/${owner}/${projectsId}/releases.json`;
- axios.post(url, {
- ...value,
- body: desc,
- attachment_ids: fileList
- })
- .then(result => {
- if (result) {
- showNotification("版本发布成功！");
- history.push(`/${owner}/${projectsId}/releases`);
- }
- });
- }
- });
- }
-
- const helper = useCallback(
- (label, name, rules, widget, isRequired = true) => (
-
- {label}
-
- {getFieldDecorator(name, { rules, validateFirst: true })(widget)}
-
-
- ),
- []
- );
- // 输入标签名
- function changeAuto(value){
- let l = tagList.filter(item=>item.name.indexOf(value) > -1);
- setOptions(renderTagList(l));
- }
- return (
-
-
-
-
-
标签命名建议
-
- 通常的做法是在版本名称前加上字母 v 前缀， v1.0 或者 v2.3.4。
-
-
- 如果标签不适合在生产环境下使用，请在版本名称后添加预发行版本。例如：v0.2-alpha
- 或者 v5.9-beta.3。
-
-
-
-
语义化版本
-
- 如果你是第一次发布版本，我们强烈建议你阅读语义化版本。
-
-
-
-
附件大小说明
-
- 单个附件不能超过 100M（GVP 项目200M），每个仓库总附件不可超过
- 1G（推荐项目不可超过 5G；GVP 项目不可超过
- 20G）。附件总容量统计包括仓库附件和发行版附件。
-
-
-
-
-
- {item.draft}
- {item.created_at}
-
-
- {item.tag_name}
-
-
-
-
- {item.name}
- {
- (isManager || isDeveloper) && type !==2 &&
- （编辑）
- }
-
-
- this.showBody(key,item.bodyshow)}>
- {item.user_name}:发布了这个版本，并在发布后提交给{item.target_commitish}
-
- {
- item.bodyshow &&
- }
-
-
- TAR
- ZIP
-
-
-
-
- 版本发布
- {
- data && data.user_permission && type !== 2 ?
- + 发布新版
- : ''
- }
-
-
-
{this.renderList(releases)}
-
-