Gitlink
/
forgeplus-react
39
0
Fork 30
Code Issues Pull Requests Releases 1 Wiki Activity

修改projects路由

This commit is contained in:
何童崇 2021-09-01 09:33:22 +08:00
parent 662a758980
commit 01b3ee8d49
72 changed files with 336 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/App.js
View File

@ -245,7 +245,7 @@ class App extends Component {
{/* <Router> */} {/* <Router> */}
<Switch> <Switch>
{/* wiki预览 */} {/* wiki预览 */}
<Route path="/projects/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={ <Route path="/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
(props) => { (props) => {
return (<WikiPreview {...this.props} {...props} {...this.state} />) return (<WikiPreview {...this.props} {...props} {...this.state} />)
} }
@ -253,7 +253,7 @@ class App extends Component {
{/*项目*/} {/*项目*/}
<Route <Route
path={"/projects/:owner/:projectId/devops/:opsId/detail"} path={"/:owner/:projectId/devops/:opsId/detail"}
render={ render={
(props) => { (props) => {
return (<OpsDetail {...this.props} {...props} {...this.state} />) return (<OpsDetail {...this.props} {...props} {...this.state} />)
@ -268,15 +268,7 @@ class App extends Component {
} }
}> }>
</Route> </Route>
{/*项目*/}
<Route
path={"/projects"}
render={
(props) => {
return (<Projects {...this.props} {...props} {...this.state} />)
}
}>
</Route>
<Route <Route
path="/register" path="/register"
render={ render={
@ -307,6 +299,15 @@ class App extends Component {
} }
/> />
{/* <Route
path={"/:owner/:projectsId"}
render={
(props) => {
return (<Projects {...this.props} {...props} {...this.state} />)
}
}>
</Route> */}
{/* 判断为用户/组织，并进入对应页面 */} {/* 判断为用户/组织，并进入对应页面 */}
{ {
pathType === 'User' ? pathType === 'User' ?
@ -334,6 +335,15 @@ class App extends Component {
/> />
} }
{/*项目*/}
<Route
path={"/projects"}
render={
(props) => {
return (<Projects {...this.props} {...props} {...this.state} />)
}
}>
</Route>
{/* 组织 */} {/* 组织 */}
<Route path={"/organize"} <Route path={"/organize"}

2
src/AppConfig.js
View File

@ -85,7 +85,7 @@ export function initAxiosInterceptors(props) {
} }
if (response.data.status === 404) { if (response.data.status === 404) {
let responseURL = response.data.request.responseURL; let responseURL = response.data.request ? response.data.request.responseURL:'';
if (responseURL.indexOf('/api/users/') === -1 && responseURL.indexOf('/api/organizations/') === -1) { if (responseURL.indexOf('/api/users/') === -1 && responseURL.indexOf('/api/organizations/') === -1) {
locationurl('/nopage'); locationurl('/nopage');
} }

6
src/forge/Activity/ActivityItem.js
View File

@ -14,20 +14,20 @@ class ActivityItem extends Component {
{/* 如果是版本发布 */} {/* 如果是版本发布 */}
{item.trend_type === "VersionRelease" ? {item.trend_type === "VersionRelease" ?
<p className="itemLine"> <p className="itemLine">
<Link to={`/projects/${owner}/${projectsId}/version`} className="color-blue font-16">{item.name}</Link> <Link to={`/${owner}/${projectsId}/version`} className="color-blue font-16">{item.name}</Link>
<span className="activity_type">{item.trend_type}</span> <span className="activity_type">{item.trend_type}</span>
</p > </p >
: :
// 如果是任务 // 如果是任务
item.trend_type === "Issue" ? item.trend_type === "Issue" ?
<p className="itemLine"> <p className="itemLine">
<Link to={`/projects/${owner}/${projectsId}/issues/${item.trend_id}/detail`} className="color-blue font-16">{item.name}</Link> <Link to={`/${owner}/${projectsId}/issues/${item.trend_id}/detail`} className="color-blue font-16">{item.name}</Link>
<span className="activity_type">{item.trend_type}</span> <span className="activity_type">{item.trend_type}</span>
</p > </p >
: :
// 如果是合并请求 // 如果是合并请求
<p className="itemLine"> <p className="itemLine">
<Link to={`/projects/${owner}/${projectsId}/pulls/${item.trend_id}/Messagecount`} className="color-blue font-16">{item.name}</Link> <Link to={`/${owner}/${projectsId}/pulls/${item.trend_id}/Messagecount`} className="color-blue font-16">{item.name}</Link>
<span className="activity_type">{item.trend_type}</span> <span className="activity_type">{item.trend_type}</span>
</p > </p >
} }

2
src/forge/Component/Contributors.jsx
View File

@ -137,7 +137,7 @@ function Contributors({contributors,owner,projectsId}){
<div className="halfs"> <div className="halfs">
<FlexAJ> <FlexAJ>
<AlignCenter><span className="font-16 color-grey-6">贡献者</span>{ contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}</AlignCenter> <AlignCenter><span className="font-16 color-grey-6">贡献者</span>{ contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}</AlignCenter>
<Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/contribute`}>全部</Link> <Link className="font-12 color-grey-9" to={`/${owner}/${projectsId}/contribute`}>全部</Link>
</FlexAJ> </FlexAJ>
<div className="attrPerson" onMouseLeave={()=>setVisibleFunc(false)}> <div className="attrPerson" onMouseLeave={()=>setVisibleFunc(false)}>
{ {

2
src/forge/Component/DrawerPanel.jsx
View File

@ -78,7 +78,7 @@ function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , li
if(dataref.type==="file"){ if(dataref.type==="file"){
onClose(); onClose();
let value = turnbar(branch); let value = turnbar(branch);
history.push(`/projects/${owner}/${projectsId}/tree/${value}/${dataref.path}`); history.push(`/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
} }
} }

6
src/forge/Component/Releases.jsx
View File

@ -11,9 +11,9 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
{ releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>} { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
</AlignCenter> </AlignCenter>
{ (releaseVersions && releaseVersions.total_count > 0) || projectType ===2 ? { (releaseVersions && releaseVersions.total_count > 0) || projectType ===2 ?
<Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/releases`}>全部</Link> <Link className="font-12 color-grey-9" to={`/${owner}/${projectsId}/releases`}>全部</Link>
: :
baseOperate && <Link className="font-12 color-blue" to={`/projects/${owner}/${projectsId}/releases/new`}>新建</Link> baseOperate && <Link className="font-12 color-blue" to={`/${owner}/${projectsId}/releases/new`}>新建</Link>
} }
</FlexAJ> </FlexAJ>
{ {
@ -24,7 +24,7 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
<i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i> <i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i>
<div> <div>
<p className="font-16 color-grey-6"> <p className="font-16 color-grey-6">
<Link to={`/projects/${owner}/${projectsId}/releases`}>{item.name}</Link> <Link to={`/${owner}/${projectsId}/releases`}>{item.name}</Link>
<span className="font-12 laterest ml5">最新</span> <span className="font-12 laterest ml5">最新</span>
</p> </p>
<p className="color-grey-9 font-13">{item.created_at}</p> <p className="color-grey-9 font-13">{item.created_at}</p>

2
src/forge/DevOps/About.jsx
View File

@ -149,7 +149,7 @@ function About(props, ref) {
axios.post(url).then(result=>{ axios.post(url).then(result=>{
setIsSpining(false); setIsSpining(false);
if(result && result.data.status === 0){ if(result && result.data.status === 0){
props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`); props.history.push(`/${owner}/${projectsId}/devops/dispose`);
// 需要将顶部的open_devops修改 // 需要将顶部的open_devops修改
let { changeOpenDevops } = props; let { changeOpenDevops } = props;
changeOpenDevops && changeOpenDevops(true); changeOpenDevops && changeOpenDevops(true);

6
src/forge/DevOps/Dispose.jsx
View File

@ -96,7 +96,7 @@ function Dispose(props){
setVisible(false); setVisible(false);
if(result && result.data){ if(result && result.data){
props.showNotification("流水线新增成功，请进行工作流配置！"); props.showNotification("流水线新增成功，请进行工作流配置！");
props.history.push(`/projects/${owner}/${projectsId}/devops/dispose/${result.data.id}`); props.history.push(`/${owner}/${projectsId}/devops/dispose/${result.data.id}`);
}else{ }else{
props.showNotification("流水线新增失败，请稍后再试！"); props.showNotification("流水线新增失败，请稍后再试！");
} }
@ -134,12 +134,12 @@ function Dispose(props){
// 模板管理 // 模板管理
function toModalManage(){ function toModalManage(){
props.history.push(`/projects/${owner}/${projectsId}/devops/mould`); props.history.push(`/${owner}/${projectsId}/devops/mould`);
} }
// 参数管理 // 参数管理
function toparameter(){ function toparameter(){
props.history.push(`/projects/${owner}/${projectsId}/devops/params`); props.history.push(`/${owner}/${projectsId}/devops/params`);
} }
const operate = current_user && (permission && permission !== "Reporter"); const operate = current_user && (permission && permission !== "Reporter");

6
src/forge/DevOps/Dispose/List.jsx
View File

@ -73,7 +73,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
render:(value,item)=>{ render:(value,item)=>{
let v = turnbar(item.branch); let v = turnbar(item.branch);
return( return(
<Link to={`/projects/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link> <Link to={`/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
) )
} }
}, },
@ -117,7 +117,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
return( return(
<span> <span>
{ operate ? { operate ?
<Link to={`/projects/${owner}/${projectsId}/devops/dispose/${item.id}`} className="mr10 color-grey-6"> <Link to={`/${owner}/${projectsId}/devops/dispose/${item.id}`} className="mr10 color-grey-6">
<i className="iconfont icon-zaibianji font-13 mr3"></i>编辑</Link> :"" <i className="iconfont icon-zaibianji font-13 mr3"></i>编辑</Link> :""
} }
{ operate ? { operate ?
@ -125,7 +125,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
<a className="mr10 color-grey-6"><i className="iconfont icon-lajitong font-13 mr3"></i>删除</a> <a className="mr10 color-grey-6"><i className="iconfont icon-lajitong font-13 mr3"></i>删除</a>
</Popconfirm>:"" </Popconfirm>:""
} }
<Link to={`/projects/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link> <Link to={`/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
</span> </span>
) )
} }

14
src/forge/DevOps/Index.jsx
View File

@ -36,37 +36,37 @@ export default ((props)=>{
return( return(
<WhiteBack className="opsPanel"> <WhiteBack className="opsPanel">
<Switch {...props}> <Switch {...props}>
<Route path="/projects/:owner/:projectsId/devops/dispose/:disposeId" <Route path="/:owner/:projectsId/devops/dispose/:disposeId"
render={ render={
(p) => (<New {...props} {...p}/>) (p) => (<New {...props} {...p}/>)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/devops/params" <Route path="/:owner/:projectsId/devops/params"
render={ render={
(p) => (<Params {...props} {...p}/>) (p) => (<Params {...props} {...p}/>)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/devops/mould" <Route path="/:owner/:projectsId/devops/mould"
render={ render={
(p) => (<Mould {...props} {...p}/>) (p) => (<Mould {...props} {...p}/>)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/devops/dispose/new" <Route path="/:owner/:projectsId/devops/dispose/new"
render={ render={
(p) => (<New {...props} {...p}/>) (p) => (<New {...props} {...p}/>)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/devops/dispose" <Route path="/:owner/:projectsId/devops/dispose"
render={ render={
(p) => (<Dispose {...props} {...p}/>) (p) => (<Dispose {...props} {...p}/>)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/devops/list/:branch" <Route path="/:owner/:projectsId/devops/list/:branch"
render={ render={
(p) => (<Stucture {...props} {...p}/>) (p) => (<Stucture {...props} {...p}/>)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/devops" <Route path="/:owner/:projectsId/devops"
render={ render={
(p) => (<About {...props} {...p}/>) (p) => (<About {...props} {...p}/>)
} }

2
src/forge/DevOps/Infos.jsx
View File

@ -26,7 +26,7 @@ export default ((props)=>{
return( return(
<div className="disposePanel"> <div className="disposePanel">
<Banner> <Banner>
{ permission !=="Reporter" && <Link to={`/projects/${owner}/${props.match.params.projectsId}/devops/dispose`}>工作流配置</Link>} { permission !=="Reporter" && <Link to={`/${owner}/${props.match.params.projectsId}/devops/dispose`}>工作流配置</Link>}
</Banner> </Banner>
<Div> <Div>
<Dispost {...props}/> <Dispost {...props}/>

2
src/forge/DevOps/Manage/Params.jsx
View File

@ -104,7 +104,7 @@ function Params(props){
<Banner> <Banner>
<FlexAJ> <FlexAJ>
<span className="font-18">工作流 - 参数管理</span> <span className="font-18">工作流 - 参数管理</span>
<Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9 ml20">返回</Link> <Link to={`/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9 ml20">返回</Link>
</FlexAJ> </FlexAJ>
</Banner> </Banner>
<Div className="disposeList"> <Div className="disposeList">

2
src/forge/DevOps/Mould.jsx
View File

@ -126,7 +126,7 @@ function Mould(props){
<div> <div>
<New wrappedComponentRef={(f) => childRef.current = f} ref={childRef} visible={visible} onCancel={()=>setVisible(false)} onOk={onOk}></New> <New wrappedComponentRef={(f) => childRef.current = f} ref={childRef} visible={visible} onCancel={()=>setVisible(false)} onOk={onOk}></New>
<Banner> <Banner>
<FlexAJ><span>工作流 - 模板管理</span><Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9">返回</Link></FlexAJ> <FlexAJ><span>工作流 - 模板管理</span><Link to={`/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9">返回</Link></FlexAJ>
</Banner> </Banner>
<Div className="disposeList"> <Div className="disposeList">
<FlexAJ> <FlexAJ>

4
src/forge/DevOps/Structure.jsx
View File

@ -198,7 +198,7 @@ function Structure(props,ref){
} }
function clickRows(event,e){ function clickRows(event,e){
props.history.push(`/projects/${owner}/${projectsId}/devops/${e.number}/detail`); props.history.push(`/${owner}/${projectsId}/devops/${e.number}/detail`);
} }
const column = [ const column = [
{ {
@ -290,7 +290,7 @@ function Structure(props,ref){
<Banner> <Banner>
<FlexAJ> <FlexAJ>
<span>构建列表</span> <span>构建列表</span>
<Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-15 color-grey-9">返回</Link> <Link to={`/${owner}/${projectsId}/devops/dispose`} className="font-15 color-grey-9">返回</Link>
</FlexAJ> </FlexAJ>
</Banner> </Banner>
<Div> <Div>

2
src/forge/DevOps/disposePipeline.jsx
View File

@ -275,7 +275,7 @@ function disposePipeline(props){
...params ...params
}).then(result=>{ }).then(result=>{
if(result){ if(result){
props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`); props.history.push(`/${owner}/${projectsId}/devops/dispose`);
} }
setLoading(false); setLoading(false);
}).catch(error=>{ }).catch(error=>{

4
src/forge/DevOps/opsDetail.jsx
View File

@ -48,7 +48,7 @@ export default (props) => {
axios.post(url).then((result) => { axios.post(url).then((result) => {
if (result && result.data) { if (result && result.data) {
props.showNotification("工作流正在重新构建！"); props.showNotification("工作流正在重新构建！");
props.history.push(`/projects/${owner}/${projectId}/devops/${result.data.number}/detail`); props.history.push(`/${owner}/${projectId}/devops/${result.data.number}/detail`);
} }
}) })
.catch((error) => { .catch((error) => {
@ -87,7 +87,7 @@ export default (props) => {
</AlignCenter> </AlignCenter>
<Link <Link
style={{ color: "#ddd" }} style={{ color: "#ddd" }}
to={`/projects/${owner}/${projectId}/devops/dispose`} to={`/${owner}/${projectId}/devops/dispose`}
> >
<i className="iconfont icon-yiguanbi font-15 mr5"></i>退出 <i className="iconfont icon-yiguanbi font-15 mr5"></i>退出
</Link> </Link>

19
src/forge/Index.js
View File

@ -40,13 +40,13 @@ class Index extends Component {
<div className="newMain clearfix"> <div className="newMain clearfix">
<Switch {...this.props}> <Switch {...this.props}>
<Route <Route
path="/projects/:projectsType/new/:OIdentifier" path="/:projectsType/new/:OIdentifier"
render={(props) => ( render={(props) => (
<ProjectNew {...this.props} {...props} /> <ProjectNew {...this.props} {...props} />
)} )}
></Route> ></Route>
<Route <Route
path="/projects/:projectsType/new" path="/:projectsType/new"
render={(props) => ( render={(props) => (
<ProjectNew {...this.props} {...props} /> <ProjectNew {...this.props} {...props} />
)} )}
@ -58,17 +58,17 @@ class Index extends Component {
)} )}
></Route> ></Route>
<Route <Route
path="/projects/:owner/:projectsId" path="/:owner/:projectsId"
render={(props) => ( render={(props) => (
<ProjectDetail {...this.props} {...props} /> <ProjectDetail {...this.props} {...props} />
)} )}
></Route> ></Route>
<Route {/* <Route
path="/projects" path="/projects"
render={(props) => ( render={(props) => (
<ProjectIndex {...this.props} {...props} /> <ProjectIndex {...this.props} {...props} />
)} )}
></Route> ></Route> */}
<Route <Route
path="/" path="/"
render={(props) => ( render={(props) => (
@ -80,9 +80,16 @@ class Index extends Component {
); );
} }
} }
// export default withRouter(
// ImageLayerOfCommentHOC({
// imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
// parentSelector: ".newMain",
// })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
// );
export default withRouter( export default withRouter(
ImageLayerOfCommentHOC({ ImageLayerOfCommentHOC({
imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget", imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
parentSelector: ".newMain", parentSelector: ".newMain",
})(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index)))) })(Index)
); );

26
src/forge/Main/CoderDepot.jsx
View File

@ -112,7 +112,7 @@ function CoderDepot(props){
useEffect(()=>{ useEffect(()=>{
if (projectsId && owner && defaultBranch){ if (projectsId && owner && defaultBranch){
let b = turnbar(branchName) ; let b = turnbar(branchName) ;
if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) { if(pathname.indexOf(`/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
let url = pathname.split(`/tree/${b}/`)[1]; let url = pathname.split(`/tree/${b}/`)[1];
setTreeValue(url); setTreeValue(url);
getFileInfo(url,branchName); getFileInfo(url,branchName);
@ -199,7 +199,7 @@ function CoderDepot(props){
// 切换分支或者标签 // 切换分支或者标签
function changeBranch(value){ function changeBranch(value){
let checkvalue = turnbar(value); let checkvalue = turnbar(value);
let url = `/projects/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`; let url = `/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
props.history.push(url); props.history.push(url);
} }
@ -209,8 +209,8 @@ function CoderDepot(props){
let checkvalue = turnbar(b); let checkvalue = turnbar(b);
return ( return (
<Menu> <Menu>
<Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item> <Menu.Item><a onClick={()=>urlLink(`/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
<Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item> <Menu.Item><a onClick={()=>urlLink(`/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
</Menu> </Menu>
) )
} }
@ -229,12 +229,12 @@ function CoderDepot(props){
setTreeValue(undefined); setTreeValue(undefined);
let branch = branchName || defaultBranch; let branch = branchName || defaultBranch;
let checkvalue = turnbar(branch); let checkvalue = turnbar(branch);
props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}`); props.history.push(`/${owner}/${projectsId}/tree/${checkvalue}`);
}; };
// 子目录路径返回链接 // 子目录路径返回链接
function returnUlr(url){ function returnUlr(url){
let enBranch = turnbar(branchName); let enBranch = turnbar(branchName);
props.history.push(`/projects/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`); props.history.push(`/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
} }
// 点击跳转到子目录 // 点击跳转到子目录
function goToSubRoot(path,type,filename){ function goToSubRoot(path,type,filename){
@ -242,7 +242,7 @@ function CoderDepot(props){
let enBranch = branchName || defaultBranch; let enBranch = branchName || defaultBranch;
let checkvalue = turnbar(enBranch); let checkvalue = turnbar(enBranch);
setType(type); setType(type);
props.history.push(`/projects/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`); props.history.push(`/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
} }
} }
@ -254,7 +254,7 @@ function CoderDepot(props){
//点击直接跳转页面 加载一次路由 //点击直接跳转页面 加载一次路由
let enBranch = branchName || defaultBranch; let enBranch = branchName || defaultBranch;
let checkvalue = turnbar(enBranch); let checkvalue = turnbar(enBranch);
props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}/${path}`); props.history.push(`/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
setType("file"); setType("file");
setEditReadme(true); setEditReadme(true);
}; };
@ -346,13 +346,13 @@ function CoderDepot(props){
} }
</div> </div>
<AlignCenter className="mr20"> <AlignCenter className="mr20">
<Link to={`/projects/${owner}/${projectsId}/branchs`} className="color-grey-9"> <Link to={`/${owner}/${projectsId}/branchs`} className="color-grey-9">
<i className="iconfont icon-fenzhi2 font-18 color-grey-9 mr3"></i> <i className="iconfont icon-fenzhi2 font-18 color-grey-9 mr3"></i>
<span className="color-grey-6 mr3">{projectDetail && projectDetail.branches && projectDetail.branches.total_count}个</span>分支 <span className="color-grey-6 mr3">{projectDetail && projectDetail.branches && projectDetail.branches.total_count}个</span>分支
</Link> </Link>
</AlignCenter> </AlignCenter>
<AlignCenter className="mr20"> <AlignCenter className="mr20">
<Link to={`/projects/${owner}/${projectsId}/tag`} className="color-grey-9"> <Link to={`/${owner}/${projectsId}/tag`} className="color-grey-9">
<i className="iconfont icon-biaoqian3 font-16 color-grey-9 mr3"></i> <i className="iconfont icon-biaoqian3 font-16 color-grey-9 mr3"></i>
<span className="color-grey-6 mr3">{projectDetail && projectDetail.tags && projectDetail.tags.total_count}个</span>标签 <span className="color-grey-6 mr3">{projectDetail && projectDetail.tags && projectDetail.tags.total_count}个</span>标签
</Link> </Link>
@ -364,11 +364,11 @@ function CoderDepot(props){
<div className="mr20 addOptionBtn"> <div className="mr20 addOptionBtn">
{ {
projectDetail.type !== 2 && pullsFlag && projectDetail.type !== 2 && pullsFlag &&
<a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a> <a onClick={()=>urlLink(`/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
} }
{ {
issuesFlag && issuesFlag &&
<a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a> <a onClick={()=>urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
} }
</div> </div>
} }
@ -396,7 +396,7 @@ function CoderDepot(props){
{ hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> } { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }
<span className="ml12 color-grey-9 mt3">{lastCommit && lastCommit.time_from_now}</span> <span className="ml12 color-grey-9 mt3">{lastCommit && lastCommit.time_from_now}</span>
{ commitCount ? <Link to={`/projects/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml12 color-grey-9"> { commitCount ? <Link to={`/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml12 color-grey-9">
<i className="iconfont icon-tijiao mr3 font-17 color-grey-9"></i>{commitCount}次提交 <i className="iconfont icon-tijiao mr3 font-17 color-grey-9"></i>{commitCount}次提交
</Link>:"" } </Link>:"" }
</div> </div>

2
src/forge/Main/CoderDepotCatalogue.jsx
View File

@ -17,7 +17,7 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
</a> </a>
</span> </span>
<span title="init project"> <span title="init project">
<Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}> <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}>
{item.commit && item.commit.message} {item.commit && item.commit.message}
</Link> </Link>
</span> </span>

6
src/forge/Main/CoderRootBranch.js
View File

@ -38,9 +38,9 @@ export default ((props)=>{
return( return(
<li key={key}> <li key={key}>
<div> <div>
<Link to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link> <Link to={`/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
<p className="f-wrap-alignCenter mt15"> <p className="f-wrap-alignCenter mt15">
<Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link> <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
<span className="color-grey-3 hide-1 messages leftPoint">{item.last_commit && item.last_commit.message}</span> <span className="color-grey-3 hide-1 messages leftPoint">{item.last_commit && item.last_commit.message}</span>
<span className="color-grey-8 ml30">最后更新于{item.last_commit && item.last_commit.time_from_now}</span> <span className="color-grey-8 ml30">最后更新于{item.last_commit && item.last_commit.time_from_now}</span>
</p> </p>
@ -48,7 +48,7 @@ export default ((props)=>{
<span> <span>
{ {
(isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) && (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
<Link to={`/projects/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link> <Link to={`/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
} }
<Dropdown overlay={menu(item.zip_url,item.tar_url)} trigger={['click']} placement="bottomRight" className="color-green-file"> <Dropdown overlay={menu(item.zip_url,item.tar_url)} trigger={['click']} placement="bottomRight" className="color-green-file">
<a className="ant-dropdown-link"> <a className="ant-dropdown-link">

6
src/forge/Main/CoderRootCommit.js
View File

@ -101,7 +101,7 @@ class CoderRootCommit extends Component{
// 切换分支 search:tag为根据标签搜索 // 切换分支 search:tag为根据标签搜索
changeBranch=(value)=>{ changeBranch=(value)=>{
const { projectsId , owner } = this.props.match.params; const { projectsId , owner } = this.props.match.params;
this.props.history.push(`/projects/${owner}/${projectsId}/commits/branch/${value}`); this.props.history.push(`/${owner}/${projectsId}/commits/branch/${value}`);
} }
ChangePage=(page)=>{ ChangePage=(page)=>{
@ -141,8 +141,8 @@ class CoderRootCommit extends Component{
return( return(
<div key={k}> <div key={k}>
<AlignTop> <AlignTop>
<Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link> <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
<Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link> <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
</AlignTop> </AlignTop>
<p className="f-wrap-alignCenter mt15"> <p className="f-wrap-alignCenter mt15">
{ {

2
src/forge/Main/CoderRootFileDetail.js
View File

@ -149,7 +149,7 @@ class CoderRootFileDetail extends Component {
.then((result) => { .then((result) => {
if (result) { if (result) {
this.props.showNotification("删除成功!"); this.props.showNotification("删除成功!");
this.props.history.push(`/projects/${owner}/${projectsId}`); this.props.history.push(`/${owner}/${projectsId}`);
} }
}) })
.catch((error) => { .catch((error) => {

22
src/forge/Main/CoderRootIndex.js
View File

@ -87,57 +87,57 @@ class CoderRootIndex extends Component{
<Top {...this.props} {...this.state}/> <Top {...this.props} {...this.state}/>
<Switch {...this.props}> <Switch {...this.props}>
{/* 新建文件 */} {/* 新建文件 */}
<Route path="/projects/:owner/:projectsId/:branch/newfile/:path" <Route path="/:owner/:projectsId/:branch/newfile/:path"
render={ render={
(props) => (<FileNew {...this.props} {...props} {...this.state} />) (props) => (<FileNew {...this.props} {...props} {...this.state} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/:branch/uploadfile" <Route path="/:owner/:projectsId/:branch/uploadfile"
render={ render={
(props) => (<UploadFile {...this.props} {...props} {...this.state} />) (props) => (<UploadFile {...this.props} {...props} {...this.state} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/:branch/newfile" <Route path="/:owner/:projectsId/:branch/newfile"
render={ render={
(props) => (<FileNew {...this.props} {...props} {...this.state} getTopCount={this.getTopCount} />) (props) => (<FileNew {...this.props} {...props} {...this.state} getTopCount={this.getTopCount} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/commits/branch/:branchName" <Route path="/:owner/:projectsId/commits/branch/:branchName"
render={ render={
() => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount} />) () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/commits/:sha" <Route path="/:owner/:projectsId/commits/:sha"
render={ render={
(props) => (<Diff {...this.props} {...props} {...this.state}/>) (props) => (<Diff {...this.props} {...props} {...this.state}/>)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/commits" <Route path="/:owner/:projectsId/commits"
render={ render={
() => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount} />) () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/releases/:versionId/update" <Route path="/:owner/:projectsId/releases/:versionId/update"
render={ render={
(props) => (<CoderRootVersionUpdate {...this.props} {...this.state} {...props} />) (props) => (<CoderRootVersionUpdate {...this.props} {...this.state} {...props} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/releases/new" <Route path="/:owner/:projectsId/releases/new"
render={ render={
() => (<CoderRootVersionNew {...this.props} {...this.state} />) () => (<CoderRootVersionNew {...this.props} {...this.state} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/releases" <Route path="/:owner/:projectsId/releases"
render={ render={
() => (<CoderRootVersion {...this.props} {...this.state} />) () => (<CoderRootVersion {...this.props} {...this.state} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/tag" <Route path="/:owner/:projectsId/tag"
render={ render={
() => (<CoderRootTag {...this.props} {...this.state} />) () => (<CoderRootTag {...this.props} {...this.state} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/branchs" <Route path="/:owner/:projectsId/branchs"
render={ render={
() => (<CoderRootBranch {...this.props} {...this.state} />) () => (<CoderRootBranch {...this.props} {...this.state} />)
} }

2
src/forge/Main/CoderRootTag.js
View File

@ -49,7 +49,7 @@ export default (( props, { projectDetail }) => {
<span className="font-16">{item.name}</span> <span className="font-16">{item.name}</span>
</span> </span>
<span className="ul_tbody_third"> <span className="ul_tbody_third">
<Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link> <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link>
</span> </span>
<span className="ul_tbody_forth"> <span className="ul_tbody_forth">
<a href={item.tarball_url} style={{ color: "#4CC1DA" }} className="mr30"><i className="iconfont icon-TAR font-18 mr5"></i>TAR</a> <a href={item.tarball_url} style={{ color: "#4CC1DA" }} className="mr30"><i className="iconfont icon-TAR font-18 mr5"></i>TAR</a>

82
src/forge/Main/Detail.js
View File

@ -141,8 +141,8 @@ const WikiEdit = Loadable({
*/ */
function checkPathname(projectsId, owner, pathname) { function checkPathname(projectsId, owner, pathname) {
let name = ""; let name = "";
if (pathname && pathname !== `/projects/${owner}/${projectsId}`) { if (pathname && pathname !== `/${owner}/${projectsId}`) {
let url = pathname.split(`/projects/${owner}/${projectsId}`)[1]; let url = pathname.split(`/${owner}/${projectsId}`)[1];
if (url.indexOf("/about") > -1) { if (url.indexOf("/about") > -1) {
name = "about" name = "about"
} else if (url.indexOf("/issues") > -1 || url.indexOf("Milepost") > 0) { } else if (url.indexOf("/issues") > -1 || url.indexOf("Milepost") > 0) {
@ -404,7 +404,7 @@ class Detail extends Component {
const url = `/${owner}/${projectsId}/forks.json`; const url = `/${owner}/${projectsId}/forks.json`;
axios.post(url).then(result => { axios.post(url).then(result => {
if (result && result.data.status === 0) { if (result && result.data.status === 0) {
this.props.history.push(`/projects/${current_user && current_user.login}/${result.data.identifier}`); this.props.history.push(`/${current_user && current_user.login}/${result.data.identifier}`);
this.props.showNotification(result.data.message); this.props.showNotification(result.data.message);
} }
this.setState({ this.setState({
@ -442,7 +442,7 @@ class Detail extends Component {
<span>复刻自</span> <span>复刻自</span>
<Link to={`/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link> <Link to={`/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
<span> / </span> <span> / </span>
<Link to={`/projects/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{ maxWidth: "400px" }} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link> <Link to={`/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{ maxWidth: "400px" }} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
</div> : "" </div> : ""
} }
@ -479,7 +479,7 @@ class Detail extends Component {
<Link to={`/${project.author.login}`}>{project.author.name}</Link> <Link to={`/${project.author.login}`}>{project.author.name}</Link>
} }
<span className="ml5 mr5">/</span> <span className="ml5 mr5">/</span>
<Link to={`/projects/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link> <Link to={`/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
</div> </div>
{projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>} {projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
</AlignTop> </AlignTop>
@ -512,7 +512,7 @@ class Detail extends Component {
{ {
watchers_count > 0 ? watchers_count > 0 ?
platform ? platform ?
<Link className="detail_tag_btn_count" style={{ color: `${watched ? "#2878FF" : "#666"}` }} to={platform ? { pathname: `/projects/${owner}/${projectsId}/watchers`, state } : ""}> <Link className="detail_tag_btn_count" style={{ color: `${watched ? "#2878FF" : "#666"}` }} to={platform ? { pathname: `/${owner}/${projectsId}/watchers`, state } : ""}>
{watchers_count} {watchers_count}
</Link> </Link>
: :
@ -528,7 +528,7 @@ class Detail extends Component {
{ {
praises_count > 0 ? praises_count > 0 ?
platform ? platform ?
<Link className="detail_tag_btn_count" style={{ color: `${praised ? "#2878FF" : "#666"}` }} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}> <Link className="detail_tag_btn_count" style={{ color: `${praised ? "#2878FF" : "#666"}` }} to={{ pathname: `/${owner}/${projectsId}/stargazers`, state }}>
{praises_count} {praises_count}
</Link> : </Link> :
<span className="detail_tag_btn_count">{praises_count}</span> <span className="detail_tag_btn_count">{praises_count}</span>
@ -544,7 +544,7 @@ class Detail extends Component {
{ {
forked_count > 0 ? forked_count > 0 ?
platform ? platform ?
<Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}> <Link className="detail_tag_btn_count" to={{ pathname: `/${owner}/${projectsId}/fork_users`, state }}>
{forked_count} {forked_count}
</Link> </Link>
: :
@ -583,190 +583,190 @@ class Detail extends Component {
<Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large"> <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
<Switch {...this.props}> <Switch {...this.props}>
{/* 资源 */} {/* 资源 */}
<Route path="/projects/:owner/:projectsId/source" <Route path="/:owner/:projectsId/source"
render={ render={
() => (<Source {...this.props} {...this.state} {...common} />) () => (<Source {...this.props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 主页 */} {/* 主页 */}
<Route path="/projects/:owner/:projectsId/about" <Route path="/:owner/:projectsId/about"
render={ render={
() => (<DevAbout {...this.props} {...this.state} {...common} />) () => (<DevAbout {...this.props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* wiki新增文件 */} {/* wiki新增文件 */}
<Route path="/projects/:owner/:projectsId/wiki/add" <Route path="/:owner/:projectsId/wiki/add"
render={ render={
() => (<WikiEdit {...this.props} {...this.state} {...common} />) () => (<WikiEdit {...this.props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* wiki编辑文件 */} {/* wiki编辑文件 */}
<Route path="/projects/:owner/:projectsId/wiki/edit/:wikiName" <Route path="/:owner/:projectsId/wiki/edit/:wikiName"
render={ render={
() => (<WikiEdit {...this.props} {...this.state} {...common} />) () => (<WikiEdit {...this.props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* wiki */} {/* wiki */}
<Route path="/projects/:owner/:projectsId/wiki" <Route path="/:owner/:projectsId/wiki"
render={ render={
() => (<Wiki {...this.props} {...this.state} {...common} />) () => (<Wiki {...this.props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 工作流 */} {/* 工作流 */}
<Route path="/projects/:owner/:projectsId/devops" <Route path="/:owner/:projectsId/devops"
render={ render={
() => (<DevIndex {...this.props} {...this.state} {...common} />) () => (<DevIndex {...this.props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 标签列表 */} {/* 标签列表 */}
<Route path="/projects/:owner/:projectsId/issues/tags" <Route path="/:owner/:projectsId/issues/tags"
render={ render={
(props) => (<TagList {...this.props} {...props} {...this.state} {...common} />) (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 仓库设置 */} {/* 仓库设置 */}
<Route path="/projects/:owner/:projectsId/setting" <Route path="/:owner/:projectsId/setting"
render={ render={
(props) => (<Setting {...this.props} {...props} {...this.state} {...common} />) (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 任务详情 */} {/* 任务详情 */}
<Route path="/projects/:owner/:projectsId/issues/:orderId/detail" <Route path="/:owner/:projectsId/issues/:orderId/detail"
render={ render={
(props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />) (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
} }
></Route> ></Route>
{/*修改里程碑*/} {/*修改里程碑*/}
<Route path="/projects/:owner/:projectsId/milestones/:meilid/edit" <Route path="/:owner/:projectsId/milestones/:meilid/edit"
render={ render={
(props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />) (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 新建里程碑 */} {/* 新建里程碑 */}
<Route path="/projects/:owner/:projectsId/milestones/new" <Route path="/:owner/:projectsId/milestones/new"
render={ render={
(props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />) (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*里程碑详情*/} {/*里程碑详情*/}
<Route path="/projects/:owner/:projectsId/milestones/:meilid" <Route path="/:owner/:projectsId/milestones/:meilid"
render={ render={
(props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />) (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 里程碑 */} {/* 里程碑 */}
<Route path="/projects/:owner/:projectsId/milestones" <Route path="/:owner/:projectsId/milestones"
render={ render={
(props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />) (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 里程碑页面新建任务 */} {/* 里程碑页面新建任务 */}
<Route path="/projects/:owner/:projectsId/issues/:milepostId/new" <Route path="/:owner/:projectsId/issues/:milepostId/new"
render={ render={
(props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />) (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 新建任务 */} {/* 新建任务 */}
<Route path="/projects/:owner/:projectsId/issues/new" <Route path="/:owner/:projectsId/issues/new"
render={ render={
(props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />) (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 修改详情 */} {/* 修改详情 */}
<Route path="/projects/:owner/:projectsId/issues/:orderId/updatedetail" <Route path="/:owner/:projectsId/issues/:orderId/updatedetail"
render={ render={
(props) => (<OrderupdateDetail {...this.props} {...props} {...this.state} {...common} />) (props) => (<OrderupdateDetail {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 复制详情 */} {/* 复制详情 */}
<Route path="/projects/:owner/:projectsId/issues/:orderId/copyetail" <Route path="/:owner/:projectsId/issues/:orderId/copyetail"
render={ render={
(props) => (<OrdercopyDetail {...this.props} {...props} {...this.state} {...common} />) (props) => (<OrdercopyDetail {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 动态 */} {/* 动态 */}
<Route path="/projects/:owner/:projectsId/activity" <Route path="/:owner/:projectsId/activity"
render={ render={
(props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />) (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 代码Index */} {/* 代码Index */}
<Route path="/projects/:owner/:projectsId/issues" <Route path="/:owner/:projectsId/issues"
render={ render={
(props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />) (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 新建合并请求 */} {/* 新建合并请求 */}
<Route path="/projects/:owner/:projectsId/pulls/new/:branch" <Route path="/:owner/:projectsId/pulls/new/:branch"
render={ render={
(props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />) (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/pulls/new" <Route path="/:owner/:projectsId/pulls/new"
render={ render={
(props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />) (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/pulls/:mergeId/UpdateMerge" <Route path="/:owner/:projectsId/pulls/:mergeId/UpdateMerge"
render={ render={
(props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />) (props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/pulls/:mergeId/Messagecount" <Route path="/:owner/:projectsId/pulls/:mergeId/Messagecount"
render={ render={
(props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />) (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/pulls/:mergeId/MergeSubmit" <Route path="/:owner/:projectsId/pulls/:mergeId/MergeSubmit"
render={ render={
(props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />) (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/pulls" <Route path="/:owner/:projectsId/pulls"
render={ render={
(props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />) (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/watchers" <Route path="/:owner/:projectsId/watchers"
render={ render={
(props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />) (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/stargazers" <Route path="/:owner/:projectsId/stargazers"
render={ render={
(props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />) (props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/fork_users" <Route path="/:owner/:projectsId/fork_users"
render={ render={
(props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />) (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 贡献者列表 */} {/* 贡献者列表 */}
<Route path="/projects/:owner/:projectsId/contribute" <Route path="/:owner/:projectsId/contribute"
render={ render={
() => (<Contribute {...this.props} {...this.state} {...common} />) () => (<Contribute {...this.props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 代码库----详情页面 */} {/* 代码库----详情页面 */}
<Route path="/projects/:owner/:projectsId/commits/branch/:branchName" <Route path="/:owner/:projectsId/commits/branch/:branchName"
render={ render={
(props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common} />) (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/tree/:branchName" <Route path="/:owner/:projectsId/tree/:branchName"
render={ render={
(props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />) (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId/:subIndex" <Route path="/:owner/:projectsId/:subIndex"
render={ render={
(props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />) (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/projects/:owner/:projectsId" <Route path="/:owner/:projectsId"
render={ render={
(props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />) (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
} }

8
src/forge/Main/DetailTop.js
View File

@ -12,19 +12,19 @@ class DetailTop extends Component {
{ {
platform ? platform ?
<React.Fragment> <React.Fragment>
<Link to={`/projects/${owner}/${projectsId}/commits`} className={pathname.indexOf("/commits") > 0 ? "active" : ""}> <Link to={`/${owner}/${projectsId}/commits`} className={pathname.indexOf("/commits") > 0 ? "active" : ""}>
<i className="iconfont icon-tijiaojilu font-20 mr3 font-bd"></i> <i className="iconfont icon-tijiaojilu font-20 mr3 font-bd"></i>
<span>{(coderCount && coderCount.commits_count) || 0}</span>个提交 <span>{(coderCount && coderCount.commits_count) || 0}</span>个提交
</Link> </Link>
<Link to={`/projects/${owner}/${projectsId}/branchs`} className={pathname.indexOf("/branchs") > 0 ? "active" : ""}> <Link to={`/${owner}/${projectsId}/branchs`} className={pathname.indexOf("/branchs") > 0 ? "active" : ""}>
<i className="iconfont icon-fenzhi1 font-18 mr3"></i> <i className="iconfont icon-fenzhi1 font-18 mr3"></i>
<span>{(coderCount && coderCount.branches_count) || 0}</span>个分支 <span>{(coderCount && coderCount.branches_count) || 0}</span>个分支
</Link> </Link>
<Link to={`/projects/${owner}/${projectsId}/tag`} className={pathname.indexOf("/tag") > 0 ? "active" : ""}> <Link to={`/${owner}/${projectsId}/tag`} className={pathname.indexOf("/tag") > 0 ? "active" : ""}>
<i className="iconfont icon-biaoqian3 font-18 mr3"></i> <i className="iconfont icon-biaoqian3 font-18 mr3"></i>
<span>{(coderCount && coderCount.tags_count) || 0}</span>个标签 <span>{(coderCount && coderCount.tags_count) || 0}</span>个标签
</Link> </Link>
<Link to={`/projects/${owner}/${projectsId}/releases`} className={pathname.indexOf("/releases") > 0 ? "active" : ""}> <Link to={`/${owner}/${projectsId}/releases`} className={pathname.indexOf("/releases") > 0 ? "active" : ""}>
<i className="iconfont icon-fahangban font-18 mr3"></i> <i className="iconfont icon-fahangban font-18 mr3"></i>
<span>{(coderCount && coderCount.version_releasesed_count) || 0}</span>个发行版 <span>{(coderCount && coderCount.version_releasesed_count) || 0}</span>个发行版
</Link> </Link>

2
src/forge/Main/Diff.jsx
View File

@ -59,7 +59,7 @@ export default ({ match , history }) => {
{commit && commit.message && {commit && commit.message &&
<pre className="task-hide" style={{marginBottom:"0px",height:"28px",whiteSpace:"pre-wrap"}}>{commit.message}</pre> <pre className="task-hide" style={{marginBottom:"0px",height:"28px",whiteSpace:"pre-wrap"}}>{commit.message}</pre>
} }
<Button type="primary" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button> <Button type="primary" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
</div> </div>
</div> </div>
<div className="f-wrap-between" style={{ alignItems: "center" }}> <div className="f-wrap-between" style={{ alignItems: "center" }}>

2
src/forge/Main/Index.js
View File

@ -228,7 +228,7 @@ class Index extends Component {
} }
getoDetail=(login,identifier)=>{ getoDetail=(login,identifier)=>{
this.props.history.push(`/projects/${login}/${identifier}`); this.props.history.push(`/${login}/${identifier}`);
} }
// 选择语言类别 // 选择语言类别

2
src/forge/Main/IndexItem.js
View File

@ -35,7 +35,7 @@ class IndexItem extends Component {
<div className="p-r-Infos"> <div className="p-r-Infos">
<div className="p-r-name"> <div className="p-r-name">
<AlignCenter> <AlignCenter>
<Link to={`/projects/${item.author.login}/${item.identifier}`} title={`${item.author.name}/${item.name}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}> <Link to={`/${item.author.login}/${item.identifier}`} title={`${item.author.name}/${item.name}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
{item.author.name}/{item.name} {item.author.name}/{item.name}
</Link> </Link>
{ !item.is_public && <span className="privateTag">私有</span> } { !item.is_public && <span className="privateTag">私有</span> }

22
src/forge/Main/sub/DetailBanner.jsx
View File

@ -10,7 +10,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
if(pathname && pathname==="source"){ if(pathname && pathname==="source"){
let a = list.filter(item=>item.menu_name === "resources"); let a = list.filter(item=>item.menu_name === "resources");
if(a && a.length === 0){ if(a && a.length === 0){
history.push(`/projects/${owner}/${projectsId}`); history.push(`/${owner}/${projectsId}`);
} }
} }
setMenuName(list); setMenuName(list);
@ -28,7 +28,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
{ {
item.menu_name === "home" && item.menu_name === "home" &&
<li className={pathname==="about" ? "active" : ""}> <li className={pathname==="about" ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}/about`, state }}> <Link to={{ pathname: `/${owner}/${projectsId}/about`, state }}>
<i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuye1 color-grey-3 mr5 font-14":"iconfont icon-zhuye1 color-grey-6 font-14 mr5"}></i> <i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuye1 color-grey-3 mr5 font-14":"iconfont icon-zhuye1 color-grey-6 font-14 mr5"}></i>
<span>主页</span> <span>主页</span>
</Link> </Link>
@ -37,7 +37,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
{ {
item.menu_name === "code" && item.menu_name === "code" &&
<li className={(pathname==="" || urlFlag) ? "active" : ""}> <li className={(pathname==="" || urlFlag) ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}> <Link to={{ pathname: `/${owner}/${projectsId}`, state }}>
<i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-grey-3 mr5 font-14":"iconfont icon-daimaku color-grey-6 font-14 mr5"}></i> <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-grey-3 mr5 font-14":"iconfont icon-daimaku color-grey-6 font-14 mr5"}></i>
<span>代码库</span> <span>代码库</span>
</Link> </Link>
@ -47,7 +47,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
item.menu_name === "issues" && item.menu_name === "issues" &&
<li className={pathname==="issues" ? "active" : ""}> <li className={pathname==="issues" ? "active" : ""}>
<Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom"> <Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
<Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}> <Link to={{ pathname: `/${owner}/${projectsId}/issues`, state }}>
<i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i> <i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i>
<span>易修</span> <span>易修</span>
{projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""} {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
@ -58,7 +58,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
{ {
item.menu_name === "pulls" && projectDetail && parseInt(projectDetail.type) !== 2 && platform ? item.menu_name === "pulls" && projectDetail && parseInt(projectDetail.type) !== 2 && platform ?
<li className={pathname==="pulls" ? "active" : ""}> <li className={pathname==="pulls" ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}/pulls`, state }}> <Link to={{ pathname: `/${owner}/${projectsId}/pulls`, state }}>
<i className={pathname==="pulls" ? "iconfont icon-hebingqingqiu1 color-grey-3 mr5 font-14":"iconfont icon-hebingqingqiu1 color-grey-6 font-14 mr5"}></i> <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiu1 color-grey-3 mr5 font-14":"iconfont icon-hebingqingqiu1 color-grey-6 font-14 mr5"}></i>
<span>合并请求</span> <span>合并请求</span>
{projectDetail && projectDetail.pull_requests_count ? <span className="num">{projectDetail.pull_requests_count}</span> : ""} {projectDetail && projectDetail.pull_requests_count ? <span className="num">{projectDetail.pull_requests_count}</span> : ""}
@ -68,7 +68,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
{ {
item.menu_name === "wiki" && item.menu_name === "wiki" &&
<li className={pathname === "wiki" ? "active" : ""}> <li className={pathname === "wiki" ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}/wiki`, state }}> <Link to={{ pathname: `/${owner}/${projectsId}/wiki`, state }}>
<i className={pathname==="wiki" ? "iconfont icon-wiki_icon color-grey-3 mr5 font-14":"iconfont icon-wiki_icon color-grey-6 font-14 mr5"}></i> <i className={pathname==="wiki" ? "iconfont icon-wiki_icon color-grey-3 mr5 font-14":"iconfont icon-wiki_icon color-grey-6 font-14 mr5"}></i>
<span>Wiki</span> <span>Wiki</span>
</Link> </Link>
@ -77,7 +77,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
{ {
item.menu_name === "devops" && platform ? item.menu_name === "devops" && platform ?
<li className={pathname==="devops" ? "active" : ""}> <li className={pathname==="devops" ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}> <Link to={{ pathname: `/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
<i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流(beta版) <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流(beta版)
{projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""}
</Link> </Link>
@ -87,7 +87,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
{ {
// item.menu_name === "resources" && // item.menu_name === "resources" &&
// <li className={pathname==="source" ? "active" : ""}> // <li className={pathname==="source" ? "active" : ""}>
// <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}> // <Link to={{ pathname: `/${owner}/${projectsId}/source`, state }}>
// <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i> // <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
// <span>资源库</span> // <span>资源库</span>
// {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""} // {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
@ -97,7 +97,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
{ {
item.menu_name === "versions" && item.menu_name === "versions" &&
<li className={pathname==="milestones" ? "active" : ""}> <li className={pathname==="milestones" ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}> <Link to={{ pathname: `/${owner}/${projectsId}/milestones`, state }}>
<i className={pathname==="milestones" ? "iconfont icon-lichengbei color-grey-3 mr5 font-14":"iconfont icon-lichengbei color-grey-6 font-14 mr5"}></i> <i className={pathname==="milestones" ? "iconfont icon-lichengbei color-grey-3 mr5 font-14":"iconfont icon-lichengbei color-grey-6 font-14 mr5"}></i>
<span>里程碑</span> <span>里程碑</span>
{projectDetail && projectDetail.versions_count ? <span className="num">{projectDetail.versions_count}</span> :""} {projectDetail && projectDetail.versions_count ? <span className="num">{projectDetail.versions_count}</span> :""}
@ -107,7 +107,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
{ {
item.menu_name === "activity" && item.menu_name === "activity" &&
<li className={pathname==="activity" ? "active" : ""}> <li className={pathname==="activity" ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}/activity`, state }}> <Link to={{ pathname: `/${owner}/${projectsId}/activity`, state }}>
<i className={pathname==="activity" ? "iconfont icon-tongzhi color-grey-3 mr5 font-14":"iconfont icon-tongzhi color-grey-6 font-14 mr5"}></i> <i className={pathname==="activity" ? "iconfont icon-tongzhi color-grey-3 mr5 font-14":"iconfont icon-tongzhi color-grey-6 font-14 mr5"}></i>
<span>动态</span> <span>动态</span>
</Link> </Link>
@ -116,7 +116,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
{ {
item.menu_name === "setting" && item.menu_name === "setting" &&
<li className={pathname === "setting" ? "active" : ""}> <li className={pathname === "setting" ? "active" : ""}>
<Link to={`/projects/${owner}/${projectsId}/setting`}> <Link to={`/${owner}/${projectsId}/setting`}>
<i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i> <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
<span>仓库设置</span> <span>仓库设置</span>
</Link> </Link>

4
src/forge/Merge/Commits.jsx
View File

@ -16,10 +16,10 @@ function Commits({ commits , projectsId , owner }){
<div className="prInfo"> <div className="prInfo">
<FlexAJ> <FlexAJ>
<AlignCenter> <AlignCenter>
<Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link> <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
<p className="ml15 font-16 color-grey-3 task-hide" style={{maxWidth:"700px"}}>{item.message}</p> <p className="ml15 font-16 color-grey-3 task-hide" style={{maxWidth:"700px"}}>{item.message}</p>
</AlignCenter> </AlignCenter>
<Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link> <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
</FlexAJ> </FlexAJ>
<AlignCenter className="mt15"> <AlignCenter className="mt15">
<User url={getImageUrl(`/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span> <User url={getImageUrl(`/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>

2
src/forge/Merge/Files.jsx
View File

@ -47,7 +47,7 @@ function Files({data,history,owner,projectsId}){
<span>{item.name}</span> <span>{item.name}</span>
</AlignCenter> </AlignCenter>
<span> <span>
<Button className="mr20" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button> <Button className="mr20" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button>
<span className="color-green">+{item.addition}</span> <span className="color-green">+{item.addition}</span>
<span className="color-red ml20">-{item.deletion}</span> <span className="color-red ml20">-{item.deletion}</span>
</span> </span>

6
src/forge/Merge/MergeDetail.js
View File

@ -228,7 +228,7 @@ class MergeDetail extends Component {
<div> <div>
{ {
data && data.issue.user_permission ? data && data.issue.user_permission ?
<Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link> <Link to={`/${owner}/${projectsId}/pulls/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link>
: '' : ''
} }
</div> </div>
@ -248,8 +248,8 @@ class MergeDetail extends Component {
<div className="detailHeader-wrapper"> <div className="detailHeader-wrapper">
<div className="normal f-wrap-between"> <div className="normal f-wrap-between">
<ul className="headerMenu-wrapper"> <ul className="headerMenu-wrapper">
<li className={url.indexOf("Messagecount") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/Messagecount`}>对话内容</Link></li> <li className={url.indexOf("Messagecount") > 0 ? "active" : ""}><Link to={`/${owner}/${projectsId}/pulls/${mergeid}/Messagecount`}>对话内容</Link></li>
<li className={url.indexOf("MergeSubmit") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/MergeSubmit`}>代码提交</Link></li> <li className={url.indexOf("MergeSubmit") > 0 ? "active" : ""}><Link to={`/${owner}/${projectsId}/pulls/${mergeid}/MergeSubmit`}>代码提交</Link></li>
</ul> </ul>
</div> </div>
</div> </div>

10
src/forge/Merge/MergeItem.js
View File

@ -62,7 +62,7 @@ class MergeItem extends Component {
<p className="mb15 df" style={{ alignItems: "center" }}> <p className="mb15 df" style={{ alignItems: "center" }}>
<i className={`iconfont icon-hebingqingqiu1 font-14 mr3 i_${status}`}></i> <i className={`iconfont icon-hebingqingqiu1 font-14 mr3 i_${status}`}></i>
<Link <Link
to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`} to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10" className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10"
style={{ maxWidth: "300px" }} style={{ maxWidth: "300px" }}
> >
@ -109,7 +109,7 @@ class MergeItem extends Component {
item.pull_request_head && item.pull_request_head &&
<Tag className="pr-branch-tag"> <Tag className="pr-branch-tag">
<Link <Link
to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`} to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
className="maxW200px hide-1 ver-middle" className="maxW200px hide-1 ver-middle"
> >
{item.is_original {item.is_original
@ -133,7 +133,7 @@ class MergeItem extends Component {
item.pull_request_base && item.pull_request_base &&
<Tag className="pr-branch-tag"> <Tag className="pr-branch-tag">
<Link <Link
to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`} to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
className="maxW200px hide-1 ver-middle" className="maxW200px hide-1 ver-middle"
> >
{/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */} {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
@ -175,7 +175,7 @@ class MergeItem extends Component {
{item.journals_count ? ( {item.journals_count ? (
<Link <Link
className="mr5 color-grey-8" className="mr5 color-grey-8"
to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`} to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
> >
<i className="iconfont icon-huifu1 font-15 mr5 ver-middle"></i> <i className="iconfont icon-huifu1 font-15 mr5 ver-middle"></i>
{item.journals_count} {item.journals_count}
@ -196,7 +196,7 @@ class MergeItem extends Component {
> >
<div className="grid-item mr15 color-grey-9"> <div className="grid-item mr15 color-grey-9">
<Link <Link
to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`} to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
className="color-grey-9" className="color-grey-9"
> >
<i className="iconfont icon-bianji3 font-14 mr5"></i> <i className="iconfont icon-bianji3 font-14 mr5"></i>

2
src/forge/Merge/MergeSubmit.js
View File

@ -110,7 +110,7 @@ class MergeSubmit extends Component{
title:"SHA", title:"SHA",
dataIndex: 'sha', dataIndex: 'sha',
render: (text) => ( render: (text) => (
<Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link> <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link>
) )
},{ },{
title:"备注", title:"备注",

6
src/forge/Merge/MessageCount.js
View File

@ -361,7 +361,7 @@ class MessageCount extends Component {
<div className="mt15"> <div className="mt15">
<Tag className="pr-branch-tag"> <Tag className="pr-branch-tag">
<Link <Link
to={`/projects/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`} to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
className="ver-middle" className="ver-middle"
> >
{data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {turnbar(data.pull_request && data.pull_request.head)} {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {turnbar(data.pull_request && data.pull_request.head)}
@ -376,7 +376,7 @@ class MessageCount extends Component {
</span> </span>
<Tag className="pr-branch-tag"> <Tag className="pr-branch-tag">
<Link <Link
to={`/projects/${owner}/${projectsId}/tree/${data.pull_request.base}`} to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
className="ver-middle" className="ver-middle"
> >
{data.issue.project_author_name}:{data.pull_request.base} {data.issue.project_author_name}:{data.pull_request.base}
@ -448,7 +448,7 @@ class MessageCount extends Component {
type="green" type="green"
ghost ghost
className="ml20" className="ml20"
onClick={()=>{this.props.history.push(`/projects/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}} onClick={()=>{this.props.history.push(`/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
> >
编辑 编辑
</Button> </Button>

4
src/forge/Merge/NewMerge.js
View File

@ -186,7 +186,7 @@ class NewMerge extends Component {
// this.ischeckmerge(); // this.ischeckmerge();
let { id ,merge , pull } = this.state; let { id ,merge , pull } = this.state;
if(type==="pull"){ if(type==="pull"){
this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new/${pull}`) this.props.history.push(`/${owner}/${projectsId}/pulls/new/${pull}`)
this.compareProject(id,value,merge); this.compareProject(id,value,merge);
}else{ }else{
this.compareProject(id,pull,value); this.compareProject(id,pull,value);
@ -208,7 +208,7 @@ class NewMerge extends Component {
merge_user_login: is_fork_id ? projects_names[0].project_user_login : undefined merge_user_login: is_fork_id ? projects_names[0].project_user_login : undefined
} }
}) })
this.props.history.push(`/projects/${login}/${identifier}/pulls/new`); this.props.history.push(`/${login}/${identifier}/pulls/new`);
this.newMergelist(login,identifier); this.newMergelist(login,identifier);
}; };

2
src/forge/Merge/merge.js
View File

@ -212,7 +212,7 @@ class merge extends Component {
checkOperation() { checkOperation() {
const { projectsId,owner } = this.props.match.params; const { projectsId,owner } = this.props.match.params;
this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`); this.props.history.push(`/${owner}/${projectsId}/pulls/new`);
} }
render() { render() {
const { projectsId , owner } = this.props.match.params; const { projectsId , owner } = this.props.match.params;

6
src/forge/Merge/merge_form.js
View File

@ -165,7 +165,7 @@ class MergeForm extends Component {
this.setState({ this.setState({
isSpin: false, isSpin: false,
}); });
this.props.history.push(`/projects/${owner}/${projectsId}/pulls`); this.props.history.push(`/${owner}/${projectsId}/pulls`);
const { getDetail } = this.props; const { getDetail } = this.props;
getDetail && getDetail(); getDetail && getDetail();
} else { } else {
@ -195,7 +195,7 @@ class MergeForm extends Component {
isSpin: false, isSpin: false,
}); });
this.props.history.push( this.props.history.push(
`/projects/${owner}/${projectsId}/pulls/${mergeId}/Messagecount` `/${owner}/${projectsId}/pulls/${mergeId}/Messagecount`
); );
} else { } else {
this.setState({ this.setState({
@ -287,7 +287,7 @@ class MergeForm extends Component {
type="default" type="default"
className="ml30" className="ml30"
onClick={()=>{ onClick={()=>{
this.props.history.push(merge_type === "new" ? `/projects/${owner}/${projectsId}/pulls` : `/projects/${owner}/${projectsId}/pulls/${mergeId}/detail`) this.props.history.push(merge_type === "new" ? `/${owner}/${projectsId}/pulls` : `/${owner}/${projectsId}/pulls/${mergeId}/detail`)
}} }}
> >
<span className="plr10">取消</span> <span className="plr10">取消</span>

2
src/forge/Merge/no_data.js
View File

@ -12,7 +12,7 @@ class Nodata extends Component{
<h3>欢迎使用合并请求！</h3> <h3>欢迎使用合并请求！</h3>
<div className="color-grey-8"> <div className="color-grey-8">
合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 <Link className="color-blue" to={`/projects/${owner}/${projectsId}/pulls/new`}>合并请求</Link> 合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 <Link className="color-blue" to={`/${owner}/${projectsId}/pulls/new`}>合并请求</Link>
</div> </div>
</div> </div>
</div> </div>

2
src/forge/New/Index.js
View File

@ -213,7 +213,7 @@ class Index extends Component {
isSpin: false isSpin: false
}) })
projectsType && projectsType !== "mirror" && this.props.showNotification(`托管项目创建成功!`); projectsType && projectsType !== "mirror" && this.props.showNotification(`托管项目创建成功!`);
this.props.history.push(`/projects/${result.data.login}/${result.data.identifier}`); this.props.history.push(`/${result.data.login}/${result.data.identifier}`);
} }
}).catch((error) => { }).catch((error) => {
this.setState({ this.setState({

6
src/forge/Newfile/UserSubmitComponent.js
View File

@ -86,7 +86,7 @@ class UserSubmitComponent extends Component {
const { getTopCount } = this.props; const { getTopCount } = this.props;
getTopCount && getTopCount(values.branchname); getTopCount && getTopCount(values.branchname);
} }
let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`; let url = `/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
this.props.history.push(url); this.props.history.push(url);
} }
}) })
@ -123,7 +123,7 @@ class UserSubmitComponent extends Component {
this.setState({ isSpin: false }); this.setState({ isSpin: false });
if (result.data && result.data.status === 1) { if (result.data && result.data.status === 1) {
let b = currentBranch || branch; let b = currentBranch || branch;
let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`; let url = `/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
this.props.history.push(url); this.props.history.push(url);
this.props.showNotification("文件修改成功!"); this.props.showNotification("文件修改成功!");
} }
@ -248,7 +248,7 @@ class UserSubmitComponent extends Component {
<Button <Button
type="primary grey" type="primary grey"
onClick={() => { onClick={() => {
this.props.history.push(`/projects/${owner}/${projectsId}`); this.props.history.push(`/${owner}/${projectsId}`);
}} }}
className="mr20" className="mr20"
> >

12
src/forge/Notice/Notify.jsx
View File

@ -44,13 +44,13 @@ function Notify(props){
if(status){ if(status){
switch(status){ switch(status){
case 'canceled': case 'canceled':
return <p>取消转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p> return <p>取消转移【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
case 'common': case 'common':
return <p>正在将【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库转移给【<Link to={`/${owner && owner.login}`}>{owner && owner.name}</Link>】</p> return <p>正在将【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库转移给【<Link to={`/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
case 'successed': case 'successed':
return <p>【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库成功转移给【<Link to={`/${owner && owner.login}`}>{owner && owner.name}</Link>】</p> return <p>【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库成功转移给【<Link to={`/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
default: default:
return <p>拒绝转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p> return <p>拒绝转移【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
} }
}else{ }else{
return "" return ""
@ -62,9 +62,9 @@ function Notify(props){
if(status){ if(status){
switch(status){ switch(status){
case 'successed': case 'successed':
return <p>已通过你加入【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p> return <p>已通过你加入【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
default: default:
return <p>已拒绝你加入【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p> return <p>已拒绝你加入【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
} }
}else{ }else{
return "" return ""

2
src/forge/Notice/UndoEvent.jsx
View File

@ -76,7 +76,7 @@ function UndoEvent(props){
<span className="color-grey-9">{i.time_ago}</span> <span className="color-grey-9">{i.time_ago}</span>
</p> </p>
<FlexAJ> <FlexAJ>
<p className="color-grey-6">请求将仓库【<Link to={`/projects/${i.project && i.project.owner && i.project.owner.login}/${i.project && i.project.identifier}`}>{i.project && i.project.name}</Link>】 <p className="color-grey-6">请求将仓库【<Link to={`/${i.project && i.project.owner && i.project.owner.login}/${i.project && i.project.identifier}`}>{i.project && i.project.name}</Link>】
转移给【<Link to={`/${i.owner && i.owner.login}`}>{i.owner && i.owner.name}</Link>】，是否接受？</p> 转移给【<Link to={`/${i.owner && i.owner.login}`}>{i.owner && i.owner.name}</Link>】，是否接受？</p>
{ {
i.status === "common" && i.status === "common" &&

6
src/forge/Order/Detail.js
View File

@ -85,7 +85,7 @@ class Detail extends Component {
}) })
.then((result) => { .then((result) => {
if (result) { if (result) {
this.props.history.push(`/projects/${owner}/${projectsId}/issues`); this.props.history.push(`/${owner}/${projectsId}/issues`);
} }
}) })
.catch((error) => { .catch((error) => {
@ -132,7 +132,7 @@ class Detail extends Component {
.then((result) => { .then((result) => {
if (result) { if (result) {
this.props.history.push( this.props.history.push(
`/projects/${owner}/${projectsId}/issues/${result.data.issue_id}/copyetail` `/${owner}/${projectsId}/issues/${result.data.issue_id}/copyetail`
); );
} }
}) })
@ -269,7 +269,7 @@ class Detail extends Component {
</Popconfirm> </Popconfirm>
<Link <Link
to={`/projects/${owner}/${projectsId}/issues/${orderId}/updatedetail`} to={`/${owner}/${projectsId}/issues/${orderId}/updatedetail`}
className="color-blue fr" className="color-blue fr"
> >
编辑 编辑

6
src/forge/Order/Milepost.js
View File

@ -187,7 +187,7 @@ class Milepost extends Component {
</ul> </ul>
{ {
data && data.user_admin_or_member ? data && data.user_admin_or_member ?
<Link to={`/projects/${owner}/${projectsId}/milestones/new`} className="topWrapper_btn">新的里程碑</Link> <Link to={`/${owner}/${projectsId}/milestones/new`} className="topWrapper_btn">新的里程碑</Link>
: '' : ''
} }
</div> </div>
@ -204,7 +204,7 @@ class Milepost extends Component {
<div className="milepostwidth"> <div className="milepostwidth">
<div className="grid-item width100"> <div className="grid-item width100">
<i className="iconfont icon-lubiaosignpost3 font-12 mr3"></i> <i className="iconfont icon-lubiaosignpost3 font-12 mr3"></i>
<Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link> <Link to={`/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
</div> </div>
</div> </div>
</div> </div>
@ -228,7 +228,7 @@ class Milepost extends Component {
<div className="milepostleft"> <div className="milepostleft">
<div className="grid-item ml15 color-grey-9"> <div className="grid-item ml15 color-grey-9">
<i className="iconfont icon-bianji3 font-14 mr5"></i> <i className="iconfont icon-bianji3 font-14 mr5"></i>
<Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link> <Link to={`/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
</div> </div>
<div className="grid-item ml15 color-grey-9"> <div className="grid-item ml15 color-grey-9">
<i className={item.status === "closed" ? "iconfont icon-gouxuan font-14 mr5":"iconfont icon-yiguanbi1 font-14 mr5"}></i> <i className={item.status === "closed" ? "iconfont icon-gouxuan font-14 mr5":"iconfont icon-yiguanbi1 font-14 mr5"}></i>

4
src/forge/Order/MilepostDetail.js
View File

@ -238,8 +238,8 @@ class MilepostDetail extends Component {
<span className="font-weight-bold">{data && data.percent && data.percent.toFixed(2)}%完成 </span> <span className="font-weight-bold">{data && data.percent && data.percent.toFixed(2)}%完成 </span>
</span> </span>
<div className="milepostdiv"> <div className="milepostdiv">
<Link to={`/projects/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link> <Link to={`/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link>
<Link to={`/projects/${owner}/${projectsId}/issues/${meilid}/new`} className="topWrapper_btn">创建易修</Link> <Link to={`/${owner}/${projectsId}/issues/${meilid}/new`} className="topWrapper_btn">创建易修</Link>
</div> </div>
</FlexAJ> </FlexAJ>
</div> </div>

4
src/forge/Order/Nav.js
View File

@ -7,8 +7,8 @@ class Nav extends Component{
const { projectsId , owner } = this.props.match.params; const { projectsId , owner } = this.props.match.params;
return( return(
<p className="topWrapper_nav"> <p className="topWrapper_nav">
<NavLink activeClassName="active" className="issue-type-button" to={`/projects/${owner}/${projectsId}/issues/tags`}>标签</NavLink> <NavLink activeClassName="active" className="issue-type-button" to={`/${owner}/${projectsId}/issues/tags`}>标签</NavLink>
<NavLink activeClassName="active" className="issue-type-button" to={`/projects/${owner}/${projectsId}/milestones`}>里程碑</NavLink> <NavLink activeClassName="active" className="issue-type-button" to={`/${owner}/${projectsId}/milestones`}>里程碑</NavLink>
</p> </p>
) )
} }

6
src/forge/Order/OrderItem.js
View File

@ -51,7 +51,7 @@ class OrderItem extends Component {
{current_user && current_user.login && checkbox} {current_user && current_user.login && checkbox}
<div className="flex-1"> <div className="flex-1">
<p className="mb10 df" style={{alignItems:"center"}}> <p className="mb10 df" style={{alignItems:"center"}}>
<Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/detail`} target="_blank" title={item.name} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"370px"}}>{item.name}</Link> <Link to={`/${owner}/${projectsId}/issues/${item.id}/detail`} target="_blank" title={item.name} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"370px"}}>{item.name}</Link>
{TagInfo(item.priority,"mr10")} {TagInfo(item.priority,"mr10")}
</p> </p>
<p className="color-grey-6 font-12"> <p className="color-grey-6 font-12">
@ -88,12 +88,12 @@ class OrderItem extends Component {
<li style={{color:`${item.done_ratio === "100%"?"#28BD6C":"#F73030"}`}}>{item.done_ratio || "--"}</li> <li style={{color:`${item.done_ratio === "100%"?"#28BD6C":"#F73030"}`}}>{item.done_ratio || "--"}</li>
<li> <li>
<div className="milepostleft"> <div className="milepostleft">
<Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/detail`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link> <Link to={`/${owner}/${projectsId}/issues/${item.id}/detail`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link>
{ {
user_admin_or_member ? user_admin_or_member ?
<div id="hoverBox" style={{ display: this.state.orderid === item.id && this.state.isdisplay ? 'flex' : 'none' }}> <div id="hoverBox" style={{ display: this.state.orderid === item.id && this.state.isdisplay ? 'flex' : 'none' }}>
<div className="mr8 ml8 color-grey-9"> <div className="mr8 ml8 color-grey-9">
<Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/updatedetail`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link> <Link to={`/${owner}/${projectsId}/issues/${item.id}/updatedetail`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link>
</div> </div>
<div className="color-grey-9"> <div className="color-grey-9">
<Popconfirm placement="bottom" overlayClassName="overlayBox" getPopupContainer={()=>document.getElementById("hoverBox")} title={'您确定要删除当前易修吗？'} okText="是" cancelText="否" onConfirm={() => this.deletedetail(item.id)}> <Popconfirm placement="bottom" overlayClassName="overlayBox" getPopupContainer={()=>document.getElementById("hoverBox")} title={'您确定要删除当前易修吗？'} okText="是" cancelText="否" onConfirm={() => this.deletedetail(item.id)}>

2
src/forge/Order/UpdateMilepost.js
View File

@ -79,7 +79,7 @@ class UpdateMilepost extends Component {
}).then(result => { }).then(result => {
if (result) { if (result) {
this.setState({ isSpin: false }) this.setState({ isSpin: false })
this.props.history.push(`/projects/${owner}/${projectsId}/milestones`); this.props.history.push(`/${owner}/${projectsId}/milestones`);
} }

2
src/forge/Order/newMilepost.js
View File

@ -63,7 +63,7 @@ class NewMilepost extends Component {
}).then(result => { }).then(result => {
if (result) { if (result) {
this.setState({ isSpin: false }) this.setState({ isSpin: false })
this.props.history.push(`/projects/${owner}/${projectsId}/milestones`); this.props.history.push(`/${owner}/${projectsId}/milestones`);
const { getDetail } = this.props; const { getDetail } = this.props;
getDetail && getDetail(); getDetail && getDetail();
} }

2
src/forge/Order/order.js
View File

@ -351,7 +351,7 @@ class order extends Component {
if(data && data.user_admin_or_member){ if(data && data.user_admin_or_member){
const { projectsId , owner } = this.props.match.params; const { projectsId , owner } = this.props.match.params;
return( return(
<Link className="topWrapper_btn ml10" target="_blank" to={`/projects/${owner}/${projectsId}/issues/new`}> <Link className="topWrapper_btn ml10" target="_blank" to={`/${owner}/${projectsId}/issues/new`}>
+&nbsp;创建易修 +&nbsp;创建易修
</Link> </Link>
) )

6
src/forge/Order/order_form.js
View File

@ -165,7 +165,7 @@ class order_form extends Component {
}).then((result) => { }).then((result) => {
if (result && result.data.id) { if (result && result.data.id) {
this.props.showNotification("任务创建成功！"); this.props.showNotification("任务创建成功！");
this.props.history.push(`/projects/${owner}/${projectsId}/issues/${result.data.id}/detail`); this.props.history.push(`/${owner}/${projectsId}/issues/${result.data.id}/detail`);
this.setState({ this.setState({
description: "", description: "",
isSpin: false, isSpin: false,
@ -191,7 +191,7 @@ class order_form extends Component {
...values, ...values,
}).then((result) => { }).then((result) => {
if (result) { if (result) {
this.props.history.push(`/projects/${owner}/${projectsId}/issues/${orderId}/detail`); this.props.history.push(`/${owner}/${projectsId}/issues/${orderId}/detail`);
this.props.showNotification("任务更新成功！"); this.props.showNotification("任务更新成功！");
const { getDetail } = this.props; const { getDetail } = this.props;
getDetail && getDetail(); getDetail && getDetail();
@ -371,7 +371,7 @@ class order_form extends Component {
type="default" type="default"
className="ml30" className="ml30"
onClick={()=> onClick={()=>
this.props.history.push(form_type === "new" ? `/projects/${owner}/${projectsId || orderId}/issues` : `/projects/${owner}/${projectsId}/issues/${orderId}/detail`)} this.props.history.push(form_type === "new" ? `/${owner}/${projectsId || orderId}/issues` : `/${owner}/${projectsId}/issues/${orderId}/detail`)}
> >
<span className="plr10">取消</span> <span className="plr10">取消</span>
</Button> </Button>

2
src/forge/Settings/Branch.js
View File

@ -88,7 +88,7 @@ export default ((props)=>{
// 跳转 // 跳转
function settingRule(protectBranch){ function settingRule(protectBranch){
props.history.push(`/projects/${owner}/${projectsId}/setting/branch/${protectBranch}`); props.history.push(`/${owner}/${projectsId}/setting/branch/${protectBranch}`);
} }
// 翻页 // 翻页

2
src/forge/Settings/BranchRule.jsx
View File

@ -290,7 +290,7 @@ export default Form.create()(
<Cancel <Cancel
className="ml30" className="ml30"
onClick={() => { onClick={() => {
history.push(`/projects/${owner}/${projectsId}/setting/branch`); history.push(`/${owner}/${projectsId}/setting/branch`);
}} }}
> >
取消 取消

32
src/forge/Settings/Index.js
View File

@ -49,14 +49,14 @@ class Index extends Component {
const { projectsId , owner } = this.props.match.params; const { projectsId , owner } = this.props.match.params;
const { pathname } = this.props.history.location; const { pathname } = this.props.history.location;
const flag = pathname === `/projects/${owner}/${projectsId}/setting`; const flag = pathname === `/${owner}/${projectsId}/setting`;
return ( return (
<Box className="ProjectListIndex"> <Box className="ProjectListIndex">
<Short> <Short>
<ul className="list-l-Menu"> <ul className="list-l-Menu">
<li className={flag ? "active" : ""}> <li className={flag ? "active" : ""}>
<p> <p>
<Link to={`/projects/${owner}/${projectsId}/setting`} className="w-100"> <Link to={`/${owner}/${projectsId}/setting`} className="w-100">
<i className="iconfont icon-huabanfuben font-18 mr10"></i>基本设置 <i className="iconfont icon-huabanfuben font-18 mr10"></i>基本设置
</Link> </Link>
</p> </p>
@ -67,7 +67,7 @@ class Index extends Component {
} }
> >
<p> <p>
<Link to={`/projects/${owner}/${projectsId}/setting/collaborator`} className="w-100"> <Link to={`/${owner}/${projectsId}/setting/collaborator`} className="w-100">
<i className="iconfont icon-chengyuan font-18 mr10"></i> <i className="iconfont icon-chengyuan font-18 mr10"></i>
协作者管理 协作者管理
</Link> </Link>
@ -79,7 +79,7 @@ class Index extends Component {
} }
> >
<p> <p>
<Link to={`/projects/${owner}/${projectsId}/setting/webhooks`} className="w-100"> <Link to={`/${owner}/${projectsId}/setting/webhooks`} className="w-100">
<i className="iconfont icon-a-xuanzhongwebhookicon font-18 mr10 color-grey-9"></i> <i className="iconfont icon-a-xuanzhongwebhookicon font-18 mr10 color-grey-9"></i>
Webhooks Webhooks
</Link> </Link>
@ -91,7 +91,7 @@ class Index extends Component {
} }
> >
<p> <p>
<Link to={`/projects/${owner}/${projectsId}/setting/branch`} className="w-100"> <Link to={`/${owner}/${projectsId}/setting/branch`} className="w-100">
<i className="iconfont icon-fenzhi font-20 mr10"></i> <i className="iconfont icon-fenzhi font-20 mr10"></i>
分支设置 分支设置
</Link> </Link>
@ -101,7 +101,7 @@ class Index extends Component {
className={pathname.indexOf("setting/tags") > -1 ? "active" : ""} className={pathname.indexOf("setting/tags") > -1 ? "active" : ""}
> >
<p> <p>
<Link to={`/projects/${owner}/${projectsId}/setting/tags`} className="w-100"> <Link to={`/${owner}/${projectsId}/setting/tags`} className="w-100">
<i className="iconfont icon-biaoqian3 font-18 mr10 color-grey-6"></i> <i className="iconfont icon-biaoqian3 font-18 mr10 color-grey-6"></i>
项目标签 项目标签
</Link> </Link>
@ -127,64 +127,64 @@ class Index extends Component {
<Switch {...this.props}> <Switch {...this.props}>
{/* webhooks */} {/* webhooks */}
<Route <Route
path="/projects/:owner/:projectsId/setting/webhooks/new" path="/:owner/:projectsId/setting/webhooks/new"
render={(props) => ( render={(props) => (
<WebhookNew {...this.props} {...props} {...this.state} /> <WebhookNew {...this.props} {...props} {...this.state} />
)} )}
></Route> ></Route>
<Route <Route
path="/projects/:owner/:projectsId/setting/webhooks/:id" path="/:owner/:projectsId/setting/webhooks/:id"
render={(props) => ( render={(props) => (
<WebhookNew {...this.props} {...props} {...this.state} /> <WebhookNew {...this.props} {...props} {...this.state} />
)} )}
></Route> ></Route>
<Route <Route
path="/projects/:owner/:projectsId/setting/webhooks" path="/:owner/:projectsId/setting/webhooks"
render={(props) => ( render={(props) => (
<Webhook {...this.props} {...props} {...this.state} /> <Webhook {...this.props} {...props} {...this.state} />
)} )}
></Route> ></Route>
{/* 协作者 */} {/* 协作者 */}
<Route <Route
path="/projects/:owner/:projectsId/setting/collaborator" path="/:owner/:projectsId/setting/collaborator"
render={(props) => ( render={(props) => (
<Collaborator {...this.props} {...props} {...this.state} /> <Collaborator {...this.props} {...props} {...this.state} />
)} )}
></Route> ></Route>
{/* 修改仓库信息 */} {/* 修改仓库信息 */}
<Route <Route
path="/projects/:owner/:projectsId/setting/tags" path="/:owner/:projectsId/setting/tags"
render={(props) => ( render={(props) => (
<Tags {...this.props} {...props} {...this.state} /> <Tags {...this.props} {...props} {...this.state} />
)} )}
></Route> ></Route>
<Route <Route
path="/projects/:owner/:projectsId/setting/branch/:branch" path="/:owner/:projectsId/setting/branch/:branch"
render={(props) => ( render={(props) => (
<BranchNew {...this.props} {...props} {...this.state} /> <BranchNew {...this.props} {...props} {...this.state} />
)} )}
></Route> ></Route>
<Route <Route
path="/projects/:owner/:projectsId/setting/branch" path="/:owner/:projectsId/setting/branch"
render={(props) => ( render={(props) => (
<Branch {...this.props} {...props } {...this.state} /> <Branch {...this.props} {...props } {...this.state} />
)} )}
></Route> ></Route>
<Route <Route
path="/projects/:owner/:projectsId/setting/manage/new" path="/:owner/:projectsId/setting/manage/new"
render={(props) => ( render={(props) => (
<ManageNew {...this.props} {...props} {...this.state} /> <ManageNew {...this.props} {...props} {...this.state} />
)} )}
></Route> ></Route>
<Route <Route
path="/projects/:owner/:projectsId/setting/manage" path="/:owner/:projectsId/setting/manage"
render={(props) => ( render={(props) => (
<Manage {...this.props} {...props} {...this.state} /> <Manage {...this.props} {...props} {...this.state} />
)} )}
></Route> ></Route>
{/* 修改仓库信息 */} {/* 修改仓库信息 */}
<Route <Route
path="/projects/:owner/:projectsId/setting" path="/:owner/:projectsId/setting"
render={(props) => ( render={(props) => (
<Setting {...this.props} {...props} {...this.state} /> <Setting {...this.props} {...props} {...this.state} />
)} )}

6
src/forge/Settings/Webhooks/Index.jsx
View File

@ -62,7 +62,7 @@ function Index(props) {
if(total >= 20){ if(total >= 20){
return props.showNotification("webhooks数量已到上限！请删除暂不使用的webhooks以进行添加操作"); return props.showNotification("webhooks数量已到上限！请删除暂不使用的webhooks以进行添加操作");
} }
props.history.push(`/projects/${owner}/${projectsId}/setting/webhooks/new`) props.history.push(`/${owner}/${projectsId}/setting/webhooks/new`)
} }
return( return(
@ -90,9 +90,9 @@ function Index(props) {
return( return(
<List.Item key={k}> <List.Item key={k}>
<i className="iconfont icon-a-xuanzhongwebhookicon color-grey-d mr12 font-17"></i> <i className="iconfont icon-a-xuanzhongwebhookicon color-grey-d mr12 font-17"></i>
<Link to={`/projects/${owner}/${projectsId}/setting/webhooks/${i.id}`} className="webName">{i.url}</Link> <Link to={`/${owner}/${projectsId}/setting/webhooks/${i.id}`} className="webName">{i.url}</Link>
<span> <span>
<Button ghost type={"primary"} onClick={()=>{props.history.push(`/projects/${owner}/${projectsId}/setting/webhooks/${i.id}`)}}>编辑</Button> <Button ghost type={"primary"} onClick={()=>{props.history.push(`/${owner}/${projectsId}/setting/webhooks/${i.id}`)}}>编辑</Button>
<Button ghost className="ml20" type="danger" onClick={()=>{deleteFunc(i.id,i.url)}}>删除</Button> <Button ghost className="ml20" type="danger" onClick={()=>{deleteFunc(i.id,i.url)}}>删除</Button>
</span> </span>
</List.Item> </List.Item>

8
src/forge/Settings/Webhooks/New.jsx
View File

@ -111,7 +111,7 @@ function New({ form , match , showNotification , history }) {
}).then(result=>{ }).then(result=>{
if(result){ if(result){
showNotification("webhook更新成功！"); showNotification("webhook更新成功！");
history.push(`/projects/${owner}/${projectsId}/setting/webhooks`); history.push(`/${owner}/${projectsId}/setting/webhooks`);
} }
}).catch(error=>{}) }).catch(error=>{})
}else{ }else{
@ -125,7 +125,7 @@ function New({ form , match , showNotification , history }) {
}).then(result=>{ }).then(result=>{
if(result && result.data && result.data.id){ if(result && result.data && result.data.id){
showNotification("webhook新建成功！"); showNotification("webhook新建成功！");
history.push(`/projects/${owner}/${projectsId}/setting/webhooks`); history.push(`/${owner}/${projectsId}/setting/webhooks`);
} }
}).catch(error=>{}) }).catch(error=>{})
} }
@ -157,7 +157,7 @@ function New({ form , match , showNotification , history }) {
axios.delete(url).then(result=>{ axios.delete(url).then(result=>{
if(result){ if(result){
showNotification("webhook删除成功！"); showNotification("webhook删除成功！");
history.push(`/projects/${owner}/${projectsId}/setting/webhooks`); history.push(`/${owner}/${projectsId}/setting/webhooks`);
} }
}).catch(error=>{}) }).catch(error=>{})
} }
@ -180,7 +180,7 @@ function New({ form , match , showNotification , history }) {
subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`} subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`}
/> />
<Banner> <Banner>
<Link to={`/projects/${owner}/${projectsId}/setting/webhooks`} className="color-blue">Webhooks</Link> <Link to={`/${owner}/${projectsId}/setting/webhooks`} className="color-blue">Webhooks</Link>
<i className="iconfont icon-youjiantou ml5 mr5 font-12"></i> <i className="iconfont icon-youjiantou ml5 mr5 font-12"></i>
<span>{id ? "更新" : "添加"}Webhook</span> <span>{id ? "更新" : "添加"}Webhook</span>
</Banner> </Banner>

2
src/forge/Team/Group/GroupDetailProject.jsx
View File

@ -31,7 +31,7 @@ export default (({projects}) => {
return ( return (
<Div> <Div>
<Imgs src={item.project && getImageUrl(`/${item.project.owner_image_url}`)}/> <Imgs src={item.project && getImageUrl(`/${item.project.owner_image_url}`)}/>
<Link to={`/projects/${item.project.owner_login}/${item.project.identifier}`}>{item.project.name}</Link> <Link to={`/${item.project.owner_login}/${item.project.identifier}`}>{item.project.name}</Link>
</Div> </Div>
) )
}) })

2
src/forge/Team/Group/Setting/GroupProjectSetting.jsx
View File

@ -180,7 +180,7 @@ function GroupProjectSetting(props) {
} }
> >
<List.Item.Meta <List.Item.Meta
title={<a href={`/projects/${item.project.owner_login}/${item.project.identifier}`}>{item.project.owner_name}/{item.project.name}</a>} title={<a href={`/${item.project.owner_login}/${item.project.identifier}`}>{item.project.owner_name}/{item.project.name}</a>}
/> />
</List.Item> </List.Item>
)} )}

4
src/forge/Team/List.jsx
View File

@ -61,8 +61,8 @@ function List(props){
) )
const menu_new=( const menu_new=(
<Menu> <Menu>
<Menu.Item key="updated_on"><Link to={`/projects/deposit/new/${OIdentifier}`}>新建托管项目</Link></Menu.Item> <Menu.Item key="updated_on"><Link to={`/deposit/new/${OIdentifier}`}>新建托管项目</Link></Menu.Item>
<Menu.Item key="created_on"><Link to={`/projects/mirror/new/${OIdentifier}`}>新建镜像项目</Link></Menu.Item> <Menu.Item key="created_on"><Link to={`/mirror/new/${OIdentifier}`}>新建镜像项目</Link></Menu.Item>
</Menu> </Menu>
) )

2
src/forge/Team/ListItem.jsx
View File

@ -7,7 +7,7 @@ function ListItem({item,key,OIdentifier}) {
<div className="team_project" key={key}> <div className="team_project" key={key}>
<p className="t_p_title"> <p className="t_p_title">
<span className="flex1"> <span className="flex1">
<Link to={`/projects/${OIdentifier}/${item.identifier}`} className="name">{item.name}</Link> <Link to={`/${OIdentifier}/${item.identifier}`} className="name">{item.name}</Link>
{ item.forked_from_project_id && <i className="iconfont icon-fork font-18 color-orange ml8" /> } { item.forked_from_project_id && <i className="iconfont icon-fork font-18 color-orange ml8" /> }
{ {
item.type && item.type !== 0 ? item.type && item.type !== 0 ?

2
src/forge/UsersList/fork_users.js
View File

@ -96,7 +96,7 @@ class ForkUsers extends Component {
<div className="ml12"> <div className="ml12">
<div> <div>
<Link <Link
to={`/projects/${item.login}/${item.identifier}`} to={`/${item.login}/${item.identifier}`}
className="font-16 text-primary task-hide max-w-200" className="font-16 text-primary task-hide max-w-200"
style={{display:"block"}} style={{display:"block"}}
title={item.name} title={item.name}

6
src/forge/Version/New.jsx
View File

@ -103,7 +103,7 @@ export default Form.create()(
.then(result => { .then(result => {
if (result) { if (result) {
showNotification("版本修改成功！"); showNotification("版本修改成功！");
history.push(`/projects/${owner}/${projectsId}/releases`); history.push(`/${owner}/${projectsId}/releases`);
} }
}); });
} else { } else {
@ -116,7 +116,7 @@ export default Form.create()(
.then(result => { .then(result => {
if (result) { if (result) {
showNotification("版本发布成功！"); showNotification("版本发布成功！");
history.push(`/projects/${owner}/${projectsId}/releases`); history.push(`/${owner}/${projectsId}/releases`);
} }
}); });
} }
@ -233,7 +233,7 @@ export default Form.create()(
</Button> </Button>
<Button <Button
onClick={() => onClick={() =>
history.push(`/projects/${owner}/${projectsId}/releases`) history.push(`/${owner}/${projectsId}/releases`)
} }
style={{ style={{
backgroundColor: "rgba(187,187,187,1)", backgroundColor: "rgba(187,187,187,1)",

4
src/forge/Version/version.js
View File

@ -79,7 +79,7 @@ class version extends Component {
<span className="task-hide">{item.name}</span> <span className="task-hide">{item.name}</span>
{ {
(isManager || isDeveloper) && type !==2 && (isManager || isDeveloper) && type !==2 &&
<Link to={`/projects/${owner}/${projectsId}/releases/${item.version_id}/update`} className="color-blue ml3 font-12">（编辑）</Link> <Link to={`/${owner}/${projectsId}/releases/${item.version_id}/update`} className="color-blue ml3 font-12">（编辑）</Link>
} }
</span> </span>
<span className="color-grey-3"> <span className="color-grey-3">
@ -114,7 +114,7 @@ class version extends Component {
<span className="font-18 color-grey-3">版本发布</span> <span className="font-18 color-grey-3">版本发布</span>
{ {
data && data.user_permission && type !== 2 ? data && data.user_permission && type !== 2 ?
<Link to={`/projects/${owner}/${projectsId}/releases/new`} className="topWrapper_btn_new">+ 发布新版</Link> <Link to={`/${owner}/${projectsId}/releases/new`} className="topWrapper_btn_new">+ 发布新版</Link>
: '' : ''
} }
</div> </div>

2
src/forge/Wiki/EditWiki.jsx
View File

@ -126,7 +126,7 @@ export default Form.create()(({ form, history, showNotification, projectDetail,
} }
function goBack() { function goBack() {
history.push(`/projects/${owner}/${projectsId}/wiki`); history.push(`/${owner}/${projectsId}/wiki`);
} }
function changeModal(e) { function changeModal(e) {

6
src/forge/Wiki/Index.jsx
View File

@ -107,15 +107,15 @@ export default (props) => {
} }
function addFile() { function addFile() {
history.push(`/projects/${owner}/${projectsId}/wiki/add`); history.push(`/${owner}/${projectsId}/wiki/add`);
} }
function goEdit() { function goEdit() {
history.push(`/projects/${owner}/${projectsId}/wiki/edit/${encodeURI(checkItem.name)}`); history.push(`/${owner}/${projectsId}/wiki/edit/${encodeURI(checkItem.name)}`);
} }
function preview() { function preview() {
window.open(`/projects/${owner}/${projectsId}/wiki/preview/${encodeURI(project.name)}/${project.id}`); window.open(`/${owner}/${projectsId}/wiki/preview/${encodeURI(project.name)}/${project.id}`);
} }
// 支持 Markdown，Html，Pdf格式文件 // 支持 Markdown，Html，Pdf格式文件

4
src/forge/Wiki/Preview.jsx
View File

@ -61,11 +61,11 @@ export default (props) => {
}, [project, checkItem]); }, [project, checkItem]);
function goEdit() { function goEdit() {
history.push(`/projects/${owner}/${projectsId}/wiki/edit/${checkItem.name}`); history.push(`/${owner}/${projectsId}/wiki/edit/${checkItem.name}`);
} }
function goBack() { function goBack() {
history.push(`/projects/${owner}/${projectsId}/wiki`); history.push(`/${owner}/${projectsId}/wiki`);
} }
// 支持 Markdown，Html，Pdf格式文件 // 支持 Markdown，Html，Pdf格式文件

2
src/forge/Wiki/Welcome/index.jsx
View File

@ -27,7 +27,7 @@ export default ({ project, isManager, history, showNotification, match, reloadLi
// } // }
function addFile() { function addFile() {
history.push(`/projects/${owner}/${projectsId}/wiki/add`); history.push(`/${owner}/${projectsId}/wiki/add`);
} }
return ( return (

4
src/forge/users/CIList.jsx
View File

@ -62,7 +62,7 @@ function CIList(props){
return( return(
<li key={key}> <li key={key}>
<span> <span>
<Link to={`/projects/${item.author && item.author.login}/${item.identifier}${ item.open_devops ? "/devops/dispose":""}`}>{item.name}</Link> <Link to={`/${item.author && item.author.login}/${item.identifier}${ item.open_devops ? "/devops/dispose":""}`}>{item.name}</Link>
{ item.open_devops ? { item.open_devops ?
<span className="authTag green ml20">已激活</span> <span className="authTag green ml20">已激活</span>
: :
@ -79,7 +79,7 @@ function CIList(props){
<Button>取消激活</Button> <Button>取消激活</Button>
</Popconfirm> </Popconfirm>
: :
<Button type={"primary"} onClick={()=>{props.history.push(`/projects/${item.author && item.author.login}/${item.identifier}/devops`)}}>马上激活</Button> <Button type={"primary"} onClick={()=>{props.history.push(`/${item.author && item.author.login}/${item.identifier}/devops`)}}>马上激活</Button>
} }
</li> </li>
) )

2
src/forge/users/GeneralView/ConcentrateProject.jsx
View File

@ -59,7 +59,7 @@ function ConcentrateProject({userLogin,current}) {
list.map((i,k)=>{ list.map((i,k)=>{
return( return(
<li key={i.id}> <li key={i.id}>
<Link to={`/projects/${i.author && i.author.login}/${i.identifier}`} className="name">{i.name}</Link> <Link to={`/${i.author && i.author.login}/${i.identifier}`} className="name">{i.name}</Link>
<p className="task-hide desc">{i.description}</p> <p className="task-hide desc">{i.description}</p>
<AlignCenter> <AlignCenter>
{ i.category && <span className="tagName">{i.category.name}</span> } { i.category && <span className="tagName">{i.category.name}</span> }

91
src/forge/users/Index.jsx
View File

@ -10,17 +10,88 @@ const Infos = Loadable({
loader: () => import("./Infos"), loader: () => import("./Infos"),
loading: Loading, loading: Loading,
}); });
//forge项目
const Projects = Loadable({
loader: () => import('../Index'),
loading: Loading,
})
export default withRouter( export default withRouter(
(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props)=>{ (CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props) => {
return( return (
<Switch> <Switch>
<Route
path="/:username" <Route
render={(p) => ( path="/:username/statistics"
<Infos {...props} {...p}/> render={(p) => (
)} <Infos {...props} {...p} />
></Route> )}
</Switch> ></Route>
<Route
path="/:username/projects"
render={(p) => (
<Infos {...props} {...p} />
)}
></Route>
<Route
path="/:username/notice"
render={(p) => (
<Infos {...props} {...p} />
)}
></Route>
<Route
path="/:username/devops"
render={(p) => (
<Infos {...props} {...p} />
)}
></Route>
<Route
path="/:username/organizes"
render={(p) => (
<Infos {...props} {...p} />
)}
></Route>
<Route
path="/:username/watchers"
render={(p) => (
<Infos {...props} {...p} />
)}
></Route>
<Route
path="/:username/fan_users"
render={(p) => (
<Infos {...props} {...p} />
)}
></Route>
<Route
path="/:username/statistics"
render={(p) => (
<Infos {...props} {...p} />
)}
></Route>
<Route
path={"/:owner/:projectsId"}
render={
(p) => {
return (<Projects {...props} {...p} />)
}
}>
</Route>
<Route
path="/:username"
render={(p) => (
<Infos {...props} {...p} />
)}
></Route>
</Switch>
) )
})))) }))))
) )