diff --git a/src/forge/Server/reposyncer/component/editStore.jsx b/src/forge/Server/reposyncer/component/editStore.jsx index f4dba6162..fec18a5d4 100644 --- a/src/forge/Server/reposyncer/component/editStore.jsx +++ b/src/forge/Server/reposyncer/component/editStore.jsx @@ -21,8 +21,13 @@ function EditStore(props){ } const keysArr = Object.keys(values); if(keysArr.indexOf('github_address') === -1 && keysArr.indexOf('gitee_address') === -1){ + // 校验必填一个github或者gitee地址 form.setFields({github_address: {value:values.github_address,errors:[new Error('请至少输入一个地址')]}}); form.setFields({gitee_address: {value:values.gitee_address,errors:[new Error('请至少输入一个地址')]}}); + }else if(keysArr.indexOf('github_address') !== -1 && keysArr.indexOf('github_token') === -1){ + form.setFields({github_token: {value:values.github_token,errors:[new Error('请输入Github的授权token')]}}); + }else if(keysArr.indexOf('gitee_address') !== -1 && keysArr.indexOf('gitee_token') === -1){ + form.setFields({gitee_token: {value:values.gitee_token,errors:[new Error('请输入Gitee的授权token')]}}); }else{ axios.post(`/${owner}/${projectsId}/synchronizes.json`,values).then(res=>{ if(res && res.data.message === "success"){ @@ -73,7 +78,7 @@ function EditStore(props){
1、在开启仓库同步前,您需要绑定并授权目标同步仓库;
2、完成仓库绑定后,需对仓库内的分支进行二次绑定。当已绑定的分支有代码提交、代码推送变更,将实时同步更新至其他仓库;
- 3、目前仅提供Github与Gitee平台的仓库同步功能,其中Github仓库为必填项;每个平台支持同时同步一个仓库; + 3、目前仅提供Github与Gitee平台的仓库同步功能,每个平台支持同时同步一个仓库;
diff --git a/src/forge/Server/reposyncer/component/recordList.jsx b/src/forge/Server/reposyncer/component/recordList.jsx index 24d520fc8..f5387a59b 100644 --- a/src/forge/Server/reposyncer/component/recordList.jsx +++ b/src/forge/Server/reposyncer/component/recordList.jsx @@ -76,9 +76,8 @@ function RecordList(props){ const expandRow = (record) => { return logInfo && logInfo.length > 0 ?
{logInfo.map(item=>{ - const keys = Object.keys(item); return
- {keys.map((i, index)=>{return

{i}: {item[i]}

})} + {item.create_time + ' [' + item.log_type + '] ' + item.log}
})}
: } @@ -126,10 +125,11 @@ function RecordList(props){
{type === 'github' ? 'Github' : 'Gitee'}仓库地址 - {storeDetail && (type === 'github' ? storeDetail.github_address : storeDetail.gitee_address)} + {storeDetail && {type === 'github' ? storeDetail.github_address : storeDetail.gitee_address}}
已绑定仓库地址对已绑定的仓库,请添加同步分支实现分支的跨平台双向同步
{storeDetail && storeDetail.github_address &&
-
+
Github仓库地址
- {storeDetail && storeDetail.github_address} + {storeDetail && storeDetail.github_address} +
+
+ +
-
} {storeDetail && storeDetail.gitee_address &&
-
+
Gitee仓库地址
- {storeDetail.gitee_address} + {storeDetail.gitee_address} +
+
+ +
-
} {/* */} diff --git a/src/forge/Server/reposyncer/index.scss b/src/forge/Server/reposyncer/index.scss index 263063814..449531821 100644 --- a/src/forge/Server/reposyncer/index.scss +++ b/src/forge/Server/reposyncer/index.scss @@ -101,6 +101,9 @@ } } .storeListBox{ + .storeListTable{ + width: 100%; + } .blueSpan{ color: $primary-color; } @@ -122,7 +125,7 @@ .storeFormItem{ width: 70%; } - .has-error .ant-input, .has-error .ant-input:hover{ + .has-error .ant-input, .has-error .ant-input:hover, .has-error .storeInput .ant-input{ border-color:#f60011; } #gitHubToken, #giteeToken, .storeInput{ @@ -153,6 +156,7 @@ color:$primary-color; &:hover{color: $primary-color-hover;} } + .storeInfoBox{color: #666;} .sTil{ color:#202d40; display: flex; @@ -165,6 +169,7 @@ margin: -16px; padding-bottom: 16px; .expandCont{ + word-break: break-all; padding: 16px 16px 0; } }