Compare commits

...

14 Commits

6 changed files with 13 additions and 8 deletions

View File

@ -97,6 +97,7 @@ function CoderDepot(props){
setLastCommit(c && c.commit); setLastCommit(c && c.commit);
setLastCommitAuthor(c && c.committer); setLastCommitAuthor(c && c.committer);
setMainFlag(true); setMainFlag(true);
setReadOnly(true);
} }
setTimeout(function(){setIsSpin(false);},500); setTimeout(function(){setIsSpin(false);},500);
}).catch(error=>{setIsSpin(false);}) }).catch(error=>{setIsSpin(false);})
@ -138,6 +139,7 @@ function CoderDepot(props){
setLastCommit(c && c.commit); setLastCommit(c && c.commit);
setLastCommitAuthor(c && c.committer); setLastCommitAuthor(c && c.committer);
setMainFlag(false); setMainFlag(false);
setReadOnly(true);
} }
setTimeout(function(){setIsSpin(false);},500) setTimeout(function(){setIsSpin(false);},500)
}).catch(error=>{setIsSpin(false);}) }).catch(error=>{setIsSpin(false);})

View File

@ -223,6 +223,9 @@
.listtablebody{ .listtablebody{
li.listtablepath{ li.listtablepath{
a{color: #40a9ff;} a{color: #40a9ff;}
p{
margin-bottom: 0px!important;
}
} }
li{ li{
height: 42px; height: 42px;
@ -298,7 +301,7 @@
border-radius: 4px; border-radius: 4px;
.ant-dropdown-menu-item{ .ant-dropdown-menu-item{
border-radius: 8px; border-radius: 8px;
text-align: left; text-align: left!important;
a{ a{
width: 350px; width: 350px;
overflow: hidden; overflow: hidden;

View File

@ -75,7 +75,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
</li> </li>
:"" :""
} }
{ {/* {
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: `/projects/${owner}/${projectsId}/source`, state }}>
@ -84,7 +84,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
{projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""} {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
</Link> </Link>
</li> </li>
} } */}
{ {
item.menu_name === "versions" && item.menu_name === "versions" &&
<li className={pathname==="milestones" ? "active" : ""}> <li className={pathname==="milestones" ? "active" : ""}>

View File

@ -13,7 +13,7 @@ const menu = [
{name:"易修 (Issue)",index:"issues"}, {name:"易修 (Issue)",index:"issues"},
{name:"合并请求",index:"pulls"}, {name:"合并请求",index:"pulls"},
{name:"工作流(beta版)",index:"devops"}, {name:"工作流(beta版)",index:"devops"},
{name:"资源库",index:"resources"}, // {name:"资源库",index:"resources"},
{name:"里程碑",index:"versions"}, {name:"里程碑",index:"versions"},
{name:"动态",index:"activity"}, {name:"动态",index:"activity"},
] ]

View File

@ -99,8 +99,8 @@ export default Form.create()(
if(!value){ if(!value){
callback(); callback();
} }
if(value && !value.match(/^[a-zA-Z][a-zA-Z\d]{3,14}$/)){ if(value && !value.match(/^[a-zA-Z][a-zA-Z0-9_-]{3,19}$/)){
callback("只能使用英文字母和数字以字母开头长度为4到15个字符"); callback("只能使用以字母开头包含字母、数字、下划线、横杠等长度4到20个字符");
} }
callback(); callback();
} }
@ -119,7 +119,7 @@ export default Form.create()(
validator:checkname validator:checkname
} }
], ],
<Input placeholder="请输入组织账号" />,true <Input placeholder="请输入组织账号" disabled/>,true
)} )}
{helper( {helper(
"组织名称:", "组织名称:",

View File

@ -105,7 +105,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
} }
</div> </div>
} }
{ list && list.length > 0 && <Nodata _html="暂无数据"/> } { list && list.length === 0 && <Nodata _html="暂无数据"/> }
{ {
total > limit && total > limit &&
<div className="mt20 pb20 edu-txt-center"> <div className="mt20 pb20 edu-txt-center">