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

dev_hjm
daiao 6 years ago
commit cab458e141

@ -12,6 +12,7 @@ export function markdownToHTML(oldContent, selector) {
window.$('#' + selector).html(oldContent) window.$('#' + selector).html(oldContent)
} else { } else {
try { try {
$("#"+selector).html('')
// selector || // selector ||
var markdwonParser = window.editormd.markdownToHTML(selector || "md_div", { var markdwonParser = window.editormd.markdownToHTML(selector || "md_div", {
markdown: oldContent, // .replace(/▁/g,"▁▁▁"), markdown: oldContent, // .replace(/▁/g,"▁▁▁"),

@ -134,7 +134,7 @@ class CaseDetail extends Component{
`} `}
</style> </style>
<div class="mt20 setMDStyle"> <div class="mt20 setMDStyle">
{ CaseDetail && CaseDetail.content && <MarkdownToHtml content={CaseDetail.content} selector="casesDetail" style={{width:"100%!important"}}></MarkdownToHtml>} { CaseDetail && CaseDetail.content && <MarkdownToHtml content={CaseDetail.content} id="casesDetail" selector="casesDetail" style={{width:"100%!important"}}></MarkdownToHtml>}
</div> </div>
{ attachments && { attachments &&
<div className="mt10"> <div className="mt10">

@ -93,9 +93,7 @@ class CaseList extends Component{
render(){ render(){
let { type , search ,libraries , totalCount ,pageSize ,page } = this.state; let { type , search ,libraries , totalCount ,pageSize ,page } = this.state;
let { current_user } = this.props; let { checkIfLogin } = this.props;
console.log(current_user);
console.log(this.props);
return( return(
<React.Fragment> <React.Fragment>
<img src={mainImg} width="100%" /> <img src={mainImg} width="100%" />
@ -112,7 +110,7 @@ class CaseList extends Component{
<a href="javascript:void(0)">全部</a> <a href="javascript:void(0)">全部</a>
</li> </li>
{ {
current_user && checkIfLogin() &&
<li className={type == 1 ? "active" :""} onClick={()=>this.changeType(1)}> <li className={type == 1 ? "active" :""} onClick={()=>this.changeType(1)}>
<a href="javascript:void(0)">我的</a> <a href="javascript:void(0)">我的</a>
</li> </li>

@ -74,8 +74,11 @@ class CaseNew extends Component{
const index = state[stateName].indexOf(file); const index = state[stateName].indexOf(file);
const newFileList = state[stateName].slice(); const newFileList = state[stateName].slice();
newFileList.splice(index, 1); newFileList.splice(index, 1);
console.log("newFileList");
console.log(newFileList.map(item =>{ return( item.id )}));
return { return {
[stateName]: newFileList, [stateName]: newFileList,
filesID:newFileList.map(item =>{ return( item.id )})
}; };
}); });
} }

Loading…
Cancel
Save