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

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

Browse Source
dev_forum
杨树林 6 years ago
parent e3670b0027 762ec25477
commit 77058ea195
10 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
public/react/src/context/TPIContextProvider.js
Unescape View File

@ -903,10 +903,10 @@ pop_box_new(htmlvalue, 480, 182);
</div> :
<React.Fragment>
<Button onClick={() => this.handleGdialogClose()} color="primary"
className={`${classes.button} ${classes.buttonGray}`}>
className={`${classes.button} ${classes.buttonGray} ${classes.borderRadiusNone}`}>
关闭
</Button>
<Button variant="raised" className={`${classes.button}`}
<Button variant="raised" className={`${classes.button} ${classes.borderRadiusNone}`}
onClick={() => this.onGdialogOkBtnClick() } color="primary" autoFocus>
{ this.okButtonText ? this.okButtonText : '确定' }
</Button>

15
public/react/src/modules/courses/boards/AddDirModal.js
Unescape View File

@ -22,6 +22,15 @@ class AddDirModal extends Component{
let coursesId = this.props.match.params.coursesId;
const url = `/courses/${coursesId}/boards.json`
let { inputValue } = this.state;
if (!inputValue) {
this.setState({ errorMsg: '名称不能为空'})
return;
}
if (inputValue.length > 20) {
this.setState({ errorMsg: '名称不能超过20个字'})
return;
}
this.setState({ errorMsg: ''})
axios.post(url,{
name: inputValue
@ -36,10 +45,10 @@ class AddDirModal extends Component{
})
}
onCancel = () => {
this.setState({ visible: false, inputValue: '' })
this.setState({ visible: false, inputValue: '', errorMsg: '' })
}
render(){
let { inputValue, visible } = this.state;
let { inputValue, visible, errorMsg } = this.state;
const { title } = this.props;
return(
<Modal
@ -61,6 +70,8 @@ class AddDirModal extends Component{
onInput={this.onInput}
/>
</div>
{errorMsg && <span style={{color: 'red', marginTop: '2px', display: 'inline-block' }}>{errorMsg}</span>}
{/* {this.state.NavmodalValuetype===true?<span className={"color-red"}>
{this.state.NavmodalValues}

2
public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js
Unescape View File

@ -36,7 +36,7 @@ class Graduationtaskitem extends Component{
</a>
<span className="t_area fl">{item.time}</span>
{/* 分数 */}
{item.score >= 0 && <span className="score_area fl">{item.score}分</span>}
{item.score != null && item.score >= 0 && <span className="score_area fl">{item.score}分</span>}
{ !item.is_invalid && item.delete && <Tooltip title={ "删除" } >
<i className="iconfont icon-shanchu mr5 fr" style={{marginLeft: '6px'}}

3
public/react/src/modules/page/component/MUIDialogStyleUtil.js
Unescape View File

@ -9,6 +9,9 @@ const MUIDialogStyleUtil = {
height: '50px',
},
borderRadiusNone: {
borderRaduis: '0px'
},
buttonGray: {
color: '#FFFFFF',
background: '#CCCCCC',

4
public/react/src/modules/page/component/TPICodeSetting.js
Unescape View File

@ -141,8 +141,8 @@ class TPICodeSetting extends Component {
</div>
</Tooltip>
<Tooltip title={ forbid_copy ? "启用页面复制和粘贴功能"
: "禁用页面复制和粘贴功能"} disableFocusListener={true}>
<Tooltip title={ forbid_copy ? "禁用页面复制和粘贴功能"
: "启用页面复制和粘贴功能"} disableFocusListener={true}>
<div className="-layout-h -center -justify-between">
<div className="ide-settings--item-key">禁止代码复制粘贴</div>

1
public/react/src/modules/page/component/monaco/TPIMonaco.js
Unescape View File

@ -311,6 +311,7 @@ class TPIMonaco extends Component {
// 禁用复制
window.editor_monaco.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_C, () => null);
window.editor_monaco.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_V, () => null);
}

2
public/react/src/modules/page/main/ChooseEvaluateView.js
Unescape View File

@ -35,6 +35,7 @@ class ChooseEvaluateView extends Component {
testSetsComponentArray.push(
<div className="-task-ces-top clearfix" onClick={ () => this.props.onTestSetHeaderClick(index) }
style={{cursor:'pointer'}} key={index+'-0'}>
<p>
<i className={`fa ${ 'fa-caret-right'} mr5 font-16`}
style={isExpanded ? {transform: 'rotate(90deg)'} : {}}></i>
<span className="font-14">题目 {index + 1}</span>
@ -46,6 +47,7 @@ class ChooseEvaluateView extends Component {
item.result === false
? 'fa-exclamation-circle -text-danger'
: 'fa-check-circle color-light-green font-16') } fr mt8 ml5 `}></i>
</p>
</div>
)

8
public/react/src/modules/page/main/CodeEvaluateView.css
Unescape View File

@ -6,7 +6,8 @@
}
#game_test_set_results .-task-ces-top {
background: #1F2F3B;
padding: 9px 20px;
padding: 9px 20px;
height: 38px;
}
@ -110,8 +111,5 @@
padding-top: 8px;
}
#evaluating_contents .-text-danger{
/* padding-bottom: 6px; */
}
#evaluating_contents p.evaluateResult {
margin-bottom: 10px;
padding-bottom: 6px;
}

2
public/react/src/modules/page/main/CodeEvaluateView.js
Unescape View File

@ -233,7 +233,7 @@ class CodeEvaluateView extends Component {
</div>
</React.Fragment>
) :
<p className="color-orange -task-testline pl20">
<p className="color-orange -task-testline pl20 " style={{ 'padding-bottom': '8px' }}>
{ !allowed_unlock ? '隐藏测试集，暂不支持解锁和查看。' : '此为隐藏测试项。'}
{ (power === 0 && allowed_unlock == true) ? <a href="javascript:void(0)" className="color_white test_set_data"
onClick={()=>showDialog({ contentText, callback: testSetUnlock , moreButtonsRender})}

4
public/react/src/modules/page/taskList/TaskList.js
Unescape View File

@ -23,7 +23,7 @@ class TaskList extends Component {
challenge.subject = challenge.name
const showExp = (challenge.experience > 0 && challenge.status === 2) ? '+' + challenge.experience : challenge.experience
// const showGold = (challenge.gold > 0 && challenge.status === 2) ? '+' + challenge.gold : challenge.gold
const showGold = (challenge.gold > 0 && challenge.status === 2) ? '+' + challenge.gold : challenge.gold
return (
<div className={classNames("panel-list", {'current': (currentChallenge.position-1) === index})} key={index}>
<div className="currentSelected"></div>
@ -57,7 +57,7 @@ class TaskList extends Component {
<span className={`font-12 mr15 info-partly ${(challenge.status === 2 && challenge.experience > 0) ? 'positive ' : 'negative'}`} id="shixun_grade_118">
金币<span className="ml5">
{/*因为关卡金币和经验值是一样的，所以这里可以直接用经验值*/}
{ showExp }
{ showGold }
</span>
</span>

Write Preview
Loading…
Cancel
Save