From cb9c4d21154fd57fc601a9c6a013b7d8a15725a8 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 08:49:25 +0800 Subject: [PATCH 1/8] css --- .../src/modules/courses/exercise/new/NullChildEditor.js | 6 +++--- public/react/src/modules/courses/exercise/new/NullEditor.js | 2 +- .../react/src/modules/courses/exercise/new/SingleEditor.js | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/exercise/new/NullChildEditor.js b/public/react/src/modules/courses/exercise/new/NullChildEditor.js index a78028b20..434211f1d 100644 --- a/public/react/src/modules/courses/exercise/new/NullChildEditor.js +++ b/public/react/src/modules/courses/exercise/new/NullChildEditor.js @@ -39,14 +39,14 @@ class NullChildEditor extends Component{ let { question_title, question_score, question_type, question_choices, standard_answers } = this.state; let { question_id, index, onAnswerChange, addChildAnswer, toMDMode, exerciseIsPublish, answers } = this.props; - + // marginTop: '18px' return( -
+
答案(填空{index + 1}):
{ answers.map((item, itemIndex) => { - return
+ return
diff --git a/public/react/src/modules/courses/exercise/new/SingleEditor.js b/public/react/src/modules/courses/exercise/new/SingleEditor.js index 02efe2443..6120e9aea 100644 --- a/public/react/src/modules/courses/exercise/new/SingleEditor.js +++ b/public/react/src/modules/courses/exercise/new/SingleEditor.js @@ -219,9 +219,10 @@ class SingleEditor extends Component{ } .optionRow { margin:0px!important; - margin-bottom: 20px!important; + /* margin-bottom: 20px!important; */ } .signleEditor .content_editorMd_show{ + display: flex; margin-top:0px!important; border-radius:2px; max-width: 1056px; From bbc689cc872fa64e3e954ceb9f1f9e81ba7c74e4 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 09:17:38 +0800 Subject: [PATCH 2/8] =?UTF-8?q?(=20=E6=95=B0=E6=8D=AE=E5=B7=B2=E4=BA=8E=20?= =?UTF-8?q?09:17:12=20=E4=BF=9D=E5=AD=98=20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/tpm/challengesnew/TPMMDEditor.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js index 0f00d1c25..6967de008 100644 --- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js +++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js @@ -80,8 +80,14 @@ function md_elocalStorage(editor,mdu,id){ md_add_data("content",mdu,editor.getValue()); var id1 = "#e_tip_"+id; var id2 = "#e_tips_"+id; - - $(id2).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存 "); + + var text = " 数据已于 " + h + ':' + m + ':' + s +" 保存 "; + // 占位符 + if ($(id2).html() && $(id2).html() != '　') { + $(id2).html( $(id2).html().split('　(')[0] + `　(${text})`); + } else { + $(id2).html(text); + } // $(id2).html(""); } },10000); From 341958003b1063f32687ed772dbf31c245af4d99 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 09:29:40 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/exercise/ExerciseNew.js | 14 +++++++++++++- .../modules/courses/exercise/new/NullDisplay.js | 4 +++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/exercise/ExerciseNew.js b/public/react/src/modules/courses/exercise/ExerciseNew.js index 8bc7ed6ae..0e1489c72 100644 --- a/public/react/src/modules/courses/exercise/ExerciseNew.js +++ b/public/react/src/modules/courses/exercise/ExerciseNew.js @@ -342,6 +342,11 @@ class ExerciceNew extends Component{ this.editingId = null; this.fetchExercise() } + goToPreview = () => { + const exercise_id = this.props.match.params.Id + const courseId = this.props.match.params.coursesId + this.props.history.push(`/courses/${courseId}/exercises/${exercise_id}/student_exercise_list?tab=2`) + } render() { let { exercise_name, exercise_description, course_id, exercise_types, exercise_questions, left_banner_id } = this.state; @@ -366,6 +371,8 @@ class ExerciceNew extends Component{ const isAdmin = this.props.isAdmin() const courseId=this.props.match.params.coursesId; + const exercise_id = this.props.match.params.Id + const isEdit = this.isEdit const commonHandler = { onQestionDelete: this.onQestionDelete, @@ -395,7 +402,7 @@ class ExerciceNew extends Component{ background: #fff; } .exerciseNew .markdown-body { - max-width: 1088px; + max-width: 1128px; } `}
@@ -546,6 +553,11 @@ class ExerciceNew extends Component{ this.addShixun(null)}> 实训题 + + {exercise_id && this.goToPreview()}> + {/* */} + 试卷预览 + }
}
diff --git a/public/react/src/modules/courses/exercise/new/NullDisplay.js b/public/react/src/modules/courses/exercise/new/NullDisplay.js index e507829ed..e5c604767 100644 --- a/public/react/src/modules/courses/exercise/new/NullDisplay.js +++ b/public/react/src/modules/courses/exercise/new/NullDisplay.js @@ -80,12 +80,14 @@ class NullDisplay extends Component{ .answers .answer { background: #EDEDED; color: #C5C5C5; - width: 100%; + display: inline-block; line-height: 16px; padding:12px 10px; margin-bottom:10px; border-radius:2px; + max-width: 1024px; + word-break: break-all; } .answerRow { padding: 1px 0; From d462e2c57a15a45c79fede313e1835561a9e84a7 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 09:45:12 +0800 Subject: [PATCH 4/8] max={10} --- public/react/src/modules/courses/busyWork/NewWork.js | 2 +- .../src/modules/courses/exercise/ExerciseDisplay.js | 11 +++++++---- .../src/modules/courses/exercise/new/SingleDisplay.js | 2 +- .../react/src/modules/courses/exercise/new/common.css | 4 ++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js index a6fc93c92..c30832c8f 100644 --- a/public/react/src/modules/courses/busyWork/NewWork.js +++ b/public/react/src/modules/courses/busyWork/NewWork.js @@ -477,7 +477,7 @@ class NewWork extends Component{ ~ {/* min={has_commit ? init_max_num : (min_num == undefined ? 2 : min_num + 1) } */} - diff --git a/public/react/src/modules/courses/exercise/ExerciseDisplay.js b/public/react/src/modules/courses/exercise/ExerciseDisplay.js index 5992210b4..4da4768d2 100644 --- a/public/react/src/modules/courses/exercise/ExerciseDisplay.js +++ b/public/react/src/modules/courses/exercise/ExerciseDisplay.js @@ -69,20 +69,23 @@ class ExerciseDisplay extends Component{ return(
-
+
{exercise&&exercise.exercise_name}
-
{exercise&&exercise.exercise_description}
+
{exercise&&exercise.exercise_description}
-
+

{ exercise_types && exercise_types.q_singles > 0 && diff --git a/public/react/src/modules/courses/exercise/new/SingleDisplay.js b/public/react/src/modules/courses/exercise/new/SingleDisplay.js index 8973d53db..453cce229 100644 --- a/public/react/src/modules/courses/exercise/new/SingleDisplay.js +++ b/public/react/src/modules/courses/exercise/new/SingleDisplay.js @@ -71,7 +71,7 @@ class SingleDisplay extends Component{ let length = 5; const qName = qNameArray[question_type] return( -

+
@@ -269,7 +275,10 @@ class UseBank extends Component{ - 14 && item.course_list_name} className={nav_my==='myself'?"fl with30 color-grey-6 task-hide pl5":"fl with30 color-grey-6 task-hide pl5"}>{item.course_list_name} + 14 && item.course_list_name} + className={nav_my==='myself'?"fl with30 color-grey-6 task-hide pl5 bankwidth":"fl with30 color-grey-6 task-hide pl5 bankwidth"} + + >{item.course_list_name} { nav_my==='public' && {item.username} diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js index 423632d89..aec7ca390 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js @@ -272,9 +272,11 @@ class Coursesleftnav extends Component{ debugger let {url}=this.state; if(urls!=url){ + debugger this.props.history.replace(urls); this.props.updataleftNavfun(); }else{ + debugger if (key === this.props.indexs) { this.props.unlocationNavfun(undefined) } else { diff --git a/public/react/src/modules/courses/coursesPublic/Addcourses.js b/public/react/src/modules/courses/coursesPublic/Addcourses.js index f3212d9bd..097d55053 100644 --- a/public/react/src/modules/courses/coursesPublic/Addcourses.js +++ b/public/react/src/modules/courses/coursesPublic/Addcourses.js @@ -1,5 +1,5 @@ import React,{ Component } from "react"; -import { Modal,Checkbox,Input} from "antd"; +import { Modal,Checkbox,Input, Spin, Icon } from "antd"; import axios from 'axios'; import Modals from '../../modals/Modals'; const CheckboxGroup = Checkbox.Group; @@ -23,6 +23,7 @@ class Addcourses extends Component{ modalsType:false, modalsTopval:undefined, modalSave:undefined, + isSpin:false } } @@ -144,17 +145,22 @@ class Addcourses extends Component{ } submittojoinclass=()=>{ + this.setState({ + isSpin:true + }) let {invite_code,professor,assistant_professor,student}=this.state; if(invite_code===undefined||invite_code===""){ this.setState({ invite_codetype:true, - invite_codevalue:"邀请码不能为空" + invite_codevalue:"邀请码不能为空", + spinning:false }) return }else{ this.setState({ invite_codetype:false, - invite_codevalue:" " + invite_codevalue:" ", + spinning:false }) } @@ -178,7 +184,12 @@ class Addcourses extends Component{ // // modalSave:this.submitasyn, // course_id:response.data.course_id // }) - this.submitasyn(response.data.course_id) + if(response.data.course_id!=undefined){ + this.submitasyn(response.data.course_id) + } + this.props.hideAddcoursestype(); + + this.props.showNotification(response.data.message); }else{ this.setState({ Addcoursestype:false @@ -193,8 +204,15 @@ class Addcourses extends Component{ // course_id:undefined // }) } + + this.setState({ + spinning:false + }) }).catch((error) => { console.log(error) + this.setState({ + spinning:false + }) }) // if(value===0){ @@ -258,7 +276,7 @@ class Addcourses extends Component{ modalsTopval, modalSave }=this.state; - + const antIcon = ; return(
+
    @@ -331,6 +350,7 @@ class Addcourses extends Component{
+
) diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js index eb0377022..70df3f577 100644 --- a/public/react/src/modules/courses/exercise/ExerciseListItem.js +++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js @@ -167,7 +167,7 @@ class ExerciseListItem extends Component{ { IsAdmin && } diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 4af1aa6ef..a2ddb242a 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -811,7 +811,7 @@ submittojoinclass=(value)=>{ closable={false} footer={null} > -
+