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

调整输入的大小

Browse Source
dev_aliyun2
杨树林 6 years ago committed by harry
parent fbb29ad1a9
commit c0642b1d2c
4 changed files with 73 additions and 38 deletions
Show Stats Download Patch File Download Diff File

16
public/react/src/common/quillForEditor/index.js
Unescape View File

@ -21,8 +21,9 @@ import ImageBlot from './ImageBlot';
import FillBlot from './FillBlot'; import FillBlot from './FillBlot';
const Size = Quill.import('attributors/style/size'); const Size = Quill.import('attributors/style/size');
const Font = Quill.import('formats/font'); const Font = Quill.import('formats/font');
Size.whitelist = ['12px', '14px', '16px', '18px', '20px', false]; // const Color = Quill.import('attributes/style/color');
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.Quill = Quill;
window.katex = katex; window.katex = katex;
@ -52,11 +53,12 @@ function QuillForEditor({
// toolbar 默认值 // toolbar 默认值
const defaultConfig = [ const defaultConfig = [
'bold', 'italic', 'underline', 'bold', 'italic', 'underline',
{ size: ['12px', '14px', '16px', '18px', '20px'] }, {size: ['14px', '16px', '18px', '20px']},
{ align: [] }, { list: 'ordered' }, { list: 'bullet' }, // 列表 {align: []}, {list: 'ordered'}, {list: 'bullet'}, // 列表
{ script: 'sub' }, { script: 'super' }, {script: 'sub'}, {script: 'super'},
{ 'color': [] }, { 'background': [] }, { 'color': [] }, { 'background': [] },
{ header: [1, 2, 3, 4, 5, false] }, { 'font': ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif']},
{header: [1,2,3,4,5,false]},
'blockquote', 'code-block', 'blockquote', 'code-block',
'link', 'image', 'video', 'link', 'image', 'video',
'formula', 'formula',
@ -96,7 +98,7 @@ function QuillForEditor({
*/ */
handler: function (range, context) { handler: function (range, context) {
/** /**
* index: 删除元素的位置 * index: 删除元素的位置
* length: 删除元素的个数 * length: 删除元素的个数
*/ */
const { index, length } = range; const { index, length } = range;

23
public/react/src/modules/question/component/ChoquesEditor.js
Unescape View File

@ -267,7 +267,7 @@ class ChoquesEditor extends Component {
} }
onContentChange=(value,quill)=>{ onContentChange=(value,quill)=>{
debugger // debugger
const _text = quill.getText(); const _text = quill.getText();
const reg = /^[\s\S]*.*[^\s][\s\S]*$/; const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
if (!reg.test(_text)) { if (!reg.test(_text)) {
@ -371,8 +371,11 @@ class ChoquesEditor extends Component {
// //////console.log("xuanzheshijuan"); // //////console.log("xuanzheshijuan");
// //////console.log(answerTagArray); // //////console.log(answerTagArray);
// //////console.log(!exerciseIsPublish); // //////console.log(!exerciseIsPublish);
const options=['code-block', 'image', 'formula',{size: ['14px', '16px', '18px', '20px']},
return ( { 'color': ['#333333','#e60000','#ff9900','#ffff00','#ffffff']},
{ 'font': ['Microsoft-YaHei','SimSun', 'SimHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif']}
]
return(
<div className="padding20-30 signleEditor duoxuano" id={qNumber}> <div className="padding20-30 signleEditor duoxuano" id={qNumber}>
<style>{` <style>{`
.optionMdEditor { .optionMdEditor {
@ -392,6 +395,12 @@ class ChoquesEditor extends Component {
#e_tips_mdEditor_question_undefined4{ #e_tips_mdEditor_question_undefined4{
display: none; 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;
}
`}</style> `}</style>
<p className="mb10 clearfix"> <p className="mb10 clearfix">
{/* {!question_id ? '新建' : '编辑'} */} {/* {!question_id ? '新建' : '编辑'} */}
@ -404,7 +413,7 @@ class ChoquesEditor extends Component {
imgAttrs={{ width: '146px', height: '136px' }} imgAttrs={{ width: '146px', height: '136px' }}
style={{ height: '155px' }} style={{ height: '155px' }}
placeholder="请您输入题干" placeholder="请您输入题干"
options={['code-block', 'image', 'formula']} options={options}
value={question_title} value={question_title}
onContentChange={this.onContentChange} onContentChange={this.onContentChange}
@ -438,7 +447,7 @@ class ChoquesEditor extends Component {
imgAttrs={{ width: '146px', height: '136px' }} imgAttrs={{ width: '146px', height: '136px' }}
style={{ height: '166px' }} style={{ height: '166px' }}
placeholder="请您输入题干" placeholder="请您输入题干"
options={['code-block', 'image', 'formula']} options={options}
value={item} value={item}
onContentChange={(value, quill) => this.onOptionContentChange(value, quill, index)} onContentChange={(value, quill) => this.onOptionContentChange(value, quill, index)}
/> />
@ -448,7 +457,7 @@ class ChoquesEditor extends Component {
imgAttrs={{ width: '146px', height: '136px' }} imgAttrs={{ width: '146px', height: '136px' }}
style={{ height: '166px' }} style={{ height: '166px' }}
placeholder="请您输入题干" placeholder="请您输入题干"
options={['code-block', 'image', 'formula']} options={options}
value={JSON.parse(item)} value={JSON.parse(item)}
onContentChange={(value, quill) => this.onOptionContentChange(value, quill, index)} onContentChange={(value, quill) => this.onOptionContentChange(value, quill, index)}
/> />
@ -487,7 +496,7 @@ class ChoquesEditor extends Component {
imgAttrs={{ width: '146px', height: '136px' }} imgAttrs={{ width: '146px', height: '136px' }}
style={{ height: '166px' }} style={{ height: '166px' }}
placeholder="请您输入题目解析" placeholder="请您输入题目解析"
options={['code-block', 'image', 'formula']} options={options}
value={question_titles} value={question_titles}
onContentChange={this.onContentChanges} onContentChange={this.onContentChanges}
/> />

50
public/react/src/modules/question/component/JudquestionEditor.js
Unescape View File

@ -384,8 +384,12 @@ class JudquestionEditor extends Component {
// ////////console.log("xuanzheshijuan"); // ////////console.log("xuanzheshijuan");
// ////////console.log(answerTagArray); // ////////console.log(answerTagArray);
// ////////console.log(!exerciseIsPublish); // ////////console.log(!exerciseIsPublish);
const params = this.props && this.props.match && this.props.match.params; const params= this.props&&this.props.match&&this.props.match.params;
return ( 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(
<div className="padding20-30 signleEditor danxuano" id={qNumber}> <div className="padding20-30 signleEditor danxuano" id={qNumber}>
<style>{` <style>{`
.optionMdEditor { .optionMdEditor {
@ -405,6 +409,12 @@ class JudquestionEditor extends Component {
#e_tips_mdEditor_question_undefined4{ #e_tips_mdEditor_question_undefined4{
display: none; 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;
}
`}</style> `}</style>
<p className="mb10 clearfix"> <p className="mb10 clearfix">
{/* {!question_id ? '新建' : '编辑'} */} {/* {!question_id ? '新建' : '编辑'} */}
@ -417,7 +427,7 @@ class JudquestionEditor extends Component {
imgAttrs={{ width: '146px', height: '136px' }} imgAttrs={{ width: '146px', height: '136px' }}
style={{ height: '155px' }} style={{ height: '155px' }}
placeholder="请您输入题干" placeholder="请您输入题干"
options={['code-block', 'image', 'formula']} options={options}
value={question_title} value={question_title}
onContentChange={this.onContentChange} onContentChange={this.onContentChange}
@ -456,23 +466,23 @@ class JudquestionEditor extends Component {
<div className="mt10"> <div className="mt10">
<p className="mb10 clearfix"> <p className="mb10 clearfix">
{/* {!question_id ? '新建' : '编辑'} */} {/* {!question_id ? '新建' : '编辑'} */}
<span className="xingcolor font-16 fl mr4"></span> <span className="xingcolor font-16 fl mr4"></span>
<span className="xingtigan fl">题目解析：</span> <span className="xingtigan fl">题目解析：</span>
</p> </p>
<QuillForEditor <QuillForEditor
autoFocus={false} autoFocus={false}
imgAttrs={{ width: '146px', height: '136px' }} imgAttrs={{width: '146px', height: '136px'}}
style={{ height: '166px' }} style={{height: '166px' }}
placeholder="请您输入题目解析" placeholder="请您输入题目解析"
options={['code-block', 'image', 'formula']} options={options}
value={question_titles} value={question_titles}
onContentChange={this.onContentChanges} onContentChange={this.onContentChanges}
/> />
</div> </div>
</div> </div>
</div> </div>

22
public/react/src/modules/question/component/SingleEditor.js
Unescape View File

@ -454,7 +454,15 @@ class SingleEditor extends Component {
// //////console.log("xuanzheshijuan"); // //////console.log("xuanzheshijuan");
// //////console.log(answerTagArray); // //////console.log(answerTagArray);
// //////console.log(!exerciseIsPublish); // //////console.log(!exerciseIsPublish);
<<<<<<< HEAD
return ( return (
=======
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(
>>>>>>> 2d54481... 调整输入的大小
<div className="padding20-30 signleEditor danxuano" id={qNumber}> <div className="padding20-30 signleEditor danxuano" id={qNumber}>
<style>{` <style>{`
@ -475,6 +483,12 @@ class SingleEditor extends Component {
#e_tips_mdEditor_question_undefined4{ #e_tips_mdEditor_question_undefined4{
display: none; 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;
}
`}</style> `}</style>
<p className="mb10 clearfix"> <p className="mb10 clearfix">
{/* {!question_id ? '新建' : '编辑'} */} {/* {!question_id ? '新建' : '编辑'} */}
@ -487,7 +501,7 @@ class SingleEditor extends Component {
imgAttrs={{ width: '146px', height: '136px' }} imgAttrs={{ width: '146px', height: '136px' }}
style={{ height: '155px' }} style={{ height: '155px' }}
placeholder="请您输入题干" placeholder="请您输入题干"
options={['code-block', 'image', 'formula']} options={options}
value={question_title} value={question_title}
onContentChange={this.onContentChange} onContentChange={this.onContentChange}
/> />
@ -519,7 +533,7 @@ class SingleEditor extends Component {
imgAttrs={{ width: '146px', height: '136px' }} imgAttrs={{ width: '146px', height: '136px' }}
style={{ height: '166px' }} style={{ height: '166px' }}
placeholder="请您输入题干" placeholder="请您输入题干"
options={['code-block', 'image', 'formula']} options={options}
value={item} value={item}
onContentChange={(value, quill) => this.onOptionContentChange(value, quill, index)} onContentChange={(value, quill) => this.onOptionContentChange(value, quill, index)}
/> />
@ -529,7 +543,7 @@ class SingleEditor extends Component {
imgAttrs={{ width: '146px', height: '136px' }} imgAttrs={{ width: '146px', height: '136px' }}
style={{ height: '166px' }} style={{ height: '166px' }}
placeholder="请您输入题干" placeholder="请您输入题干"
options={['code-block', 'image', 'formula']} options={options}
value={JSON.parse(item)} value={JSON.parse(item)}
onContentChange={(value, quill) => this.onOptionContentChange(value, quill, index)} onContentChange={(value, quill) => this.onOptionContentChange(value, quill, index)}
/> />
@ -570,7 +584,7 @@ class SingleEditor extends Component {
imgAttrs={{ width: '146px', height: '136px' }} imgAttrs={{ width: '146px', height: '136px' }}
style={{ height: '166px' }} style={{ height: '166px' }}
placeholder="请您输入题目解析" placeholder="请您输入题目解析"
options={['code-block', 'image', 'formula']} options={options}
value={question_titles} value={question_titles}
onContentChange={this.onContentChanges} onContentChange={this.onContentChanges}
/> />

Write Preview
Loading…
Cancel
Save