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

调整

Browse Source
dev_chen
杨树明 5 years ago
parent 2f6532bb32
commit 7f56b2f485
8 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/modules/courses/exercise/ExerciseNewCommon.js
Unescape View File

@ -398,6 +398,8 @@ class ExerciseNewCommon extends Component {
getEditQuestionUrl: this.getEditQuestionUrl, getEditQuestionUrl: this.getEditQuestionUrl,
exercise_url: this.props.exercise_url, exercise_url: this.props.exercise_url,
} }
console.log(this.props)
console.log(this.state)
return ( return (
<React.Fragment> <React.Fragment>
<ShixunChooseModal <ShixunChooseModal

2
public/react/src/modules/courses/exercise/new/MainDisplay.js
Unescape View File

@ -44,7 +44,7 @@ class MainDisplay extends Component{
<React.Fragment> <React.Fragment>
<div style={{color: '#05101A'}} className="font-16 mb5 font-bd">参考答案：</div> <div style={{color: '#05101A'}} className="font-16 mb5 font-bd">参考答案：</div>
{this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={standard_answer[0]} selector={'answer_' + qNumber} {!this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={standard_answer[0]} selector={'answer_' + qNumber}
className="" className=""
></MarkdownToHtml>:<QuillForEditor ></MarkdownToHtml>:<QuillForEditor
readOnly={true} readOnly={true}

2
public/react/src/modules/courses/exercise/new/NullDisplay.js
Unescape View File

@ -82,7 +82,7 @@ class NullDisplay extends Component{
<div className="answers"> <div className="answers">
{ answers.answer_text.map((item, itemIndex) => { { answers.answer_text.map((item, itemIndex) => {
return( return(
this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml !this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml
className="answer" key={itemIndex} className="answer" key={itemIndex}
content={item} selector={'null_' + (index + 1) + (_index + 1) + (itemIndex + 1)} content={item} selector={'null_' + (index + 1) + (_index + 1) + (itemIndex + 1)}
></MarkdownToHtml>:<QuillForEditor ></MarkdownToHtml>:<QuillForEditor

4
public/react/src/modules/courses/exercise/new/QestionDisplayHeader.js
Unescape View File

@ -29,7 +29,7 @@ class QestionDisplayHeader extends Component{
const qName = qNameArray[question_type] const qName = qNameArray[question_type]
// console.log(this.props) console.log(this.props)
return( return(
<React.Fragment> <React.Fragment>
<div className="new_li"> <div className="new_li">
@ -77,7 +77,7 @@ class QestionDisplayHeader extends Component{
</div> </div>
</div> </div>
{ question_title && { question_title &&
this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={question_title} selector={'qtitle_' + (index + 1)} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px' }} !this.props.exercise||this.props.exercise&&this.props.exercise.is_md||this.props.question_type===6?<MarkdownToHtml content={question_title} selector={'qtitle_' + (index + 1)} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px' }}
></MarkdownToHtml>:<QuillForEditor ></MarkdownToHtml>:<QuillForEditor
style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px'}} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px'}}

2
public/react/src/modules/courses/exercise/new/ShixunDisplay.js
Unescape View File

@ -105,7 +105,7 @@ class ShixunDisplay extends Component{
></QestionDisplayHeader> ></QestionDisplayHeader>
{this.props.exercise&&this.props.exercise.is_md?<div className="mainQuestionDisplay color-grey-9 markdown-body" {!this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<div className="mainQuestionDisplay color-grey-9 markdown-body"
dangerouslySetInnerHTML={{__html: markdownToHTML(question_title)}} dangerouslySetInnerHTML={{__html: markdownToHTML(question_title)}}
> >
</div>:<QuillForEditor </div>:<QuillForEditor

38
public/react/src/modules/courses/exercise/new/ShixunProgramming.js
Unescape View File

@ -1,5 +1,5 @@
import React,{ Component } from "react"; import React,{ Component } from "react";
import {QuillForEditor,markdownToHTML} from 'educoder'; import {MarkdownToHtml,QuillForEditor} from 'educoder';
import QestionDisplayHeader from './QestionDisplayHeader' import QestionDisplayHeader from './QestionDisplayHeader'
@ -14,8 +14,8 @@ class ShixunProgramming extends Component{
componentDidMount = () => { componentDidMount = () => {
} }
render() { render() {
let { question_title, let { description,question_title,
question_id, index, shixun_identifier question_id, index, shixun_identifier,hack_identifier
} = this.props; } = this.props;
const qNumber = `question_${index}`; const qNumber = `question_${index}`;
@ -36,24 +36,24 @@ class ShixunProgramming extends Component{
`}</style> `}</style>
{/*<QestionDisplayHeader {...this.props} question_title={question_title}*/} <QestionDisplayHeader {...this.props} question_title={question_title}
{/* topRight={*/} topRight={
{/* <a target="_blank" href={`/shixuns/${shixun_identifier}/challenges`} className="mr30"*/} <a target="_blank" href={`/myproblems/${hack_identifier}`} className="mr30"
{/* style={{color: '#4CACFF'}}*/} style={{color: '#4CACFF'}}
{/* >实训详情</a>*/} >实训详情</a>
{/* }*/} }
{/*></QestionDisplayHeader>*/} ></QestionDisplayHeader>
{description&&
!this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={description} selector={'qtitle_' + (index + 1)} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px' }}
{/*{this.props.exercise&&this.props.exercise.is_md?<div className="mainQuestionDisplay color-grey-9 markdown-body"*/} ></MarkdownToHtml>:<QuillForEditor
{/* dangerouslySetInnerHTML={{__html: markdownToHTML(question_title)}}*/} style={{ display: 'inline-block', width:'100%' , margin: '10px 0px 15px',padding:'0px'}}
{/*>*/} readOnly={true}
{/*</div>:<QuillForEditor*/} value={description?JSON.parse(description):""}
{/* readOnly={true}*/} // showUploadImage={this.handleShowUploadImage}
{/* style={{ float: 'left', display: 'inline-block' ,padding:'0px',margin: '2px 0px 0px'}}*/} />}
{/* value={question_title?JSON.parse(question_title):""}*/}
{/* // showUploadImage={this.handleShowUploadImage}*/}
{/*/>}*/}
{/*{shixun.map((ch, index) => {*/} {/*{shixun.map((ch, index) => {*/}
{/* return <div>*/} {/* return <div>*/}

4
public/react/src/modules/courses/exercise/new/SingleDisplay.js
Unescape View File

@ -78,7 +78,7 @@ class SingleDisplay extends Component{
flexDirection:"row", flexDirection:"row",
}} key={optionIndex}> }} key={optionIndex}>
<Radio disabled className="fl lineh-25 w50" checked={item.standard_boolean}>{prefix}</Radio> <Radio disabled className="fl lineh-25 w50" checked={item.standard_boolean}>{prefix}</Radio>
{this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1) + '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }} {!this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1) + '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }}
></MarkdownToHtml>:<QuillForEditor ></MarkdownToHtml>:<QuillForEditor
readOnly={true} readOnly={true}
@ -96,7 +96,7 @@ class SingleDisplay extends Component{
flexDirection:"row", flexDirection:"row",
}} key={optionIndex}> }} key={optionIndex}>
<Checkbox disabled className="fl lineh-25 w50" checked={item.standard_boolean}>{prefix}</Checkbox> <Checkbox disabled className="fl lineh-25 w50" checked={item.standard_boolean}>{prefix}</Checkbox>
{this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1)+ '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }} {!this.props.exercise||this.props.exercise&&this.props.exercise.is_md?<MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1)+ '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }}
></MarkdownToHtml>:<QuillForEditor ></MarkdownToHtml>:<QuillForEditor
readOnly={true} readOnly={true}

2
public/react/src/modules/courses/exercise/new/common.js
Unescape View File

@ -4,6 +4,7 @@ export const Q_TYPE_JUDGE = 2 // 判断
export const Q_TYPE_NULL = 3 // 填空 export const Q_TYPE_NULL = 3 // 填空
export const Q_TYPE_MAIN = 4 // 填空 export const Q_TYPE_MAIN = 4 // 填空
export const Q_TYPE_SHIXUN = 5 // 实训 export const Q_TYPE_SHIXUN = 5 // 实训
export const Q_TYPE_SHIXUN_BIANCHENG = 6 // 编程题
export const qNameArray = [ export const qNameArray = [
'单选题', '单选题',
@ -12,4 +13,5 @@ export const qNameArray = [
'填空题', '填空题',
'简答题', '简答题',
'实训题', '实训题',
'编程题'
] ]
Write Preview
Loading…
Cancel
Save