From 904da46b8c971a988c6038b2a38f86e0d4b65a88 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 22 Jul 2020 15:50:08 +0800 Subject: [PATCH] =?UTF-8?q?git=E5=9C=B0=E5=9D=80=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Branch/CloneAddress.js | 1 + src/forge/DevOps/About.jsx | 113 +++++++++++++++++-------------- src/forge/Main/list.css | 48 +++++++++++++ 3 files changed, 110 insertions(+), 52 deletions(-) diff --git a/src/forge/Branch/CloneAddress.js b/src/forge/Branch/CloneAddress.js index 9010c2f7..0031407d 100644 --- a/src/forge/Branch/CloneAddress.js +++ b/src/forge/Branch/CloneAddress.js @@ -14,6 +14,7 @@ class CloneAddress extends Component { const { http_url, downloadUrl } = this.props; return (
+

版本库地址已变更,请基于新地址提交代码

{ http_url && HTTP } diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx index 21a8b7a6..5c1fd202 100644 --- a/src/forge/DevOps/About.jsx +++ b/src/forge/DevOps/About.jsx @@ -4,6 +4,7 @@ import { Blueback } from '../Component/layout'; import styled from 'styled-components'; import { Link } from 'react-router-dom'; import { Form , Input } from 'antd'; +import axios from 'axios'; const P = styled.p`{ width:200px; @@ -14,56 +15,64 @@ const P = styled.p`{ margin-top:30px; margin-bottom:30px!important; }`; -export default Form.create()( - forwardRef(({ form })=>{ - const { getFieldDecorator , validateFields } = form; +function About( props , ref){ + const { form: { getFieldDecorator , validateFields } } = props; + const helper = useCallback( + (label, name, rules, widget, isRequired) => ( + + {label} + + {getFieldDecorator(name, { rules, validateFirst: true })(widget)} + + + ), + [] + ); - const helper = useCallback( - (label, name, rules, widget, isRequired) => ( - - {label} - - {getFieldDecorator(name, { rules, validateFirst: true })(widget)} - - - ), - [] - ); - - function startActive(){ - validateFields((error,value)=>{ - if(!error){ - console.log(value); - } - }) - } - return( -
- -

定义DevOps工作流,帮助您检测bug、发布代码…

- 了解什么是DevOps? -
- {helper( - "服务器IP地址:", - "IP", - [{ required: true, message: "请输入服务器IP地址" }], - ,true - )} - {helper( - "服务器用户名:", - "username", - [{ required: true, message: "请输入服务器用户名" }], - ,true - )} - {helper( - "服务器密码:", - "password", - [{ required: true, message: "请输入服务器密码" }], - ,true - )} - - 开始激活 -
- ) - }) -) \ No newline at end of file + function startActive(){ + console.log(props); + validateFields((error,values)=>{ + if(!error){ + const url = `/dev_ops/cloud_accounts.json`; + axios.post(url,{ + ...values, + }).then(result=>{ + if(result){ + + } + }).catch(error=>{ + console.log(error); + }) + } + }) + } + return( +
+ +

定义DevOps工作流,帮助您检测bug、发布代码…

+ 了解什么是DevOps? +
+ {helper( + "服务器IP地址:", + "ip_num", + [{ required: true, message: "请输入服务器IP地址" }], + ,true + )} + {helper( + "服务器用户名:", + "account", + [{ required: true, message: "请输入服务器用户名" }], + ,true + )} + {helper( + "服务器密码:", + "secret", + [{ required: true, message: "请输入服务器密码" }], + ,true + )} + + 开始激活 +
+ ) +} +export default Form.create()(forwardRef(About)); \ No newline at end of file diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css index e9538aa2..66146ccd 100644 --- a/src/forge/Main/list.css +++ b/src/forge/Main/list.css @@ -332,6 +332,7 @@ border:1px solid #eee; background: #fff; margin-left: 20px; + position: relative; } .gitAddressClone > span{ display: flex; @@ -341,6 +342,53 @@ cursor: pointer; align-items: center; } +.addressTips{ + position: absolute; + font-size: 12px; + color: #FF6E21; + top:-34px; + left: 30px; + background-color: #fff; + border:1px solid #FE881D; + padding:0px 5px; + height: 28px; + line-height: 28px; +} +.addressTips>span{position: relative;display: block;} +.addressTips>span::before{ + box-sizing: content-box; + width: 0px; + height: 0px; + position: absolute; + top: 25px; + left:50%; + margin-left: -4px; + padding:0; + border-top:8px solid #FFFFFF; + border-bottom:8px solid transparent; + border-left:8px solid transparent; + border-right:8px solid transparent; + display: block; + content:''; + z-index: 12; +} +.addressTips>span::after{ + box-sizing: content-box; + width: 0px; + height: 0px; + position: absolute; + top: 26px; + left:50%; + margin-left: -4px; + padding:0; + border-top:8px solid #FE881D; + border-bottom:8px solid transparent; + border-left:8px solid transparent; + border-right:8px solid transparent; + display: block; + content:''; + z-index: 11; +} .gitAddressClone > span.addressType{ color: #4CACFF; }