From 2d544818a88e9ed24cb613d337090b639f5a7ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 18 Feb 2020 15:53:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BE=93=E5=85=A5=E7=9A=84?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/common/quillForEditor/index.js | 11 +++++----- .../question/component/ChoquesEditor.js | 21 +++++++++++++------ .../question/component/JudquestionEditor.js | 14 +++++++++++-- .../question/component/SingleEditor.js | 18 ++++++++++++---- 4 files changed, 47 insertions(+), 17 deletions(-) diff --git a/public/react/src/common/quillForEditor/index.js b/public/react/src/common/quillForEditor/index.js index 012743141..89a4f6224 100644 --- a/public/react/src/common/quillForEditor/index.js +++ b/public/react/src/common/quillForEditor/index.js @@ -22,8 +22,8 @@ import FillBlot from './FillBlot'; const Size = Quill.import('attributors/style/size'); const Font = Quill.import('formats/font'); // const Color = Quill.import('attributes/style/color'); -Size.whitelist = ['12px', '14px', '16px', '18px', '20px', false]; -Font.whitelist = ['SimSun', 'SimHei','Microsoft-YaHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif']; +Size.whitelist = ['14px', '16px', '18px', '20px', false]; +Font.whitelist = ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif']; window.Quill = Quill; window.katex = katex; @@ -55,10 +55,11 @@ function QuillForEditor ({ // toolbar 默认值 const defaultConfig = [ 'bold', 'italic', 'underline', - {size: ['12px', '14px', '16px', '18px', '20px']}, + {size: ['14px', '16px', '18px', '20px']}, {align: []}, {list: 'ordered'}, {list: 'bullet'}, // 列表 {script: 'sub'}, {script: 'super'}, { 'color': [] }, { 'background': [] }, + { 'font': ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif']}, {header: [1,2,3,4,5,false]}, 'blockquote', 'code-block', 'link', 'image', 'video', @@ -99,7 +100,7 @@ function QuillForEditor ({ */ handler: function (range, context) { /** - * index: 删除元素的位置 + * index: 删除元素的位置 * length: 删除元素的个数 */ const {index, length} = range; @@ -123,7 +124,7 @@ function QuillForEditor ({ let delIndexs = []; // 获取删除元素的下标 delArrs.forEach((item, i) => { - leaveLen === 0 ? delIndexs.push(i) : delIndexs.push(leaveLen + i); + leaveLen === 0 ? delIndexs.push(i) : delIndexs.push(leaveLen + i); }); deleteFill && deleteFill(delIndexs); // 调用删除回调, 返回删除的元素下标[] return true diff --git a/public/react/src/modules/question/component/ChoquesEditor.js b/public/react/src/modules/question/component/ChoquesEditor.js index 0e483cf9f..aaae5e4cc 100644 --- a/public/react/src/modules/question/component/ChoquesEditor.js +++ b/public/react/src/modules/question/component/ChoquesEditor.js @@ -277,7 +277,7 @@ class ChoquesEditor extends Component{ } onContentChange=(value,quill)=>{ - debugger + // debugger const _text = quill.getText(); const reg = /^[\s\S]*.*[^\s][\s\S]*$/; if (!reg.test(_text)) { @@ -381,7 +381,10 @@ class ChoquesEditor extends Component{ // //////console.log("xuanzheshijuan"); // //////console.log(answerTagArray); // //////console.log(!exerciseIsPublish); - + const options=['code-block', 'image', 'formula',{size: ['14px', '16px', '18px', '20px']}, + { 'color': ['#333333','#e60000','#ff9900','#ffff00','#ffffff']}, + { 'font': ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif']} + ] return(

{/* {!question_id ? '新建' : '编辑'} */} @@ -414,7 +423,7 @@ class ChoquesEditor extends Component{ imgAttrs={{width: '146px', height: '136px'}} style={{ height: '155px'}} placeholder="请您输入题干" - options={['code-block', 'image', 'formula']} + options={options} value={question_title} onContentChange={this.onContentChange} @@ -448,7 +457,7 @@ class ChoquesEditor extends Component{ imgAttrs={{width: '146px', height: '136px'}} style={{ height: '166px'}} placeholder="请您输入题干" - options={['code-block', 'image', 'formula']} + options={options} value={item} onContentChange={(value,quill) => this.onOptionContentChange(value,quill,index)} /> @@ -458,7 +467,7 @@ class ChoquesEditor extends Component{ imgAttrs={{width: '146px', height: '136px'}} style={{ height: '166px'}} placeholder="请您输入题干" - options={['code-block', 'image', 'formula']} + options={options} value={JSON.parse(item)} onContentChange={(value,quill) => this.onOptionContentChange(value,quill,index)} /> @@ -497,7 +506,7 @@ class ChoquesEditor extends Component{ imgAttrs={{width: '146px', height: '136px'}} style={{height: '166px' }} placeholder="请您输入题目解析" - options={['code-block', 'image', 'formula']} + options={options} value={question_titles} onContentChange={this.onContentChanges} /> diff --git a/public/react/src/modules/question/component/JudquestionEditor.js b/public/react/src/modules/question/component/JudquestionEditor.js index 6edcabb61..50b824068 100644 --- a/public/react/src/modules/question/component/JudquestionEditor.js +++ b/public/react/src/modules/question/component/JudquestionEditor.js @@ -397,6 +397,10 @@ class JudquestionEditor extends Component{ // ////////console.log(answerTagArray); // ////////console.log(!exerciseIsPublish); const params= this.props&&this.props.match&&this.props.match.params; + const options=['code-block', 'image', 'formula',{size: ['14px', '16px', '18px', '20px']}, + { 'color': ['#333333','#e60000','#ff9900','#ffff00','#ffffff']}, + { 'font': ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif']} + ] return(

{/* {!question_id ? '新建' : '编辑'} */} @@ -429,7 +439,7 @@ class JudquestionEditor extends Component{ imgAttrs={{width: '146px', height: '136px'}} style={{ height: '155px'}} placeholder="请您输入题干" - options={['code-block', 'image', 'formula']} + options={options} value={question_title} onContentChange={this.onContentChange} @@ -479,7 +489,7 @@ class JudquestionEditor extends Component{ imgAttrs={{width: '146px', height: '136px'}} style={{height: '166px' }} placeholder="请您输入题目解析" - options={['code-block', 'image', 'formula']} + options={options} value={question_titles} onContentChange={this.onContentChanges} /> diff --git a/public/react/src/modules/question/component/SingleEditor.js b/public/react/src/modules/question/component/SingleEditor.js index 2c3bd1a83..a95ee6889 100644 --- a/public/react/src/modules/question/component/SingleEditor.js +++ b/public/react/src/modules/question/component/SingleEditor.js @@ -415,6 +415,10 @@ class SingleEditor extends Component{ // //////console.log("xuanzheshijuan"); // //////console.log(answerTagArray); // //////console.log(!exerciseIsPublish); + const options=['code-block', 'image', 'formula',{size: ['14px', '16px', '18px', '20px']}, + { 'color': ['#333333','#e60000','#ff9900','#ffff00','#ffffff']}, + { 'font': ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif']} + ] return(

@@ -436,6 +440,12 @@ class SingleEditor extends Component{ #e_tips_mdEditor_question_undefined4{ display: none; } + .signleEditor .quill_editor_for_react_area .ql-toolbar .ql-formats .ql-size { + line-height: 20px; + } + .signleEditor .quill_editor_for_react_area .ql-toolbar .ql-formats .ql-font { + line-height: 20px; + } `}

{/* {!question_id ? '新建' : '编辑'} */} @@ -448,7 +458,7 @@ class SingleEditor extends Component{ imgAttrs={{width: '146px', height: '136px'}} style={{ height: '155px'}} placeholder="请您输入题干" - options={['code-block', 'image', 'formula']} + options={options} value={question_title} onContentChange={this.onContentChange} /> @@ -480,7 +490,7 @@ class SingleEditor extends Component{ imgAttrs={{width: '146px', height: '136px'}} style={{ height: '166px'}} placeholder="请您输入题干" - options={['code-block', 'image', 'formula']} + options={options} value={item} onContentChange={(value,quill) => this.onOptionContentChange(value,quill,index)} /> @@ -490,7 +500,7 @@ class SingleEditor extends Component{ imgAttrs={{width: '146px', height: '136px'}} style={{ height: '166px'}} placeholder="请您输入题干" - options={['code-block', 'image', 'formula']} + options={options} value={JSON.parse(item)} onContentChange={(value,quill) => this.onOptionContentChange(value,quill,index)} /> @@ -531,7 +541,7 @@ class SingleEditor extends Component{ imgAttrs={{width: '146px', height: '136px'}} style={{height: '166px' }} placeholder="请您输入题目解析" - options={['code-block', 'image', 'formula']} + options={options} value={question_titles} onContentChange={this.onContentChanges} />