dev_unstable^2
hjm 5 years ago
parent 01a4155323
commit 22ca58035a

@ -4,7 +4,7 @@ import {Link} from 'react-router-dom';
import axios from 'axios'; import axios from 'axios';
import _ from 'lodash' import _ from 'lodash'
import { WordsBtn, getUploadActionUrl, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder'; import { WordsBtn, getUploadActionUrl, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, ConditionToolTip } from 'educoder';
import Modals from '../../modals/Modals'; import Modals from '../../modals/Modals';
import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor'; import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
import LeaderIcon from './common/LeaderIcon' import LeaderIcon from './common/LeaderIcon'
@ -765,17 +765,18 @@ render(){
<div className={"members fl"}> <div className={"members fl"}>
{selectmemberslist&&selectmemberslist.map((item,key)=>{ {selectmemberslist&&selectmemberslist.map((item,key)=>{
const _is_leader = (item.is_leader || !this.isEdit && key==0)
return( return(
<div key={key} style={{ <div key={key} style={{
width: '375px', width: '375px',
height: '30px', height: '30px',
display:item.user_name===undefined?"none":"" display:item.user_name===undefined?"none":""
}}> }}>
<Tooltip placement="bottom" title={item.user_nam}> <ConditionToolTip placement="bottom" title={'组长'} condition={_is_leader && item.user_name.length > 5}>
<div className={"fl ml5 fonthidden"} style={{width: '98px', color: `${item.user_name.length > 5 ? '#4CACFF' : 'inherit'}`}}> <div className={"fl ml5 fonthidden"} style={{width: '98px', color: `${item.user_name.length > 5 && _is_leader ? '#4CACFF' : 'inherit'}`}}>
{item.user_name}{ item.user_name.length <= 5 && (item.is_leader || !this.isEdit && key==0) && <LeaderIcon className="leaderIcon" small={true}></LeaderIcon>} {item.user_name}{ item.user_name.length <= 5 && _is_leader && <LeaderIcon className="leaderIcon" small={true}></LeaderIcon>}
</div> </div>
</Tooltip> </ConditionToolTip>
<div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '147px' }} <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '147px' }}
title={item.group_name && item.group_name.length > 9 ? item.group_name : ''} title={item.group_name && item.group_name.length > 9 ? item.group_name : ''}

Loading…
Cancel
Save