m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
courseware
杨树林 5 years ago
parent 69522c5956 a11fa28092
commit 604bc3f0d2
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File

6
public/react/src/modules/courses/Resource/Fileslistitem.js
Unescape View File

@ -427,10 +427,10 @@ class Fileslistitem extends Component {
{discussMessage.publish_time === null ? "" : discussMessage.is_publish === true ? moment(discussMessage.publish_time).fromNow() : moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')}
</span>
</span>
{discussMessage && discussMessage.category_name === null ? "" : this.props.child === false ?
{discussMessage && discussMessage.category_name === undefined||discussMessage && discussMessage.category_name === null ? "" :
<div className="color-grey9 task-hide fr mr30" title={discussMessage && discussMessage.category_name}
style={{display:'flex',"max-width": "268px"}}>所属目录：<div style={{display:discussMessage && discussMessage.parent_category_name === null ? "none":'block',"max-width": "80px",overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{discussMessage && discussMessage. parent_category_name}</div><div style={{display:discussMessage && discussMessage.parent_category_name === null ? "none":'block'}}>/</div><div style={{"max-width": "60px",overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{discussMessage && discussMessage.category_name}</div>
</div> : ""}
style={{display:'flex',"max-width": "300px"}}>所属目录：<div style={{display:discussMessage && discussMessage.parent_category_name === null ? "none":'block',"max-width": "150px",overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{discussMessage && discussMessage. parent_category_name}</div><div style={{display:discussMessage && discussMessage.parent_category_name === null ? "none":'block'}}>/</div><div style={{"max-width": "150px",overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{discussMessage && discussMessage.category_name}</div>
</div>}
</p>

19
public/react/src/modules/courses/Resource/index.js
Unescape View File

@ -1024,7 +1024,7 @@ class Fileslists extends Component{
`}
</style>
<ul className="drop_down_menu" style={{"right":"0px","left":"unset","min-width":'180px'}}>
<ul className="drop_down_menu" style={{"right":"0px","left":"unset","min-width":'200px'}}>
{/* <p style={{marginLeft:15,color:"#000000",fontSize:20}}>资源</p> */}
{this.state.course_second_categories&&this.state.course_second_categories.length>10? <p className="drop_down_search">
<Input placeholder="搜索" value={this.state.dirSearchValue} onChange={(e) => {this.setState({dirSearchValue: e.target.value})}}/>
@ -1032,7 +1032,9 @@ class Fileslists extends Component{
{course_modules&&course_modules.course_modules.map((item,key)=>{
return(
filesId&&filesId===item.value?"":<li key={key} id={item.value} onClick={() => this.moveTos(0)} title={item.title}>{item.title}</li>
<li key={key} id={item.value} onClick={() => this.moveTos(0)} title={item.title}>{item.title}</li>
)
})}
@ -1043,8 +1045,10 @@ class Fileslists extends Component{
}).map((itm,k)=>{
return(
<div >
<div style={{display:'flex',marginTop:10,height:20}}>
<div onClick={() => this.moveTos(itm.value )} style={{marginLeft:15,width:itm.title.length>13?200:undefined,color:'#000000',overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{itm.title}</div>
<div style={{display:'inline-block',marginTop:10,height:20}}>
<li style={{width:200}} key={key} id={itm.value} onClick={() => this.moveTos(0)} title={itm.title}>{itm.title}</li>
{/* <div onClick={() => this.moveTos(itm.value )} style={{marginLeft:15,width:itm.title.length>13?200:undefined,color:'#000000',overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{itm.title}</div> */}
{itm.children.length===0?'':<i style={{marginLeft:15,marginRight:15}} onClick={() => this.istowshow(itm,filesId)} className="iconfont icon-xiajiantou font-12 ml2"></i>}
</div>
@ -1054,10 +1058,9 @@ class Fileslists extends Component{
filesId&&filesId===itm.id?"":
<div style={{marginTop:10,height:20}}>
<div style={{display:itm.children.length===1?'none':ti===0?'block':'none',marginLeft:15,width:250,height:1,background:'#c4c4c4'}}></div>
<Tooltip placement="right"title={tt.title.length>13?tt.title:''} >
<div className="indexdiv" style={{marginTop:5,marginBottom:5,marginLeft:30,width:tt.title.length>13?200:undefined,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}} key={ti} id={tt.value} onClick={() => this.moveTos(tt.value )} title={tt.name}>{tt.title}</div>
</Tooltip>
<div style={{display:itm.children.length===1?'none':ti===itm.children.length-1?'block':'none',marginLeft:15,width:250,height:1,background:'#c4c4c4'}}></div>
<li style={{marginTop:5,marginBottom:5,paddingLeft:30,width:tt.title.length>13?200:undefined,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}} key={ti} id={tt.value} onClick={() => this.moveTos(tt.value )} title={tt.title}>{tt.title}</li>
</div>
)

8
public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
Unescape View File

@ -79,7 +79,8 @@ class Coursesleftnav extends Component{
treeDataid:'',
//默认值
treedefaultValue:'',
dropdownStyleshow:''
dropdownStyleshow:'',
treeDataname:''
}
}
@ -323,7 +324,8 @@ class Coursesleftnav extends Component{
})
tr.map((iem,index)=>{
this.setState({
treeDataid:iem.value
treeDataid:iem.value,
treeDataname:iem.title
})
})
}
@ -1207,7 +1209,7 @@ class Coursesleftnav extends Component{
dropdownClassName={{display:this.state.dropdownStyleshow}}
// dropdownMenuStyle={{display:this.state.dropdownStyleshow}}
treeData={this.state.treeData}
placeholder="资源(根目录)"
placeholder={this.state.treeDataname}
disabled={this.state.showPreson}
defaultValue={this.state.treedefaultValue}
treeDefaultExpandAll

Write Preview
Loading…
Cancel
Save