- 
+ setVisible(false)}
+ footer={
+
+
+
+
+ }
+ >
+
+
开始激活
+
+ 了解什么是DevOps？
+
+ {step === 1 ? (
+
+
+ 下一步
+
+ ) : (
+
- )
+ );
}
-export default Form.create()(forwardRef(About));
\ No newline at end of file
+export default Form.create()(forwardRef(About));
diff --git a/src/forge/DevOps/OpsDetailLeftpanel.jsx b/src/forge/DevOps/OpsDetailLeftpanel.jsx
index 427f0c99..c92cc096 100644
--- a/src/forge/DevOps/OpsDetailLeftpanel.jsx
+++ b/src/forge/DevOps/OpsDetailLeftpanel.jsx
@@ -1,42 +1,80 @@
-import React from 'react';
-import { FlexAJ , Blueline , AlignCenter } from '../Component/layout';
-import styled from 'styled-components';
-import { Menu } from 'antd';
-import { TagsLine } from '../Component/OpsStatus';
+import React, { useEffect ,useState } from "react";
+import { FlexAJ, Blueline, AlignCenter } from "../Component/layout";
+import styled from "styled-components";
+import { Menu , Popconfirm } from "antd";
+import { TagsLine } from "../Component/OpsStatus";
+import { Time } from "../Utils/Time";
+import { truncateCommitId } from "../common/util";
+
const SubMenu = Menu.SubMenu;
-const Img = styled.img`{
- width:25px;
- height:25px;
- border-radius:50%;
- margin-right:10px;
-}`
-export default (()=>{
- return(
+const Img = styled.img`
+ {
+ width: 25px;
+ height: 25px;
+ border-radius: 50%;
+ margin-right: 10px;
+ }
+`;
+export default ({ data , repeatSet }) => {
+ const [ tamp , setTamp ] = useState(undefined);
+ const [ sha , setSha ] = useState(undefined);
+ useEffect(()=>{
+ if(data && data.started){
+ let t = parseInt(data.started) * 1000;
+ let time = Time(t);
+ setTamp(time);
+ }
+ if(data && data.after){
+ setSha(truncateCommitId(data.after));
+ }
+ },[data])
+
+ return (
+
+
+ 初始化配置已完成，请前往:
+
+
+ http://ip:80/login/oauth/authorize
+
+
+ 进入认证
+
定义DevOps工作流，帮助您检测bug、发布代码…
- 了解什么是DevOps？ - -
+
+
+ )}
- 开始时间：2020.07.10 15:30
- 运行时间：20s
+ -
- {
- STATUS.map((item,key)=>{
- return
- ChangeStatus(item.value)} className={ status === item.value ? "active":""}>{item.name} - }) - } + {STATUS.map((item, key) => { + return ( +
- ChangeStatus(item.value)} + className={status === item.value ? "active" : ""} + > + {item.name} + + ); + })}
- { meg.branch && 分支{meg.branch}}
- { meg.sha && {meg.sha}}
+ {meg.branch && (
+
+ 分支
+ {meg.branch}
+
+ )}
+ {meg.sha && {meg.sha}}
{meg.message}
+
+ {meg.message}
+
-
:""
- }
+ {total > LIMIT ? (
+
+
+ ) : (
+ ""
+ )}
-
-
- #1
- 将分支“221063-improve-buy-ci-minutes-link”合并到“221063-improve-buy-ci-minutes-link"
- {Tags(1)}
-
- 退出
-
- -1 ? "active" : ""}>
+ -1 ? "active" : ""}>
工作流
{projectDetail && projectDetail.ops_count ? {projectDetail.ops_count} : ""}
- */}
+
-1 || url.indexOf("meilpost") > -1) ? "active" : ""}>
里程碑
diff --git a/src/forge/Utils/Time.js b/src/forge/Utils/Time.js
index 55d73441..4de4b371 100644
--- a/src/forge/Utils/Time.js
+++ b/src/forge/Utils/Time.js
@@ -26,7 +26,7 @@ export function getDateTime(value, dataformat) {
return date.format(dataformat);
}
-export default function Time(UTCtiem) {
+export function Time(UTCtiem) {
var dateTime = new Date(UTCtiem);
var year = dateTime.getFullYear();
From 940c9c025387cd240467bb24e0b7eecc766487a0 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sun, 9 Aug 2020 22:39:58 +0800
Subject: [PATCH 002/164] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Component/OpsStatus.jsx | 6 +-
src/forge/DevOps/OpsDetailLeftpanel.jsx | 126 +++++++++++++++++------
src/forge/DevOps/OpsDetailRightpanel.jsx | 46 +++++----
src/forge/DevOps/opsDetail.jsx | 67 ++++++------
4 files changed, 162 insertions(+), 83 deletions(-)
diff --git a/src/forge/Component/OpsStatus.jsx b/src/forge/Component/OpsStatus.jsx
index f5db8d72..b6944642 100644
--- a/src/forge/Component/OpsStatus.jsx
+++ b/src/forge/Component/OpsStatus.jsx
@@ -24,15 +24,15 @@ export const Tags = (status)=>{
export const TagsLine = (status)=>{
switch(status){
- case 1:
+ case "running":
return(
运行中
);
- case 2:
+ case "failure":
return (
未通过
);
- case 3:
+ case "success":
return (
已通过
);
diff --git a/src/forge/DevOps/OpsDetailLeftpanel.jsx b/src/forge/DevOps/OpsDetailLeftpanel.jsx
index c92cc096..87343b82 100644
--- a/src/forge/DevOps/OpsDetailLeftpanel.jsx
+++ b/src/forge/DevOps/OpsDetailLeftpanel.jsx
@@ -1,12 +1,11 @@
-import React, { useEffect ,useState } from "react";
+import React, { useEffect, useState } from "react";
import { FlexAJ, Blueline, AlignCenter } from "../Component/layout";
import styled from "styled-components";
-import { Menu , Popconfirm } from "antd";
+import { Menu, Popconfirm } from "antd";
import { TagsLine } from "../Component/OpsStatus";
import { Time } from "../Utils/Time";
import { truncateCommitId } from "../common/util";
-
const SubMenu = Menu.SubMenu;
const Img = styled.img`
{
@@ -16,37 +15,83 @@ const Img = styled.img`
margin-right: 10px;
}
`;
-export default ({ data , repeatSet }) => {
- const [ tamp , setTamp ] = useState(undefined);
- const [ sha , setSha ] = useState(undefined);
- useEffect(()=>{
- if(data && data.started){
+export default ({ data, repeatSet }) => {
+ const [tamp, setTamp] = useState(undefined);
+ const [sha, setSha] = useState(undefined);
+ useEffect(() => {
+ if (data && data.started) {
let t = parseInt(data.started) * 1000;
let time = Time(t);
setTamp(time);
}
- if(data && data.after){
+ if (data && data.after) {
setSha(truncateCommitId(data.after));
}
- },[data])
+ }, [data]);
+
+ function renderMenu() {
+ if (data.stages && data.stages.length > 0) {
+ data.stages.map((item, key) => {
+ return item.steps && item.steps.length > 0 ? (
+
+
+ {item.name}
+
+ }
+ >
+ {item.steps.map((i, k) => {
+ return (
+
-
-
-
-
-
-
+ let projectId = props.match.params.projectId;
+ let opsId = props.match.params.opsId;
+
+ useEffect(() => {
+ if (opsId && projectId) {
+ Init();
+ }
+ }, [opsId]);
+
+ function Init(){
+ const url = `/dev_ops/builds/${opsId}.json`;
+ axios.get(url, {
+ params: {
+ project_id: projectId,
+ },
+ })
+ .then((result) => {
+ if (result && result.data) {
+ setSpinning(false);
+ setData(result.data);
+ setStages(result.data.stages);
+ }
+ })
+ .catch((error) => {
+ console.log(error);
+ });
+ }
+
+ // 重新构建
+ function repeatSet() {
+ const url = `/dev_ops/builds/${data && data.number}.json`;
+ axios.post(url, { project_id: projectId })
+ .then((result) => {
+ if (result) {
+ Init();
+ }
+ })
+ .catch((error) => {
+ console.log(error);
+ });
+ }
+ return (
+
+
- )
-});
\ No newline at end of file
+
+ );
+};
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 88f20638..8faaa61b 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -438,12 +438,12 @@ class Detail extends Component {
}
- {/*
+
+
+ #{data && data.number}
+ {data && data.message}
+ {Tags(`${data && data.status}`)}
+
+
+ 退出
+
+
+
-
+
+
+
+
+
+
+
+
-
- )
-})
\ No newline at end of file
+ );
+};
diff --git a/src/forge/DevOps/opsDetail.jsx b/src/forge/DevOps/opsDetail.jsx
index 34ae4e3e..52f20796 100644
--- a/src/forge/DevOps/opsDetail.jsx
+++ b/src/forge/DevOps/opsDetail.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState , useRef , useContext } from "react";
+import React, { useEffect, useState, useRef, useContext } from "react";
import "./ops.scss";
import { FlexAJ, AlignCenter } from "../Component/layout";
import { Tags } from "../Component/OpsStatus";
@@ -7,7 +7,7 @@ import LeftPanel from "./OpsDetailLeftpanel";
import RightPanel from "./OpsDetailRightpanel";
import axios from "axios";
import { Spin } from "antd";
-import { Link } from 'react-router-dom';
+import { Link } from "react-router-dom";
export default (props) => {
const [data, setData] = useState(undefined);
@@ -23,37 +23,41 @@ export default (props) => {
}
}, [opsId]);
- function Init(){
+ function Init() {
const url = `/dev_ops/builds/${opsId}.json`;
- axios.get(url, {
- params: {
- project_id: projectId,
- },
- })
- .then((result) => {
- if (result && result.data) {
- setSpinning(false);
- setData(result.data);
- setStages(result.data.stages);
- }
- })
- .catch((error) => {
- console.log(error);
- });
+ axios
+ .get(url, {
+ params: {
+ project_id: projectId,
+ },
+ })
+ .then((result) => {
+ if (result && result.data) {
+ setSpinning(false);
+ setData(result.data);
+ setStages(
+ result.data.stages && result.data.stages.length > 0 ? result.data.stages[0] : undefined
+ );
+ }
+ })
+ .catch((error) => {
+ console.log(error);
+ });
}
// 重新构建
function repeatSet() {
const url = `/dev_ops/builds/${data && data.number}.json`;
- axios.post(url, { project_id: projectId })
- .then((result) => {
- if (result) {
- Init();
- }
- })
- .catch((error) => {
- console.log(error);
- });
+ axios
+ .post(url, { project_id: projectId })
+ .then((result) => {
+ if (result) {
+ Init();
+ }
+ })
+ .catch((error) => {
+ console.log(error);
+ });
}
return (
-
- Build setup 01
- 20
-
-
-
-
-
-
+ {list && list.length>0 ? list.map((item, key) => {
+ return (
+
+
+ {item.name}
+
+ { item.stopped ? (parseInt(item.stopped) - parseInt(item.started)) : "0" }
+
+
+
+
+ );
+ }):"1111"
+ }