From 31651d74ee07d7c588ce3010dc1a68be8ebf3620 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 Mar 2020 21:08:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=98=E5=BA=93=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E8=BE=93=E5=85=A5=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../question/component/ChoquesEditor.js | 73 +++++---------- .../question/component/JudquestionEditor.js | 61 ++++--------- .../question/component/SingleEditor.js | 90 ++++++------------- public/react/src/modules/tpm/NewHeader.js | 30 +++---- 4 files changed, 81 insertions(+), 173 deletions(-) diff --git a/public/react/src/modules/question/component/ChoquesEditor.js b/public/react/src/modules/question/component/ChoquesEditor.js index 7f1959dd6..32a68ae44 100644 --- a/public/react/src/modules/question/component/ChoquesEditor.js +++ b/public/react/src/modules/question/component/ChoquesEditor.js @@ -219,22 +219,9 @@ class ChoquesEditor extends Component { var texts; const _text = quill.getText(); const reg = /^[\s\S]*.*[^\s][\s\S]*$/; - - - - - if(this.isNull(_text)===true){ - - return - } - if (!reg.test(_text)) { // 处理编辑器内容为空 - try { - texts=JSON.stringify(value); - }catch (e) { texts=""; - } } else { if(_text.length>=500){ var result = _text.substring(0,450); @@ -288,66 +275,46 @@ class ChoquesEditor extends Component { // debugger const _text = quill.getText(); const reg = /^[\s\S]*.*[^\s][\s\S]*$/; - - if(this.isNull(_text)===true){ - this.setState({ - question_titleysl:"" - }) - return - } - - if (!reg.test(_text)) { // 处理编辑器内容为空 - try { - this.setState({ - question_titleysl: JSON.stringify(value) - }) - }catch (e) { this.setState({ question_titleysl:"" }) - } } else { // 提交到后台的内容需要处理一下; - let texts=""; - texts = JSON.stringify(value); - this.setState({ - question_titleysl: texts - }) + try { + let texts = JSON.stringify(value); + this.setState({ + question_titleysl:texts + }) + }catch (e) { + this.setState({ + question_titleysl:"" + }) + } } } onContentChanges = (value, quill) => { const _text = quill.getText(); const reg = /^[\s\S]*.*[^\s][\s\S]*$/; - - - if(this.isNull(_text)===true){ - this.setState({ - question_titlesysl:"" - }) - return - } - if (!reg.test(_text)) { // 处理编辑器内容为空 - try { - this.setState({ - question_titlesysl: JSON.stringify(value) - }) - }catch (e) { this.setState({ question_titlesysl:"" }) - } } else { // 提交到后台的内容需要处理一下; - let texts=""; + try { + let texts = JSON.stringify(value); + this.setState({ + question_titlesysl:texts + }) + }catch (e) { + this.setState({ + question_titlesysl:"" + }) + } - texts = JSON.stringify(value); - this.setState({ - question_titlesysl: texts - }) } } diff --git a/public/react/src/modules/question/component/JudquestionEditor.js b/public/react/src/modules/question/component/JudquestionEditor.js index b3a054d59..776ffbbe4 100644 --- a/public/react/src/modules/question/component/JudquestionEditor.js +++ b/public/react/src/modules/question/component/JudquestionEditor.js @@ -4,7 +4,6 @@ import { Radio } from 'antd'; import update from 'immutability-helper' import './../questioncss/questioncom.css'; import '../questioncss/font.css'; -import {getUrl, ActionBtn, DMDEditor, ConditionToolTip} from 'educoder'; import QuillForEditor from '../../../common/quillForEditor'; const tagArray = [ @@ -292,72 +291,50 @@ class JudquestionEditor extends Component { // console.log(quill); const _text = quill.getText(); const reg = /^[\s\S]*.*[^\s][\s\S]*$/; - // console.log(_text); - // console.log(_text.length); - if(this.isNull(_text)===true){ - this.setState({ - question_titleysl:"" - }) - return - } - if (!reg.test(_text)) { // 处理编辑器内容为空 - try { this.setState({ - question_titleysl:JSON.stringify(value) + question_titleysl:"" + }) + // console.log("空"); + } else { + // 提交到后台的内容需要处理一下; + try { + let texts = JSON.stringify(value); + this.setState({ + question_titleysl:texts }) }catch (e) { this.setState({ question_titleysl:"" }) } - - // console.log("空"); - } else { - // console.log("有"); - - // 提交到后台的内容需要处理一下; - let texts=""; - texts = JSON.stringify(value); - this.setState({ - question_titleysl: texts - }) } } onContentChanges = (value, quill) => { const _text = quill.getText(); const reg = /^[\s\S]*.*[^\s][\s\S]*$/; - - if(this.isNull(_text)===true){ - this.setState({ - question_titlesysl:"" - }) - return - } if (!reg.test(_text)) { // 处理编辑器内容为空 - try { - this.setState({ - question_titlesysl:JSON.stringify(value) - }) - }catch (e) { this.setState({ question_titlesysl:"" }) - } - } else { // 提交到后台的内容需要处理一下; - let texts=""; + try { - texts = JSON.stringify(value); - this.setState({ - question_titlesysl: texts - }) + let texts = JSON.stringify(value); + this.setState({ + question_titlesysl:texts + }) + }catch (e) { + this.setState({ + question_titlesysl:"" + }) + } } } render() { diff --git a/public/react/src/modules/question/component/SingleEditor.js b/public/react/src/modules/question/component/SingleEditor.js index eacf21373..5feb26f3c 100644 --- a/public/react/src/modules/question/component/SingleEditor.js +++ b/public/react/src/modules/question/component/SingleEditor.js @@ -128,8 +128,14 @@ class SingleEditor extends Component { // this.refs['titleEditor'].showError() this.props.showNotification('请您输入题干'); return editordata; + }else{ + console.log("question_titleysl"); + console.log(question_titleysl); } - for (let i = 0; i < question_choices.length; i++) { + + + + for(let i = 0; i < question_choices.length; i++) { if (!question_choices[i]) { // this.refs[`optionEditor${i}`].showError() this.props.showNotification(`请先输入 ${tagArray[i]} 选项的内容`); @@ -231,7 +237,8 @@ class SingleEditor extends Component { // standard_answers[index] = !standard_answers[index]; this.setState({ standard_answers }) } - onOptionContentChange = (value, quill, index) => { + onOptionContentChange = (value,quill,index) => { + debugger if (index >= this.state.question_choices.length) { // TODO 新建，然后删除CD选项，再输入题干，会调用到这里，且index是3 return; @@ -239,18 +246,9 @@ class SingleEditor extends Component { var texts; const _text = quill.getText(); const reg = /^[\s\S]*.*[^\s][\s\S]*$/; - - - if(this.isNull(_text)===true){ - return - } if (!reg.test(_text)) { // 处理编辑器内容为空 - try { - texts= JSON.stringify(value) - }catch (e) { texts=""; - } } else { if(_text.length>=500){ var result = _text.substring(0,450); @@ -303,81 +301,47 @@ class SingleEditor extends Component { const reg = /^[\s\S]*.*[^\s][\s\S]*$/; - - if(this.isNull(_text)===true){ - this.setState({ - question_titleysl:"" - }) - return - } - - - if (!reg.test(_text)) { // 处理编辑器内容为空 - try { - this.setState({ - question_titleysl: JSON.stringify(value) - }) - }catch (e) { this.setState({ question_titleysl:"" }) - } } else { - var texts=""; - if(_text.length>=979){ - var result = _text.substring(0,975); - // console.log("11111111"); - // console.log(result.length); - texts={"ops":[{"insert":result}]}; - texts=JSON.stringify(texts); - // console.log("2222"); - // console.log(texts.length); - }else { - value = JSON.stringify(value); - if(value.length>=1000){ - let a=value.length-1000; - let b=_text.length-a; - var result = _text.substring(0,b); - texts={"ops":[{"insert":result}]}; - texts=JSON.stringify(texts); - }else{ - texts=value; - } - } + try { let texts = JSON.stringify(value); - this.setState({ - question_titleysl: texts - }) + this.setState({ + question_titleysl:texts===undefined|| null?"":texts + }) + }catch (e) { + this.setState({ + question_titleysl:"" + }) + } } } onContentChanges=(value,quill)=>{ const _text = quill.getText(); const reg = /^[\s\S]*.*[^\s][\s\S]*$/; - if(this.isNull(_text)===true){ - this.setState({ - question_titlesysl:"" - }) - return - } + if (!reg.test(_text)) { // 处理编辑器内容为空 + this.setState({ + question_titlesysl:"" + }) + } else { try { + let texts = JSON.stringify(value); this.setState({ - question_titlesysl:JSON.stringify(value) + question_titlesysl:texts===undefined|| null?"":texts }) }catch (e) { this.setState({ question_titlesysl:"" }) } - } else { - let texts = JSON.stringify(value); - this.setState({ - question_titlesysl: texts - }) + + } } handleShowImage = (url) => { diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 7c701fd25..f58ff50a8 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -919,21 +919,21 @@ class NewHeader extends Component { ` } - {/*{*/} - {/* Periofters===true?*/} - {/*
  • */} - {/* */} - {/*
    */} - {/*
    */} - {/* 题库*/} - {/*
    */} - {/*
    */} - {/*     */} - {/*
    • */} - {/* :""*/} - {/*}*/} + { + Periofters===true? +
  • + +
    +
    + 题库 +
    +
    +     +
    • + :"" + }