From d93a792d9947120eb3883a9b0e771ba8a601cadb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 16:41:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/poll/PollNewQuestbank.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index 3e9be6a74..e29acfc55 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -3249,7 +3249,7 @@ class PollNewQuestbank extends Component { // ) // "" // : - itemo.question.answers.length > 2 &&indext>1? + itemo.question.answers.length > 2 &&indext>=1? { indext > 1 ? @@ -3482,6 +3482,7 @@ class PollNewQuestbank extends Component { : "") : + // 编辑
{resultDom} {this.state.Newdisplay === false ? @@ -3525,8 +3526,8 @@ class PollNewQuestbank extends Component { onInput={(e) => this.HandleInputTopic(e, indexo)}>{itemo.question.question_title} } {itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => { - console.log("chishiyong1"); - console.log(itemo.question.answers[itemo.question.answers.length - 1]); + // console.log("chishiyong1"); + // console.log(itemo.question.answers[itemo.question.answers.length - 1]); // var bools=true; // if(){ // @@ -3576,7 +3577,7 @@ class PollNewQuestbank extends Component { // title="新增" placement={"bottom"}> // :"") - itemo.question.answers.length > 2 && indext>1 ? + itemo.question.answers.length > 2 && indext>=1 ? { indext > 1 ? From 2bc77bad5d4dc12e05156d6715100c03c0dd089d Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 6 Sep 2019 16:48:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=BA=E6=95=B0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/busyWork/NewWorkForm.js | 45 ++++++++++++++++--- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/NewWorkForm.js b/public/react/src/modules/courses/busyWork/NewWorkForm.js index 1ae588db2..33d6e4cda 100644 --- a/public/react/src/modules/courses/busyWork/NewWorkForm.js +++ b/public/react/src/modules/courses/busyWork/NewWorkForm.js @@ -110,6 +110,19 @@ class NewWorkForm extends Component{ {/* min={has_commit ? init_max_num : (min_num == undefined ? 2 : min_num + 1) } */} // 已有提交作品，人数范围只能扩大 const { has_commit, max_num, init_max_num, min_num, init_min_num } = this.state; + if (!min_num) { + this.props.showNotification('最小人数不能为空'); + return; + } else if (min_num < 1) { + this.props.showNotification('最小人数不能小于1'); + return; + } else if (!max_num) { + this.props.showNotification('最大人数不能为空'); + return; + } else if (max_num < min_num) { + this.props.showNotification('最大人数不能小于最小人数'); + return; + } if (has_commit) { if (max_num < init_max_num || min_num > init_min_num) { this.props.showNotification(`已有提交作品，人数范围只能扩大(原设置为：${init_min_num} - ${init_max_num})`) @@ -237,9 +250,9 @@ class NewWorkForm extends Component{ } max_num_change = (val) => { if (val < 2) { - this.setState({ - max_num: 2, - }) + // this.setState({ + // max_num: 2, + // }) return; } const { min_num } = this.state; @@ -248,12 +261,31 @@ class NewWorkForm extends Component{ min_num: val <= min_num ? val - 1 : min_num }) } + personNumValidator = (rule, value, callback) => { + const { min_num, max_num } = this.state; + const form = this.props.form; + if (!min_num) { + callback('最小人数不能为空'); + } else if (min_num < 1) { + callback('最小人数不能小于1'); + } else if (!max_num) { + callback('最大人数不能为空'); + } else if (max_num < min_num) { + callback('最大人数不能小于最小人数'); + } else { + callback(); + } + } min_num_change = (val) => { this.setState({ min_num: val }) } base_on_project_change = () => { this.setState({ base_on_project: !this.state.base_on_project }) } + componentDidMount() { + window.$('.groupSetting .ant-form-item-label > label').addClass('ant-form-item-required') + } + render(){ let {typeId,coursesId,pageType}=this.props.match.params; const { getFieldDecorator } = this.props.form; @@ -411,11 +443,13 @@ class NewWorkForm extends Component{ { isGroup && {getFieldDecorator('personNum', { rules: [{ - required: false + // required: true, + // message: '人数不能为空' + // validator: this.personNumValidator // required: true, message: '请输入最小人数和最大人数' }], })( @@ -447,6 +481,7 @@ class NewWorkForm extends Component{

)} + }
From f8cb72653a64173809107162d9a0a495ecb2f953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 17:01:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/groupjobbank/Groupjobbandetails.js | 3 +-- .../courses/groupjobbank/Groupjobquesanswer.js | 10 ++++++++-- .../courses/questionbank/Generaljobanswer.js | 16 +++++++++++++--- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js index 027c12d04..418d0ded6 100644 --- a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js +++ b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js @@ -67,7 +67,7 @@ class Groupjobbandetails extends Component {
{ - datas&&(datas.description===null? + ddatas.description===null? :datas.description==="null"? @@ -77,7 +77,6 @@ class Groupjobbandetails extends Component { : //
- ) } {/*
*/} {/*{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {*/} diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js index 8e114722a..aeb0dde7b 100644 --- a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js +++ b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js @@ -64,7 +64,7 @@ class Groupjobquesanswer extends Component {
{ - datas&&(datas.reference_answer===null? + datas.reference_answer===null? "" :datas.reference_answer==="null"? "" : @@ -72,7 +72,6 @@ class Groupjobquesanswer extends Component { "" : - ) } {datas.reference_attachments === undefined ? @@ -82,6 +81,13 @@ class Groupjobquesanswer extends Component { "" ) : + datas.reference_attachments === "" ? + (datas.reference_answer===undefined || datas.reference_answer===null? + + : + "" + ) + : datas.reference_attachments === null ? (datas.reference_answer===undefined || datas.reference_answer===null? diff --git a/public/react/src/modules/courses/questionbank/Generaljobanswer.js b/public/react/src/modules/courses/questionbank/Generaljobanswer.js index e821845b3..2aeb04f7f 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobanswer.js +++ b/public/react/src/modules/courses/questionbank/Generaljobanswer.js @@ -57,7 +57,10 @@ class Generaljobanswer extends Component { render() { - let{datas}=this.props + let{datas}=this.props; + console.log("Generaljobanswer"); + console.log(datas.reference_attachments); + console.log(datas.reference_answer); return (
@@ -82,7 +85,7 @@ class Generaljobanswer extends Component { {/*
*/} { - datas&&(datas.reference_answer===null? + datas.reference_answer===null? "" :datas.reference_answer==="null"? "" : @@ -90,7 +93,7 @@ class Generaljobanswer extends Component { "" : - ) + } {datas.reference_attachments === undefined ? @@ -100,6 +103,13 @@ class Generaljobanswer extends Component { "" ) : + datas.reference_attachments === "" ? + (datas.reference_answer===undefined || datas.reference_answer===null? + + : + "" + ) + : datas.reference_attachments === null ? (datas.reference_answer===undefined || datas.reference_answer===null? From f736ed6ebd62a65c8d805d772362fbbbaefecf23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 17:04:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/groupjobbank/Groupjobquesanswer.js | 8 ++++---- .../src/modules/courses/questionbank/Generaljobanswer.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js index aeb0dde7b..3d41ccb79 100644 --- a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js +++ b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js @@ -75,28 +75,28 @@ class Groupjobquesanswer extends Component { } {datas.reference_attachments === undefined ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===null|| datas.reference_answer===""? : "" ) : datas.reference_attachments === "" ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===null|| datas.reference_answer===""? : "" ) : datas.reference_attachments === null ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===null|| datas.reference_answer===""? : "" ) : datas.reference_attachments.length === 0 ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===null|| datas.reference_answer===""? : "" diff --git a/public/react/src/modules/courses/questionbank/Generaljobanswer.js b/public/react/src/modules/courses/questionbank/Generaljobanswer.js index 2aeb04f7f..278cdd691 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobanswer.js +++ b/public/react/src/modules/courses/questionbank/Generaljobanswer.js @@ -97,28 +97,28 @@ class Generaljobanswer extends Component { } {datas.reference_attachments === undefined ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===undefined|| datas.reference_answer===""? : "" ) : datas.reference_attachments === "" ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===undefined|| datas.reference_answer===""? : "" ) : datas.reference_attachments === null ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===undefined|| datas.reference_answer===""? : "" ) : datas.reference_attachments.length === 0 ? - (datas.reference_answer===undefined || datas.reference_answer===null? + (datas.reference_answer===undefined || datas.reference_answer===undefined|| datas.reference_answer===""? : ""