Merge branches 'dev_aliyun' and 'issues25489' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

issues25489
杨树明 5 years ago
commit 5cf350bdf1

@ -213,6 +213,13 @@ class UseBank extends Component{
text-overflow:ellipsis;
white-space:nowrap
}
.bankwidth76{
width:76px !important;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
text-align: center;
}
.bankwidth2{
width:24% !important;
overflow:hidden;
@ -224,7 +231,7 @@ class UseBank extends Component{
Margin-left:15px
}
.with63{
width: 63% !important;
width: 60% !important;
box-sizing: border-box;
margin-left: 15px;
}
@ -306,15 +313,21 @@ class UseBank extends Component{
<p className="clearfix mb7" key={item.id}>
<Checkbox className="fl" value={item.id} key={item.id}></Checkbox>
<span className={nav_my === 'myself' ? "fl with58" : "fl with63"}>
<label className="task-hide fl" title={item.name && item.name.length > 30 ? item.name:""} style={{"maxWidth":"100%"}}>{item.name}</label>
<label className="task-hide fl" title={item.name && item.name.length > 30 ? item.name : ""}
style={{"maxWidth": "100%"}}>
<a title={item.name}>{item.name}</a>
</label>
</span>
<span title={item.course_list_name && item.course_list_name.length > 10 && item.course_list_name}
className={nav_my === 'myself' ? "fl with30 color-grey-6 task-hide pl5 bankwidth" : "fl with30 color-grey-6 task-hide pl5 bankwidth2"}
>{item.course_list_name}</span>
><a title={item.course_list_name}>{item.course_list_name}</a></span>
{
nav_my === 'public' &&
<span className="fl with16 color-grey-6 task-hide pl10">{item.username}</span>
<span className="fl with16 color-grey-6 task-hide pl10 bankwidth76"><a
title={item.username} style={{
width: "76px"
}}>{item.username}</a></span>
}
{nav_my === "myself" ?
(this.props.object_type && this.props.object_type === "normal" ?

Loading…
Cancel
Save