Skip to content

X
xiaomai-cloud-class-web
Commit 0e339b5e by yuananting
Options

Merge branch 'feature/yuananting/20210221/question-bank-tools' into dev

parents 46c7272a e2c2d3c7
Showing with 48 additions and 46 deletions
src/modules/teach-tool/components/QuestionEditor.jsx
...@@ -50,8 +50,8 @@ class QuestionEditor extends Component { ...@@ -50,8 +50,8 @@ class QuestionEditor extends Component {
static getDerivedStateFromProps(nextProps, prevState) { static getDerivedStateFromProps(nextProps, prevState) {
return { return {
detailInfo: nextProps.detailInfo detailInfo: nextProps.detailInfo,
} };
} }
shouldComponentUpdate(nextProps, nextState) { shouldComponentUpdate(nextProps, nextState) {
...@@ -62,10 +62,9 @@ class QuestionEditor extends Component { ...@@ -62,10 +62,9 @@ class QuestionEditor extends Component {
}); });
} }
if (blanksList !== this.state.blanksList) { if (blanksList !== this.state.blanksList) {
console.log("+++++++", blanksList)
this.setState({ this.setState({
blanksList blanksList,
}) });
} }
return true; return true;
} }
...@@ -118,6 +117,7 @@ class QuestionEditor extends Component { ...@@ -118,6 +117,7 @@ class QuestionEditor extends Component {
); );
}; };
editorRoot.config.zIndex = 999; editorRoot.config.zIndex = 999;
editorRoot.config.placeholder = "";
editorRoot.config.pasteFilterStyle = false; editorRoot.config.pasteFilterStyle = false;
// 自定义处理粘贴的文本内容 // 自定义处理粘贴的文本内容
editorRoot.config.pasteTextHandle = function (content) { editorRoot.config.pasteTextHandle = function (content) {
...@@ -136,27 +136,29 @@ class QuestionEditor extends Component { ...@@ -136,27 +136,29 @@ class QuestionEditor extends Component {
return str; return str;
}; };
let prevList = [] let prevList = [];
let counter = 0; let counter = 0;
const isEdit = getParameterByName('id'); const isEdit = getParameterByName("id");
if (isEdit) { if (isEdit) {
const stemDom = document.getElementsByClassName("add-fill-line"); const stemDom = document.getElementsByClassName("add-fill-line");
prevList = [...stemDom].map(item => item.id) prevList = [...stemDom].map((item) => item.id);
localStorage.setItem('gap_ques_prevList', JSON.stringify(prevList)); localStorage.setItem("gap_ques_prevList", JSON.stringify(prevList));
setTimeout(function () { setTimeout(
const divHeight = document.getElementById(`editor${editorId}_content`) function () {
.firstChild.offsetHeight; const divHeight = document.getElementById(`editor${editorId}_content`)
if (divHeight > 30) { .firstChild.offsetHeight;
this.setState({ isShowSingleInput: false }); if (divHeight > 30) {
} else { this.setState({ isShowSingleInput: false });
this.setState({ isShowSingleInput: true }); } else {
} this.setState({ isShowSingleInput: true });
}.bind(this)) }
}.bind(this)
);
if (counter === 0) { if (counter === 0) {
this.props.changeBlankCount(stemDom) this.props.changeBlankCount(stemDom);
} }
} }
...@@ -177,14 +179,17 @@ class QuestionEditor extends Component { ...@@ -177,14 +179,17 @@ class QuestionEditor extends Component {
} else { } else {
this.setState({ isShowSingleInput: true }); this.setState({ isShowSingleInput: true });
} }
if (this.state.isGapFilling && this.state.contentType === "QUESTION_STEM") { if (
this.state.isGapFilling &&
this.state.contentType === "QUESTION_STEM"
) {
const stemHtml = this.transferStemDocument(html); const stemHtml = this.transferStemDocument(html);
var _blanksList = stemHtml.getElementsByClassName("add-fill-line") var _blanksList = stemHtml.getElementsByClassName("add-fill-line");
const ids = [..._blanksList].map(item => item.id); const ids = [..._blanksList].map((item) => item.id);
const isEdit = getParameterByName('id'); const isEdit = getParameterByName("id");
if (isEdit && counter === 1) { if (isEdit && counter === 1) {
const prev = localStorage.getItem('gap_ques_prevList'); const prev = localStorage.getItem("gap_ques_prevList");
prevList = prev && JSON.parse(prev); prevList = prev && JSON.parse(prev);
} }
...@@ -192,16 +197,21 @@ class QuestionEditor extends Component { ...@@ -192,16 +197,21 @@ class QuestionEditor extends Component {
if (prevList && ids) { if (prevList && ids) {
idx = this.getNewArr(prevList, ids); idx = this.getNewArr(prevList, ids);
const oldLen = prevList.length; const oldLen = prevList.length;
idx = idx >= oldLen ? idx - oldLen : idx;
idx = idx >= oldLen ? idx - oldLen : idx
} }
prevList = [...ids]; prevList = [...ids];
this.setState({ blanksList: _blanksList }, () => this.props.changeBlankCount(_blanksList, idx)) this.setState({ blanksList: _blanksList }, () =>
this.props.changeBlankCount(_blanksList, idx)
);
} }
this.setState( this.setState(
{ contentLength, visiblePlacehold: conLen === 0 && !focusFlag }, {
contentLength,
visiblePlacehold:
(conLen === 0 || (conLen === 1 && html === " ")) && !focusFlag,
},
() => { () => {
onChange && onChange(html, this.state.contentLength); onChange && onChange(html, this.state.contentLength);
} }
...@@ -218,24 +228,14 @@ class QuestionEditor extends Component { ...@@ -218,24 +228,14 @@ class QuestionEditor extends Component {
}); });
}; };
editorRoot.config.onfocus = () => {
this.setState({
focusFlag: true,
visibleMediaBox: true,
visiblePlacehold: false,
});
};
editorRoot.create(); editorRoot.create();
this.editorRoot = editorRoot; this.editorRoot = editorRoot;
// if (detailInfo && detailInfo.content) {
const contentHtml = /^\<p/.test(detailInfo.content) const contentHtml = /^\<p/.test(detailInfo.content)
? detailInfo.content ? detailInfo.content
: `<p>${detailInfo.content}</p>`; : `<p>${detailInfo.content}</p>`;
editorRoot.txt.html(detailInfo.content); editorRoot.txt.html(detailInfo.content);
const textLength = editorRoot.txt.text().replace(/\&nbsp\;/gi, " ") const textLength = editorRoot.txt.text().replace(/\&nbsp\;/gi, " ").length;
.length;
const imgLength = contentHtml.match(/<img/g) const imgLength = contentHtml.match(/<img/g)
? contentHtml.match(/<img/g).length * 2 ? contentHtml.match(/<img/g).length * 2
: 0; : 0;
...@@ -249,13 +249,12 @@ class QuestionEditor extends Component { ...@@ -249,13 +249,12 @@ class QuestionEditor extends Component {
onChange && onChange(contentHtml, this.state.contentLength); onChange && onChange(contentHtml, this.state.contentLength);
} }
); );
// }
bindChangeContent && bindChangeContent(this.handleChangeContent); bindChangeContent && bindChangeContent(this.handleChangeContent);
} }
getNewArr(a, b) { getNewArr(a, b) {
const arr = [...a, ...b]; const arr = [...a, ...b];
const idx = arr.findIndex(item => { const idx = arr.findIndex((item) => {
return !(a.includes(item) && b.includes(item)); return !(a.includes(item) && b.includes(item));
}); });
return idx; return idx;
...@@ -358,8 +357,9 @@ class QuestionEditor extends Component { ...@@ -358,8 +357,9 @@ class QuestionEditor extends Component {
</div> </div>
)} )}
<div <div
className={`editor-limit-tip${contentLength > limitLength ? " mt6" : "" className={`editor-limit-tip${
}`} contentLength > limitLength ? " mt6" : ""
}`}
style={{ height: contentLength > limitLength ? 20 : 0 }} style={{ height: contentLength > limitLength ? 20 : 0 }}
> >
最多只能输入1000字 最多只能输入1000字
......
src/modules/teach-tool/components/QuestionEditor.less
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
color: #999999; color: #999999;
margin-top: 8px; margin-top: 8px;
.editor-fill-info_icon { .editor-fill-info_icon {
color: #5289fa; color: #5289fa !important;
font-size: 14px; font-size: 14px;
padding-left: 9px; padding-left: 9px !important;
cursor: pointer; cursor: pointer;
} }
} }
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
.editor-placehold { .editor-placehold {
position: absolute; position: absolute;
top: 0; top: 0px;
left: 0; left: 0;
right: 0; right: 0;
font-size: 14px; font-size: 14px;
...@@ -104,6 +104,8 @@ ...@@ -104,6 +104,8 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
z-index: 999;
pointer-events: none;
} }
.edtior-media_box { .edtior-media_box {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment