forked from Gitlink/forgeplus-react
github分支改为非必填
This commit is contained in:
parent
7c83425dba
commit
d973661c29
|
@ -13,14 +13,26 @@ function EditStore(props){
|
||||||
function submit() {
|
function submit() {
|
||||||
validateFields((error,values)=>{
|
validateFields((error,values)=>{
|
||||||
if(!error){
|
if(!error){
|
||||||
axios.post(`/${owner}/${projectsId}/synchronizes.json`,values).then(res=>{
|
// 处理空值
|
||||||
if(res && res.data.message === "success"){
|
for(let i in values){
|
||||||
message.success('绑定成功');
|
if(!values[i]){
|
||||||
window.location.href = `/${owner}/${projectsId}/server/reposyncer`;
|
delete values[i];
|
||||||
}else{
|
|
||||||
message.error('绑定失败');
|
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
|
const keysArr = Object.keys(values);
|
||||||
|
if(keysArr.indexOf('github_address') === -1 && keysArr.indexOf('gitee_address') === -1){
|
||||||
|
form.setFields({github_address: {value:values.github_address,errors:[new Error('请至少输入一个地址')]}});
|
||||||
|
form.setFields({gitee_address: {value:values.gitee_address,errors:[new Error('请至少输入一个地址')]}});
|
||||||
|
}else{
|
||||||
|
axios.post(`/${owner}/${projectsId}/synchronizes.json`,values).then(res=>{
|
||||||
|
if(res && res.data.message === "success"){
|
||||||
|
message.success('绑定成功');
|
||||||
|
window.location.href = `/${owner}/${projectsId}/server/reposyncer`;
|
||||||
|
}else{
|
||||||
|
message.error('绑定失败');
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -31,7 +43,7 @@ function EditStore(props){
|
||||||
<div className="storeTitle pb10 mb15"><img src={gitHub} alt="" className="storeLogo"/></div>
|
<div className="storeTitle pb10 mb15"><img src={gitHub} alt="" className="storeLogo"/></div>
|
||||||
<Form.Item label="Github同步仓库地址" className="storeFormItem">
|
<Form.Item label="Github同步仓库地址" className="storeFormItem">
|
||||||
{getFieldDecorator("github_address",{
|
{getFieldDecorator("github_address",{
|
||||||
rules:[{required: true, message: '请输入Github同步仓库地址'}]
|
rules:[]
|
||||||
})(
|
})(
|
||||||
<Input placeholder="请输入Github目标版本库地址" className="storeInput"/>
|
<Input placeholder="请输入Github目标版本库地址" className="storeInput"/>
|
||||||
)}
|
)}
|
||||||
|
|
|
@ -49,13 +49,13 @@ function StoreList(props){
|
||||||
{/* 已绑定仓库信息 */}
|
{/* 已绑定仓库信息 */}
|
||||||
{storeDetail && <div className="listStore mt20">
|
{storeDetail && <div className="listStore mt20">
|
||||||
<div className="storeTitle pb5 mb5 font-18">已绑定仓库地址<Icon type="exclamation-circle" style={{color: '#466aff'}} className="ml10 font-14"/><span className="ml5 font-14" style={{fontWeight: 'normal'}}>对已绑定的仓库,请添加同步分支实现分支的跨平台双向同步</span></div>
|
<div className="storeTitle pb5 mb5 font-18">已绑定仓库地址<Icon type="exclamation-circle" style={{color: '#466aff'}} className="ml10 font-14"/><span className="ml5 font-14" style={{fontWeight: 'normal'}}>对已绑定的仓库,请添加同步分支实现分支的跨平台双向同步</span></div>
|
||||||
<div className="showStoreInfo dashedBor">
|
{storeDetail && storeDetail.github_address && <div className="showStoreInfo dashedBor">
|
||||||
<div className="infoBox">
|
<div className="infoBox">
|
||||||
<div className="font-15 sTil"><img src={gitHub1} alt="" className="mr10"/><span>Github仓库地址</span></div>
|
<div className="font-15 sTil"><img src={gitHub1} alt="" className="mr10"/><span>Github仓库地址</span></div>
|
||||||
<Link className="linkSpan" to={`/${owner}/${projectsId}/server/reposyncer/record/${`github`}`}>{storeDetail && storeDetail.github_address}</Link>
|
<Link className="linkSpan" to={`/${owner}/${projectsId}/server/reposyncer/record/${`github`}`}>{storeDetail && storeDetail.github_address}</Link>
|
||||||
</div>
|
</div>
|
||||||
<Button style={{width: '94px', height:'36px', padding: 0}} className="blue_border_but" onClick={()=>{setVisibleNew(true);setCreateJobBy('Github')}}>新建同步分支</Button>
|
<Button style={{width: '94px', height:'36px', padding: 0}} className="blue_border_but" onClick={()=>{setVisibleNew(true);setCreateJobBy('Github')}}>新建同步分支</Button>
|
||||||
</div>
|
</div>}
|
||||||
{storeDetail && storeDetail.gitee_address && <div className="showStoreInfo">
|
{storeDetail && storeDetail.gitee_address && <div className="showStoreInfo">
|
||||||
<div className="infoBox">
|
<div className="infoBox">
|
||||||
<div className="font-15 sTil"><img src={gitee1} alt="" className="mr10"/><span>Gitee仓库地址</span></div>
|
<div className="font-15 sTil"><img src={gitee1} alt="" className="mr10"/><span>Gitee仓库地址</span></div>
|
||||||
|
@ -70,7 +70,7 @@ function StoreList(props){
|
||||||
title="取消绑定"
|
title="取消绑定"
|
||||||
visible={visible}
|
visible={visible}
|
||||||
onCancel={()=>{setVisible(false)}}
|
onCancel={()=>{setVisible(false)}}
|
||||||
footer={<div><Button style={{width: '90px', height:'36px'}} onClick={()=>{setVisible(false)}}>取消</Button><Button className="okBut" style={{width: '90px', height:'36px'}} onClick={updateStore}>确认取消</Button></div>}
|
footer={<div><Button style={{width: '90px', height:'36px'}} onClick={()=>{setVisible(false)}}>取消</Button><Button className="okBut" style={{width: '90px', height:'36px'}} onClick={updateStore}>确认清空</Button></div>}
|
||||||
width={535}
|
width={535}
|
||||||
className="cancelBound"
|
className="cancelBound"
|
||||||
>
|
>
|
||||||
|
|
|
@ -225,7 +225,7 @@
|
||||||
padding: 10px 25px;
|
padding: 10px 25px;
|
||||||
background-color: #f8f8f8;
|
background-color: #f8f8f8;
|
||||||
.ant-modal-title{
|
.ant-modal-title{
|
||||||
font-size: 14px;
|
font-size: 16px;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
font-weight: normal !important;
|
font-weight: normal !important;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue