diff --git a/src/forge/Server/reposyncer/component/editStore.jsx b/src/forge/Server/reposyncer/component/editStore.jsx index 1c88d175..f4dba616 100644 --- a/src/forge/Server/reposyncer/component/editStore.jsx +++ b/src/forge/Server/reposyncer/component/editStore.jsx @@ -13,14 +13,26 @@ function EditStore(props){ function submit() { validateFields((error,values)=>{ if(!error){ - 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('绑定失败'); + // 处理空值 + for(let i in values){ + if(!values[i]){ + delete values[i]; } - }) + } + 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){
{getFieldDecorator("github_address",{ - rules:[{required: true, message: '请输入Github同步仓库地址'}] + rules:[] })( )} diff --git a/src/forge/Server/reposyncer/component/storeList.jsx b/src/forge/Server/reposyncer/component/storeList.jsx index 068a4128..2b4488b4 100644 --- a/src/forge/Server/reposyncer/component/storeList.jsx +++ b/src/forge/Server/reposyncer/component/storeList.jsx @@ -49,13 +49,13 @@ function StoreList(props){ {/* 已绑定仓库信息 */} {storeDetail &&
已绑定仓库地址对已绑定的仓库,请添加同步分支实现分支的跨平台双向同步
-
+ {storeDetail && storeDetail.github_address &&
Github仓库地址
{storeDetail && storeDetail.github_address}
-
+
} {storeDetail && storeDetail.gitee_address &&
Gitee仓库地址
@@ -70,7 +70,7 @@ function StoreList(props){ title="取消绑定" visible={visible} onCancel={()=>{setVisible(false)}} - footer={
} + footer={
} width={535} className="cancelBound" > diff --git a/src/forge/Server/reposyncer/index.scss b/src/forge/Server/reposyncer/index.scss index 93868710..26306381 100644 --- a/src/forge/Server/reposyncer/index.scss +++ b/src/forge/Server/reposyncer/index.scss @@ -225,7 +225,7 @@ padding: 10px 25px; background-color: #f8f8f8; .ant-modal-title{ - font-size: 14px; + font-size: 16px; text-align: left; font-weight: normal !important; }