fix
This commit is contained in:
parent
03c907260c
commit
fd58da2f63
|
|
@ -158,7 +158,7 @@ function Index(props){
|
|||
:
|
||||
<div className="padding20 boies">
|
||||
{content ?
|
||||
<RenderHtml className="break_word_comments imageLayerParent" value={content} url={props.history.location}/>
|
||||
<RenderHtml className="break_word_comments imageLayerParent project_about_info" value={content} url={props.history.location}/>
|
||||
:
|
||||
<div>暂无概览~</div>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,4 +24,12 @@
|
|||
border-top: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
.project_about_info{
|
||||
table{
|
||||
width: 100%;
|
||||
th:last-of-type, td:last-of-type{
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -362,6 +362,21 @@ class NewHeader extends Component {
|
|||
{current_user && current_user.login && <li className="drop-down-item"><Link to="/zone/apply" target="_blank">+申请创建</Link></li> }
|
||||
</ul>
|
||||
</li> : ''
|
||||
}else if(item.name.includes("开源")){
|
||||
return (
|
||||
<li key={key}
|
||||
className={`${this.matchpaths(new_link) === true ? 'pr active' : 'pr'}`}
|
||||
style={{display:!is_hidden ? 'flex' : 'none'} }
|
||||
>
|
||||
<a onClick={()=>{
|
||||
if(current_user && !current_user.login){
|
||||
this.props.showLoginDialog();
|
||||
}else{
|
||||
current_user && window.open(`${item.link}?token=${current_user.admin ? "admin123" : current_user.user_id}`)
|
||||
}
|
||||
}}>{item.name}</a>
|
||||
</li>
|
||||
)
|
||||
} else {
|
||||
return (
|
||||
<li key={key}
|
||||
|
|
@ -381,7 +396,7 @@ class NewHeader extends Component {
|
|||
<div className="head-right">
|
||||
{/* { search_url && <HeadSearch {...this.props}/>} */}
|
||||
{
|
||||
current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
|
||||
current_user && (current_user.admin) && (settings && settings.add && settings.add.length>0)?
|
||||
<Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
|
||||
<img src={require(`./img/add.png`)} alt="" width="16px" className="mr15 ml30"/>
|
||||
</Dropdown>:""
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ const ProjectIndex = Loadable({
|
|||
});
|
||||
|
||||
const ProjectHome = Loadable({
|
||||
loader: () => import("./Main/projectHomeNew"),
|
||||
loader: () => import("./Main/projecthome/Index"),
|
||||
loading: Loading,
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -574,10 +574,10 @@ function CoderDepot(props){
|
|||
</div>
|
||||
<div className="depotBtn AlignCenter">
|
||||
<div className="addOptionBtn">
|
||||
{
|
||||
{/* {
|
||||
projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter" &&
|
||||
<a style={{width:"110px"}} onClick={()=>{setCheckVisible(true)}}>代码克隆检测</a>
|
||||
}
|
||||
} */}
|
||||
{
|
||||
baseOperate &&
|
||||
<CheckProfile {...props} sureFunc={compare}>+ 合并请求</CheckProfile>
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@ body {
|
|||
}
|
||||
|
||||
.project_homePage {
|
||||
.task-hide-2{
|
||||
word-break: break-all;
|
||||
}
|
||||
.color-464 {
|
||||
color: #464F66;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ function Sbom(props) {
|
|||
// }
|
||||
|
||||
return <div className="main" style={{border: "none", margin: '30px auto', padding: '0'}}>
|
||||
<iframe title={`sbomIframe`} src={url} id={`sbomIframe`} frameBorder="0" name={`sbomIframe`} width="100%" onLoad={iframeLoad} height={'auto'} style={{minHeight: '70vh'}}></iframe>
|
||||
<iframe title={`sbomIframe`} src={url} id={`sbomIframe`} frameBorder="0" name={`sbomIframe`} width="100%" height={'auto'} style={{minHeight: '70vh'}}></iframe>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -33,20 +33,22 @@ class DetailTop extends Component {
|
|||
let userRouterArr = ['statistics', 'projects', 'notice', 'devops', 'organizes', 'info', 'following', 'followers', 'password' , "general", "blockchain"];
|
||||
|
||||
return (
|
||||
<Switch>
|
||||
{secondRouter && (!userRouterArr.includes(secondRouter)) ? <Route
|
||||
path="/:owner/:projectsId"
|
||||
render={(p) => (
|
||||
<ProjectDetail {...this.props} {...p} />
|
||||
)}
|
||||
></Route> : <Route
|
||||
path="/:username"
|
||||
render={(p) => (
|
||||
<Infos {...this.props} {...p} />
|
||||
)}
|
||||
></Route>}
|
||||
<div className="newMain">
|
||||
<Switch>
|
||||
{secondRouter && (!userRouterArr.includes(secondRouter)) ? <Route
|
||||
path="/:owner/:projectsId"
|
||||
render={(p) => (
|
||||
<ProjectDetail {...this.props} {...p} />
|
||||
)}
|
||||
></Route> : <Route
|
||||
path="/:username"
|
||||
render={(p) => (
|
||||
<Infos {...this.props} {...p} />
|
||||
)}
|
||||
></Route>}
|
||||
|
||||
</Switch>
|
||||
</Switch>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue