dev_admin
杨树明 6 years ago
parent 8784e2d620
commit af6bcfdf2b

@ -950,7 +950,7 @@ class Fileslists extends Component{
<div className="alltask edu-back-white"
style={
{
display: files===undefined?'block' :files.length===0? 'block' : 'none'
display: files===undefined?'none' :files.length===0? 'block' : 'none'
}
}
>

@ -767,7 +767,7 @@ class GraduationTasks extends Component{
<div className="alltask edu-back-white"
style={
{
display: all_count===undefined?'block' :all_count===0? 'block' : 'none'
display: all_count===undefined?'none' :all_count===0? 'block' : 'none'
}
}
>

@ -28,7 +28,7 @@ class Boards extends Component{
checkAllValue: false,
checkBoxValues: [],
data:[],
topicList: [],
topicList: undefined,
course_public:1,
page:1,
totalCount:undefined,
@ -412,7 +412,7 @@ onBoardsNew=()=>{
}
onPressEnter={this.onPressEnter}
searchPlaceholder={"请输入名称进行搜索"}
showSearchInput={topicList.length >= pageSize}
showSearchInput={topicList&&topicList.length >= pageSize}
></Titlesearchsection>
<Spin size="large" spinning={this.state.isSpin}>
{
@ -475,7 +475,7 @@ onBoardsNew=()=>{
>
</Modals>
</div>
):(<NoneData></NoneData>)
):(topicList && topicList.length===0?<NoneData></NoneData>:<div className="clearfix stu_table mt20"></div>)
}
</Spin>
{

@ -1205,7 +1205,7 @@ class ShixunHomework extends Component{
<div className="alltask "
style={
{
display: datas===undefined?'block' :datas.task_count===0? 'block' : 'none'
display: datas===undefined?'none' :datas.task_count===0? 'block' : 'none'
}
}
>

@ -5,7 +5,7 @@ import {
} from "antd";
import axios from 'axios';
import moment from 'moment';
import {getImageUrl,markdownToHTML} from 'educoder';
import {getImageUrl,markdownToHTML,ImageLayerHook} from 'educoder';
import "../css/messagemy.css"
import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
//私信页面
@ -51,7 +51,9 @@ class Leftdialogue extends Component{
</a>
<div className="fl pr OtherSide-info">
<span className="trangle"></span>
<div className="sms break_word" id="message_content_show_25148" dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
<ImageLayerHook parentSel={`#Leftdialogue${this.props.key}`} parentSel={`#Leftdialogue${this.props.key}`}>
</ImageLayerHook>
<div className="sms break_word" id={`Leftdialogue${this.props.key}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
<div className="edu-txt-right mt5">
<a className="color-grey-c" onClick={()=>this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)} >删除</a>
</div>

@ -575,12 +575,12 @@ class MessagChat extends Component{
}
{
parseInt(item.sender_id)===parseInt(this.props.match.params.userid)?
<Rightdialogue objeysl={item} {...this.state} {...this.props} DELETEsetreplyfun={(user_id,id)=>this.DELETEsetreplyfun(user_id,id)}>
<Rightdialogue key={key} objeysl={item} {...this.state} {...this.props} DELETEsetreplyfun={(user_id,id)=>this.DELETEsetreplyfun(user_id,id)}>
{/*自己的*/}
</Rightdialogue>
:<Leftdialogue objeysl={item} {...this.state} {...this.props} DELETEsetreplyfun={(user_id,id)=>this.DELETEsetreplyfun(user_id,id)}>
:<Leftdialogue key={key} objeysl={item} {...this.state} {...this.props} DELETEsetreplyfun={(user_id,id)=>this.DELETEsetreplyfun(user_id,id)}>
{/*他人的*/}
@ -650,7 +650,10 @@ class MessagChat extends Component{
</span>
<span className="color-grey-c fr">{moment(item.send_time).fromNow()}</span>
</p>
<p className="color-grey-6 lineh-20 justify break_word task-hide-2" style={{wordBreak:"break-word"}} dangerouslySetInnerHTML={{__html:item.content}}></p>
<p className="color-grey-6 lineh-20 justify break_word task-hide-2" style={{wordBreak:"break-word"}} id="MakedownHTML" dangerouslySetInnerHTML={{__html:item.content}}>
</p>
</div>
</div>

@ -5,7 +5,7 @@ import {
} from "antd";
import axios from 'axios';
import moment from 'moment';
import {getImageUrl,markdownToHTML} from 'educoder';
import {getImageUrl,markdownToHTML,ImageLayerHook} from 'educoder';
import "../css/messagemy.css"
import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
//私信页面
@ -51,7 +51,9 @@ class Rightdialogue extends Component{
</a>
<div className="fr pr ThisSide-info">
<span className="trangle"></span>
<div className="sms break_word" id="message_content_show_25137" dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
<ImageLayerHook parentSel={`#Rightdialogue${this.props.key}`} parentSel={`#Rightdialogue${this.props.key}`}>
</ImageLayerHook>
<div className="sms break_word" id={`Rightdialogue${this.props.key}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
<div className="edu-txt-left mt5">
<a className="color-grey-c" onClick={()=>this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)}
>删除</a>

Loading…
Cancel
Save