+ 
+ 开始激活
+
+ )
+ })
+)
\ No newline at end of file
diff --git a/src/forge/DevOps/Dispose.jsx b/src/forge/DevOps/Dispose.jsx
new file mode 100644
index 00000000..560f26b6
--- /dev/null
+++ b/src/forge/DevOps/Dispose.jsx
@@ -0,0 +1,81 @@
+import React , { forwardRef , useCallback , useState } from 'react';
+import { Form , AutoComplete } from 'antd';
+import { Blueback } from '../Component/layout';
+import Editor from "react-monaco-editor";
+import Modals from './DisposeModal';
+
+import docker from '../Images/docker.png';
+import gradle from '../Images/gradle.png';
+import java from '../Images/java.png';
+import js from '../Images/js.png';
+import php from '../Images/php.png';
+import python from '../Images/python.png';
+
+
+const Option = AutoComplete.Option;
+export default Form.create()(
+ forwardRef(({ form })=>{
+ const [ visible , setVisible ] = useState(false);
+ const { getFieldDecorator } = form;
+ const helper = useCallback(
+ (label, name, rules, widget, isRequired = false) => (
+ 定义DevOps工作流，帮助您检测bug、发布代码…
+ 了解什么是DevOps？ + +工作流配置完成，您的DevOps之旅即刻开启！
+
+
+ 工作流配置
+ 构建列表
+
+
+ )
+})
\ No newline at end of file
diff --git a/src/forge/DevOps/Structure.jsx b/src/forge/DevOps/Structure.jsx
new file mode 100644
index 00000000..dddd9845
--- /dev/null
+++ b/src/forge/DevOps/Structure.jsx
@@ -0,0 +1,204 @@
+import React , { useState } from 'react';
+import { FlexAJ , Blueback } from '../Component/layout';
+import { Table , Pagination } from 'antd';
+import styled from 'styled-components';
+const STATUS = [
+ {name:"所有",value:"1"},
+ {name:"准备中",value:"2"},
+ {name:"运行中",value:"3"},
+ {name:"已完成",value:"4"}
+]
+const LIMIT = 15;
+const datasource = [
+ {
+ status:2,
+ author:"caishi",
+ message:{
+ branch:"master",
+ sha:"8b3476f5",
+ image:"https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2034740944,4251903193&fm=26&gp=0.jpg",
+ message:"将分支“ 221063-improve-buy-ci-minutes-link”"
+ },
+ begin:"2020-07-08",
+ run:"20s"
+ },
+ {
+ status:1,
+ author:"caishi",
+ message:{
+ branch:"master",
+ sha:"8b3476f5",
+ image:"https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2034740944,4251903193&fm=26&gp=0.jpg",
+ message:"将分支“ 221063-improve-buy-ci-minutes-link”"
+ },
+ begin:"2020-07-08",
+ run:""
+ }
+];
+
+const Img = styled.img`{
+ border-radius:50%;
+ margin-rigth:10px;
+ width:25px;
+ height:25px;
+}`
+export default (()=>{
+ const [ status ,setStatus ] = useState("1");
+ const [ page ,setPage ] = useState(1);
+ const [ total ,setTotal ] = useState(10);
+
+
+ function ChangeStatus(value){
+ setStatus(value)
+ }
+ // 切换分页
+ function ChangePage(page){
+ setPage(page)
+ }
+ function renderStatus() {
+ return(
+
+ {
+ menu ?
+
+ -
+ {
+ STATUS.map((item,key)=>{
+ return
- ChangeStatus(item.value)} className={ status === item.value ? "active":""}>{item.name} + }) + } +
+ { meg.branch && 分支{meg.branch}}
+ { meg.sha && {meg.sha}}
+
+ {meg.message}
+
+
+ {renderStatus()}
+
+ 手动创建
+ 分支
+ 标签
+
+
+
+ {
+ total > LIMIT ?
+
+ )
+})
\ No newline at end of file
diff --git a/src/forge/DevOps/ops.scss b/src/forge/DevOps/ops.scss
new file mode 100644
index 00000000..9f4f2a22
--- /dev/null
+++ b/src/forge/DevOps/ops.scss
@@ -0,0 +1,121 @@
+.opsPanel
+{
+ margin:20px auto;
+ width: 1200px;
+ // 开始激活页面
+ .activatePanel{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ padding:60px 0px;
+ }
+ .disposePanel{
+ .language{
+ display: flex;
+ li{
+ margin-right: 20px;
+ }
+ }
+ .editorBody{
+ border:1px solid #ddd;
+ margin:20px 0px;
+ .editorHead{
+ background-color: #F1F8FF;
+ height: 48px;
+ line-height: 48px;
+ display: flex;
+ justify-content: space-between;
+ padding:0px 20px;
+ border-bottom: 1px solid #ddd;
+ }
+ .monaco-editor{
+ width:1138px!important;
+ }
+ }
+ .ant-modal-close{
+ top:7px;
+ }
+ .listPart{
+ .listNav{
+ display: flex;
+ li{
+ background-color: #fafafa;
+ border:1px solid #eee;
+ border-radius: 5px;
+ height: 38px;
+ line-height:38px;
+ padding:0px 20px;
+ color: #333;
+ margin-right: 20px;
+ cursor: pointer;
+ &:last-child{
+ margin-right: 0px;
+ }
+ &.active{
+ border:1px solid #5091FF;
+ color: #5091FF;
+ background-color: #fff;
+ }
+ }
+ }
+ .normalTable{
+ margin-top: 20px;
+ .ant-table-thead > tr > th, .ant-table-tbody > tr > td{
+ padding:10px 5px;
+ color:#333;
+ }
+ .ant-table-thead{
+ border:1px solid rgba(238,238,238,1)
+ }
+ }
+ }
+ }
+ // 列表
+ .listPart{
+ .statusTag{
+ display: flex;
+ padding:0px 16px;
+ height: 32px;
+ line-height: 32px;
+ border-radius:20px;
+ float: left;
+ i{
+ font-size: 20px!important;
+ margin-right: 7px;
+ }
+ &.running{
+ background:#F1F8FF;
+ border:1px solid #5091FF;
+ color: #5091FF;
+ }
+ &.Preparing{
+ background:rgba(255,248,244,1);
+ border:1px solid rgba(255,110,33,1);
+ color:rgba(255,110,33,1) ;
+ }
+ &.pass{
+ background:#EEFDF5;
+ border:1px solid #28BD6C;
+ color:#28BD6C ;
+ }
+ &.failed{
+ background:#FCEEEE;
+ border:1px solid #F73030;
+ color:#F73030 ;
+ }
+ }
+
+ }
+
+}
+// ops详情
+.opsDetailPanel{
+ height: 100vh;
+ background-color: #114879;
+ .opsInfos{
+ height: 60px;
+ background-color: #114879;
+ color:#fff;
+ padding:0px 20px;
+ }
+}
\ No newline at end of file
diff --git a/src/forge/DevOps/opsDetail.jsx b/src/forge/DevOps/opsDetail.jsx
new file mode 100644
index 00000000..92960e58
--- /dev/null
+++ b/src/forge/DevOps/opsDetail.jsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import './ops.scss';
+import { FlexAJ, AlignCenter } from '../Component/layout';
+import { Tags } from '../Component/OpsStatus';
+
+export default (()=>{
+ return(
+
+
:""
+ }
+
+
+
+ #1
+ 将分支“221063-improve-buy-ci-minutes-link”合并到“221063-improve-buy-ci-minutes-link"
+ {Tags(1)}
+
+ 退出
+
+
+ )
+});
\ No newline at end of file
diff --git a/src/forge/Images/activate.png b/src/forge/Images/activate.png
new file mode 100644
index 00000000..25c12227
Binary files /dev/null and b/src/forge/Images/activate.png differ
diff --git a/src/forge/Images/docker.png b/src/forge/Images/docker.png
new file mode 100644
index 00000000..28975cfb
Binary files /dev/null and b/src/forge/Images/docker.png differ
diff --git a/src/forge/Images/gradle.png b/src/forge/Images/gradle.png
new file mode 100644
index 00000000..e39a041b
Binary files /dev/null and b/src/forge/Images/gradle.png differ
diff --git a/src/forge/Images/java.png b/src/forge/Images/java.png
new file mode 100644
index 00000000..2711832a
Binary files /dev/null and b/src/forge/Images/java.png differ
diff --git a/src/forge/Images/js.png b/src/forge/Images/js.png
new file mode 100644
index 00000000..4471dbec
Binary files /dev/null and b/src/forge/Images/js.png differ
diff --git a/src/forge/Images/php.png b/src/forge/Images/php.png
new file mode 100644
index 00000000..8c33aed3
Binary files /dev/null and b/src/forge/Images/php.png differ
diff --git a/src/forge/Images/python.png b/src/forge/Images/python.png
new file mode 100644
index 00000000..87da5706
Binary files /dev/null and b/src/forge/Images/python.png differ
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 5683c95d..71c36518 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -344,6 +344,63 @@ class CoderRootDirectory extends Component {
readOnly
})
}
+
+ downloadUrl = (zip_url,tar_url) => {
+ return(
+
+ )
+ }
+
+ title = (branchLastCommit,lastCommitAuthor) => {
+ if (branchLastCommit) {
+ return (
+
+ {lastCommitAuthor ? (
+
+ {lastCommitAuthor.login ? (
+
+ })
+ {lastCommitAuthor.name}
+
+ ) : (
+ {lastCommitAuthor.name}
+ )}
+
+ ) : (
+ ""
+ )}
+
+ {branchLastCommit.message}
+
+ {branchLastCommit.time_from_now}
+
+ {truncateCommitId(branchLastCommit.sha)}
+
+
+ );
+ }
+ }
+
render(){
const { branchLastCommit , lastCommitAuthor , rootList , branch ,filePath , fileDetail , subFileType , readMeContent, isSpin , zip_url , tar_url} = this.state;
const { isManager , isDeveloper , projectDetail } = this.props;
@@ -363,90 +420,24 @@ class CoderRootDirectory extends Component {
dataIndex: "commit",
width: "60%",
render: (text, item) =>
- item.commit && item.commit.message ? (
-
+ item.commit && item.commit.message ?
+
{item.commit.message}
- ) : (
- ""
- ),
+ : ""
},
{
dataIndex: "commit",
width: "10%",
className: "edu-txt-right",
render: (text, item) =>
- item.commit && item.commit.time_from_now ? (
-
+ item.commit && item.commit.time_from_now ?
+
{item.commit.time_from_now}
- ) : (
- ""
- ),
+ :""
},
];
- const title = () => {
- if (branchLastCommit) {
- return (
-
- {lastCommitAuthor ? (
-
- {lastCommitAuthor.login ? (
-
-
- {lastCommitAuthor.name}
-
- ) : (
- {lastCommitAuthor.name}
- )}
-
- ) : (
- ""
- )}
-
- {branchLastCommit.message}
-
- {branchLastCommit.time_from_now}
-
- {truncateCommitId(branchLastCommit.sha)}
-
-
- );
- } else {
- return undefined;
- }
- };
-
- const downloadUrl = () => (
-
- );
const urlRoot = filePath === undefined ? "" : `/${filePath}`;
let array = filePath && filePath.split("/");
@@ -487,7 +478,7 @@ class CoderRootDirectory extends Component {
)}
- {subFileType && parseInt(projectDetail.type) !== 2 && (isManager || isDeveloper) && (
+ {subFileType && (projectDetail && parseInt(projectDetail.type)) !== 2 && (isManager || isDeveloper) && (
+ {/* 工作流 */}
+ (
{/* 标签列表 */}
{show_message ? (
-
)}
@@ -519,7 +510,7 @@ class CoderRootDirectory extends Component {
title()}
+ title={() => this.title(branchLastCommit,lastCommitAuthor)}
>
)}
{/* 子目录列表、文件 */}
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index bda4b9df..5dbc0bf9 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
import { Spin, Tooltip } from 'antd';
import { Link, Route, Switch } from 'react-router-dom';
import { Content } from '../Component/layout';
@@ -114,6 +114,10 @@ const TrendsIndex = Loadable({
loading: Loading,
})
+const DevIndex = Loadable({
+ loader: () => import('../DevOps/Index'),
+ loading: Loading,
+})
/**
* permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外）
*/
@@ -419,7 +423,7 @@ class Detail extends Component {
代码库
- -1 && !(url.indexOf("Milepost") > 0 || url.indexOf("meilpost") > 0 || url.indexOf("tags") > 0)) ? "active" : ""}>
+ -1 && !(url.indexOf("Milepost") > 0 || url.indexOf("meilpost") > 0 || url.indexOf("tags") > 0)) ? "active" : ""}>
任务
{projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} : ""}
@@ -434,20 +438,26 @@ class Detail extends Component {
}
- -1 || url.indexOf("meilpost") > -1) ? "active" : ""}>
+ -1 ? "active" : ""}>
+
+ 工作流
+ {/* {projectDetail && projectDetail.pull_requests_count ? {projectDetail.pull_requests_count} : ""} */}
+
+
+ -1 || url.indexOf("meilpost") > -1) ? "active" : ""}>
里程碑
{projectDetail && projectDetail.version_count && {projectDetail.version_count}}
- -1 ? "active" : ""}>
+ -1 ? "active" : ""}>
动态
{
isManager &&
- 0 ? "active" : ""}>
仓库设置
+ 0 ? "active" : ""}>仓库设置
}
@@ -463,6 +473,12 @@ class Detail extends Component {
:
+
{data && data.search_count && data.search_count > 0 ? (
-
+
-
+
{merge_type === "new" ? "新建" : "编辑"}合并请求:
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index 21ba831e..e86c2e66 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -109,6 +109,11 @@ form.ant-form{
line-height: 22px;
}
}
+form{
+ .ant-row.ant-form-item{
+ margin-bottom: 15px;
+ }
+}
@media screen and (max-width: 1000px){
.main{
width: 750px;