From 5e7fedb471cceab4fa07b5d7b3ef876df047234e Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 12 Jan 2021 17:25:22 +0800
Subject: [PATCH] dispose
---
src/forge/DevOps/Dispose/Choosen.jsx | 13 ++++++-
src/forge/DevOps/Dispose/Init.jsx | 10 +----
src/forge/DevOps/Dispose/Stage.jsx | 45 ++++++++++++++++++++++
src/forge/DevOps/Dispose/StageItem.jsx | 27 +++++++++++++
src/forge/DevOps/Dispose/menusRename.jsx | 3 +-
src/forge/DevOps/disposePipeline.jsx | 12 +++---
src/forge/DevOps/ops.scss | 49 ++++++++++++++++++------
7 files changed, 130 insertions(+), 29 deletions(-)
create mode 100644 src/forge/DevOps/Dispose/Stage.jsx
create mode 100644 src/forge/DevOps/Dispose/StageItem.jsx
diff --git a/src/forge/DevOps/Dispose/Choosen.jsx b/src/forge/DevOps/Dispose/Choosen.jsx
index 4e5c5e7d..5f808e33 100644
--- a/src/forge/DevOps/Dispose/Choosen.jsx
+++ b/src/forge/DevOps/Dispose/Choosen.jsx
@@ -1,7 +1,16 @@
import React , { useEffect , useState } from 'react';
-function Choosen({name,options,chooseFunc}){
+function Choosen({name,chooseFunc}){
const [ index, setIndex ] = useState(undefined);
+ const [ models , setModels ] = useState(undefined);
+
+ useEffect(()=>{
+ let list = [
+ {id:1,name:"docker/arm64/linux"},
+ {id:2,name:"docker/x86/linux"}
+ ]
+ setModels(list);
+ },[])
// 选择选项
function chooseOption(id,k){
@@ -14,7 +23,7 @@ function Choosen({name,options,chooseFunc}){
{name}
{
- options && options.map((item,key)=>{
+ models && models.map((item,key)=>{
return(
- chooseOption(item.id,key+1)}>{item.name}
)
diff --git a/src/forge/DevOps/Dispose/Init.jsx b/src/forge/DevOps/Dispose/Init.jsx
index a4ab5d10..939028d9 100644
--- a/src/forge/DevOps/Dispose/Init.jsx
+++ b/src/forge/DevOps/Dispose/Init.jsx
@@ -6,16 +6,8 @@ import Editors from './Editors';
function Init(){
const [ name , setName ] = useState(undefined);
const [ modelsId , setModelsId ] = useState(undefined);
- const [ models , setModels ] = useState(undefined);
const [ ymlValue , setYmlValue ] = useState(undefined);
- useEffect(()=>{
- let list = [
- {id:1,name:"docker/arm64/linux"},
- {id:2,name:"docker/x86/linux"}
- ]
- setModels(list);
- },[])
function chooseFunc(id){
setModelsId(id);
@@ -26,7 +18,7 @@ function Init(){
流水线名称:
setName(e.target.value)} placeholder="请输入名称" style={{width:"340px",margin:"6px 0px"}}/>
-
+
diff --git a/src/forge/DevOps/Dispose/Stage.jsx b/src/forge/DevOps/Dispose/Stage.jsx
new file mode 100644
index 00000000..147218b7
--- /dev/null
+++ b/src/forge/DevOps/Dispose/Stage.jsx
@@ -0,0 +1,45 @@
+import React , { useEffect , useState } from 'react';
+import { Button } from 'antd';
+import { Cancel } from '../../Component/layout';
+import Item from './StageItem';
+
+function Stage({}){
+ const [ stepList , setStepList ] = useState(undefined);
+
+ useEffect(()=>{
+ let l = [
+ {
+ "step_name": "编译构建-gradle",
+ "show_index": 1,
+ "content": "xxxxxxxxxxx",
+ "template_id":1
+ },
+ {
+ "step_name": "编译构建-maven",
+ "show_index": 1,
+ "content": "xxxxxxxxxxx",
+ "template_id":1
+ }
+ ]
+ setStepList(l);
+ },[])
+
+ return(
+
+ {
+ stepList && stepList.map((item,key)=>{
+ return(
+
-
+ )
+ })
+ }
+ + 添加步骤
+
+
+
+ 删除
+
+
+ )
+}
+export default Stage;
\ No newline at end of file
diff --git a/src/forge/DevOps/Dispose/StageItem.jsx b/src/forge/DevOps/Dispose/StageItem.jsx
new file mode 100644
index 00000000..882ee4ef
--- /dev/null
+++ b/src/forge/DevOps/Dispose/StageItem.jsx
@@ -0,0 +1,27 @@
+import React , { useEffect , useState } from 'react';
+import { FlexAJ } from '../../Component/layout';
+import Editors from './Editors';
+
+
+function StageItem({item}){
+ const [ value , setValue ] = useState(undefined);
+
+ function onChangevalue(value){
+ console.log(value);
+ }
+ return(
+
+
+ {item.step_name}
+
+
+
+
+
+
+
+
+
+ )
+}
+export default StageItem;
\ No newline at end of file
diff --git a/src/forge/DevOps/Dispose/menusRename.jsx b/src/forge/DevOps/Dispose/menusRename.jsx
index de83f39a..73f1af75 100644
--- a/src/forge/DevOps/Dispose/menusRename.jsx
+++ b/src/forge/DevOps/Dispose/menusRename.jsx
@@ -1,6 +1,7 @@
import React , { useEffect , useState } from 'react';
import { Input } from 'antd';
+const regexp = /[^a-zA-Z0-9_]/g;
function menusRename({ name , edit }){
const [ n , setN ] = useState(undefined);
@@ -27,8 +28,8 @@ function menusRename({ name , edit }){
{ show &&
e.stopPropagation()} onBlur={blurInput} style={{width:"75px"}} onChange={(e)=>setN(e.target.value)}/>
}
+ { !show && edit && }
- { !show && edit && }
)
}
diff --git a/src/forge/DevOps/disposePipeline.jsx b/src/forge/DevOps/disposePipeline.jsx
index 450ca928..f7bd53a1 100644
--- a/src/forge/DevOps/disposePipeline.jsx
+++ b/src/forge/DevOps/disposePipeline.jsx
@@ -1,9 +1,10 @@
import React , { useEffect , useState } from 'react';
-import { WhiteBack , Banner } from '../Component/layout';
+import { WhiteBack } from '../Component/layout';
import Head from './Dispose/head';
import Menus from './Dispose/menus';
import Init from './Dispose/Init';
import Sure from './Dispose/Sure';
+import Stage from './Dispose/Stage';
function disposePipeline(){
@@ -31,10 +32,11 @@ function disposePipeline(){
{
- step === 1 &&
- }
- {
- menuList && (step === menuList.length) &&
+ step === 1 ?
+ :
+ menuList && (step === menuList.length) ?
+ :
+
}
diff --git a/src/forge/DevOps/ops.scss b/src/forge/DevOps/ops.scss
index f1e4bed7..a64cb48f 100644
--- a/src/forge/DevOps/ops.scss
+++ b/src/forge/DevOps/ops.scss
@@ -366,23 +366,20 @@
background-color: #1890FF;
content: "";
}
- & > div{
- width: 100%;
- }
.aboutEdit{
- position: relative;
+ width: 100%;
.operateName{
position: relative;
line-height: 20px;
+ & > i{
+ position: absolute;
+ right:-22px;
+ top:50%;
+ margin-top: -11px;
+ display: none;
+ }
}
- & > i{
- position: absolute;
- right:-22px;
- top:50%;
- margin-top: -16px;
- display: none;
- }
- &:hover > i{
+ &:hover i{
display: block;
}
}
@@ -453,4 +450,32 @@
background-color: #1890FF;
}
}
+}
+.addBtn{
+ display: block;
+ width: 100%;
+ border:1px solid #e1e4e8;
+ height: 48px;
+ line-height: 48px;
+ color: #1890FF;
+ font-size: 16px;
+ border-radius: 3px;
+ padding: 0px 20px;
+}
+.stepsItem{
+ border:1px solid #e1e4e8;
+ border-radius: 4px;
+ margin-bottom: 15px;
+ .stepsHead{
+ border-bottom: 1px solid #e1e4e8;
+ padding:8px 15px;
+ span > a > i{
+ margin-left: 8px;
+ color: #666!important;
+ }
+ }
+ .stepsBody{
+ padding:10px 15px;
+ background-color: rgb(251, 251, 251);
+ }
}
\ No newline at end of file