dev_forum
杨树明 6 years ago
parent 06244a38c4
commit 47a26ca47a

@ -29,7 +29,7 @@ const env = getClientEnvironment(publicUrl);
module.exports = { module.exports = {
// You may want 'eval' instead if you prefer to see the compiled output in DevTools. // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
// See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
devtool: "source-map", // 开启调试 // devtool: "source-map", // 开启调试
// These are the "entry points" to our application. // These are the "entry points" to our application.
// This means they will be the "root" imports that are included in JS bundle. // This means they will be the "root" imports that are included in JS bundle.
// The first two entry points enable "hot" CSS and auto-refreshes for JS. // The first two entry points enable "hot" CSS and auto-refreshes for JS.

@ -1,338 +1,338 @@
import React, {Component} from 'react'; import React, {Component} from 'react';
import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd'; import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom"; import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
// import "antd/dist/antd.css"; // import "antd/dist/antd.css";
import { getImageUrl, toPath, getUrl } from 'educoder'; import { getImageUrl, toPath, getUrl } from 'educoder';
import '../../courses/css/Courses.css' import '../../courses/css/Courses.css'
import axios from 'axios'; import axios from 'axios';
import './css/TPMchallengesnew.css'; import './css/TPMchallengesnew.css';
require('codemirror/lib/codemirror.css'); require('codemirror/lib/codemirror.css');
let origin = getUrl(); let origin = getUrl();
let path = getUrl("/editormd/lib/") let path = getUrl("/editormd/lib/")
const $ = window.$; const $ = window.$;
let timeout; let timeout;
let currentValue; let currentValue;
const Option = Select.Option; const Option = Select.Option;
const RadioGroup = Radio.Group; const RadioGroup = Radio.Group;
// 保存数据 // 保存数据
function md_add_data(k,mdu,d){ function md_add_data(k,mdu,d){
window.sessionStorage.setItem(k+mdu,d); window.sessionStorage.setItem(k+mdu,d);
} }
// 清空保存的数据 // 清空保存的数据
function md_clear_data(k,mdu,id){ function md_clear_data(k,mdu,id){
window.sessionStorage.removeItem(k+mdu); window.sessionStorage.removeItem(k+mdu);
var id1 = "#e_tip_"+id; var id1 = "#e_tip_"+id;
var id2 = "#e_tips_"+id; var id2 = "#e_tips_"+id;
if(k == 'content'){ if(k == 'content'){
$(id2).html(" "); $(id2).html(" ");
}else{ }else{
$(id1).html(" "); $(id1).html(" ");
} }
} }
window.md_clear_data = md_clear_data window.md_clear_data = md_clear_data
// editor 存在了jquery对象上应用不需要自己写md_rec_data方法了 // editor 存在了jquery对象上应用不需要自己写md_rec_data方法了
function md_rec_data(k, mdu, id) { function md_rec_data(k, mdu, id) {
if (window.sessionStorage.getItem(k + mdu) !== null) { if (window.sessionStorage.getItem(k + mdu) !== null) {
var editor = $("#e_tips_" + id).data('editor'); var editor = $("#e_tips_" + id).data('editor');
editor.setValue(window.sessionStorage.getItem(k + mdu)); editor.setValue(window.sessionStorage.getItem(k + mdu));
// debugger; // debugger;
// /shixuns/b5hjq9zm/challenges/3977/tab=3 setValue可能导致editor样式问题 // /shixuns/b5hjq9zm/challenges/3977/tab=3 setValue可能导致editor样式问题
md_clear_data(k, mdu, id); md_clear_data(k, mdu, id);
} }
} }
window.md_rec_data = md_rec_data; window.md_rec_data = md_rec_data;
function md_elocalStorage(editor,mdu,id){ function md_elocalStorage(editor,mdu,id){
if (window.sessionStorage){ if (window.sessionStorage){
var oc = window.sessionStorage.getItem('content'+mdu); var oc = window.sessionStorage.getItem('content'+mdu);
if(oc !== null ){ if(oc !== null ){
console.log("#e_tips_"+id) console.log("#e_tips_"+id)
$("#e_tips_"+id).data('editor', editor); $("#e_tips_"+id).data('editor', editor);
var h = '您上次有已保存的数据,是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\''+ mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\''+ mdu + '\',\'' + id + '\')">不恢复</a>'; var h = '您上次有已保存的数据,是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\''+ mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\''+ mdu + '\',\'' + id + '\')">不恢复</a>';
$("#e_tips_"+id).html(h); $("#e_tips_"+id).html(h);
} }
setInterval(function() { setInterval(function() {
var d = new Date(); var d = new Date();
var h = d.getHours(); var h = d.getHours();
var m = d.getMinutes(); var m = d.getMinutes();
var s = d.getSeconds(); var s = d.getSeconds();
h = h < 10 ? '0' + h : h; h = h < 10 ? '0' + h : h;
m = m < 10 ? '0' + m : m; m = m < 10 ? '0' + m : m;
s = s < 10 ? '0' + s : s; s = s < 10 ? '0' + s : s;
if(editor.getValue().trim() != ""){ if(editor.getValue().trim() != ""){
md_add_data("content",mdu,editor.getValue()); md_add_data("content",mdu,editor.getValue());
var id1 = "#e_tip_"+id; var id1 = "#e_tip_"+id;
var id2 = "#e_tips_"+id; var id2 = "#e_tips_"+id;
var textStart = " 数据已于 " var textStart = " 数据已于 "
var text = textStart + h + ':' + m + ':' + s +" 保存 "; var text = textStart + h + ':' + m + ':' + s +" 保存 ";
// 占位符 // 占位符
var oldHtml = $(id2).html(); var oldHtml = $(id2).html();
if (oldHtml && oldHtml != ' ' && oldHtml.startsWith(textStart) == false) { if (oldHtml && oldHtml != ' ' && oldHtml.startsWith(textStart) == false) {
$(id2).html( oldHtml.split(' (')[0] + ` (${text})`); $(id2).html( oldHtml.split(' (')[0] + ` (${text})`);
} else { } else {
$(id2).html(text); $(id2).html(text);
} }
// $(id2).html(""); // $(id2).html("");
} }
},10000); },10000);
}else{ }else{
$("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器!'); $("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器!');
} }
} }
function create_editorMD(id, width, high, placeholder, imageUrl, callback, initValue, function create_editorMD(id, width, high, placeholder, imageUrl, callback, initValue,
onchange, watch, { noStorage, showNullButton }, that) { onchange, watch, { noStorage, showNullButton }, that) {
// 还是出现了setting只有一份被共用的问题 // 还是出现了setting只有一份被共用的问题
var editorName = window.editormd(id, { var editorName = window.editormd(id, {
width: width, width: width,
height: high===undefined?400:high, height: high===undefined?400:high,
path: path, // "/editormd/lib/" path: path, // "/editormd/lib/"
markdown : initValue, markdown : initValue,
dialogLockScreen: false, dialogLockScreen: false,
watch:watch===undefined?true:watch, watch:watch===undefined?true:watch,
syncScrolling: "single", syncScrolling: "single",
tex: true, tex: true,
tocm: true, tocm: true,
emoji: true, emoji: true,
taskList: true, taskList: true,
codeFold: true, codeFold: true,
searchReplace: true, searchReplace: true,
htmlDecode: "style,script,iframe", htmlDecode: "style,script,iframe",
sequenceDiagram: true, sequenceDiagram: true,
autoFocus: false, autoFocus: false,
// mine // mine
toolbarIcons: function (mdEditor) { toolbarIcons: function (mdEditor) {
let react_id = `react_${mdEditor.id}`; let react_id = `react_${mdEditor.id}`;
const __that = window[react_id] const __that = window[react_id]
// Or return editormd.toolbarModes[name]; // full, simple, mini // Or return editormd.toolbarModes[name]; // full, simple, mini
// Using "||" set icons align right. // Using "||" set icons align right.
const icons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]; const icons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"];
if (__that.props.showNullButton) { if (__that.props.showNullButton) {
icons.push('nullBtton') icons.push('nullBtton')
} }
return icons return icons
}, },
toolbarCustomIcons: { toolbarCustomIcons: {
testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>", testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>", testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>",
nullBtton: "<a type=\"nullBtton\" class='pr' title='增加填空'><div class='border-left'><span></span></div><span class='fillTip'>点击插入填空项</span><i class=\"iconfont icon-edit font-16\"></i></a>", nullBtton: "<a type=\"nullBtton\" class='pr' title='增加填空'><div class='border-left'><span></span></div><span class='fillTip'>点击插入填空项</span><i class=\"iconfont icon-edit font-16\"></i></a>",
}, },
//这个配置在simple.html中并没有但是为了能够提交表单使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中方便post提交表单。 //这个配置在simple.html中并没有但是为了能够提交表单使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中方便post提交表单。
saveHTMLToTextarea: true, saveHTMLToTextarea: true,
// 用于增加自定义工具栏的功能可以直接插入HTML标签不使用默认的元素创建图标 // 用于增加自定义工具栏的功能可以直接插入HTML标签不使用默认的元素创建图标
dialogMaskOpacity: 0.6, dialogMaskOpacity: 0.6,
placeholder: placeholder, placeholder: placeholder,
imageUpload: true, imageUpload: true,
imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"], imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
imageUploadURL: imageUrl,//url imageUploadURL: imageUrl,//url
onchange: onchange, onchange: onchange,
onload: function() { onload: function() {
let _id = this.id // 如果要使用this这里不能使用箭头函数 let _id = this.id // 如果要使用this这里不能使用箭头函数
let _editorName = this; let _editorName = this;
let react_id = `react_${_editorName.id}`; let react_id = `react_${_editorName.id}`;
const __that = window[react_id] const __that = window[react_id]
// this.previewing(); // this.previewing();
// let _id = id; // let _id = id;
$("#" + _id + " [type=\"latex\"]").bind("click", function () { $("#" + _id + " [type=\"latex\"]").bind("click", function () {
_editorName.cm.replaceSelection("```latex"); _editorName.cm.replaceSelection("```latex");
_editorName.cm.replaceSelection("\n"); _editorName.cm.replaceSelection("\n");
_editorName.cm.replaceSelection("\n"); _editorName.cm.replaceSelection("\n");
_editorName.cm.replaceSelection("```"); _editorName.cm.replaceSelection("```");
var __Cursor = _editorName.cm.getDoc().getCursor(); var __Cursor = _editorName.cm.getDoc().getCursor();
_editorName.cm.setCursor(__Cursor.line - 1, 0); _editorName.cm.setCursor(__Cursor.line - 1, 0);
}); });
$("#" + _id + " [type=\"inline\"]").bind("click", function () { $("#" + _id + " [type=\"inline\"]").bind("click", function () {
_editorName.cm.replaceSelection("$$$$"); _editorName.cm.replaceSelection("$$$$");
var __Cursor = _editorName.cm.getDoc().getCursor(); var __Cursor = _editorName.cm.getDoc().getCursor();
_editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2); _editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
_editorName.cm.focus(); _editorName.cm.focus();
}); });
$("[type=\"inline\"]").attr("title", "行内公式"); $("[type=\"inline\"]").attr("title", "行内公式");
$("[type=\"latex\"]").attr("title", "多行公式"); $("[type=\"latex\"]").attr("title", "多行公式");
if (__that.props.showNullButton) { if (__that.props.showNullButton) {
const NULL_CH = '▁' const NULL_CH = '▁'
// const NULL_CH = '' // const NULL_CH = ''
// const NULL_CH = '🈳' // const NULL_CH = '🈳'
$("#" + _id + " [type=\"nullBtton\"]").bind("click", function () { $("#" + _id + " [type=\"nullBtton\"]").bind("click", function () {
_editorName.cm.replaceSelection(NULL_CH); _editorName.cm.replaceSelection(NULL_CH);
// var __Cursor = _editorName.cm.getDoc().getCursor(); // var __Cursor = _editorName.cm.getDoc().getCursor();
// _editorName.cm.setCursor(__Cursor.line - 1, 0); // _editorName.cm.setCursor(__Cursor.line - 1, 0);
}); });
} }
if (noStorage == true) { if (noStorage == true) {
} else { } else {
md_elocalStorage(_editorName, `MDEditor__${_id}`, _id); md_elocalStorage(_editorName, `MDEditor__${_id}`, _id);
} }
callback && callback(_editorName) callback && callback(_editorName)
} }
}); });
return editorName; return editorName;
} }
export default class TPMMDEditor extends Component { export default class TPMMDEditor extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state = { this.state = {
initValue: '' initValue: ''
} }
} }
componentDidUpdate(prevProps, prevState) { componentDidUpdate(prevProps, prevState) {
// 不能加,影响了试卷填空题 // 不能加,影响了试卷填空题
// if (this.props.initValue != prevProps.initValue) { // if (this.props.initValue != prevProps.initValue) {
// this.answers_editormd.setValue(this.props.initValue) // this.answers_editormd.setValue(this.props.initValue)
// } // }
} }
// react_mdEditor_ // react_mdEditor_
componentDidMount = () => { componentDidMount = () => {
const { mdID, initValue, placeholder, showNullButton} = this.props; const { mdID, initValue, placeholder, showNullButton} = this.props;
let _id = `mdEditor_${mdID}` let _id = `mdEditor_${mdID}`
this.contentChanged = false; this.contentChanged = false;
const _placeholder = placeholder || ""; const _placeholder = placeholder || "";
// amp; // amp;
// 编辑时要传memoId // 编辑时要传memoId
const imageUrl = `/api/attachments.json`; const imageUrl = `/api/attachments.json`;
// 创建editorMd // 创建editorMd
let react_id = `react_${_id}`; let react_id = `react_${_id}`;
window[react_id] = this window[react_id] = this
const answers_editormd = create_editorMD(_id, '100%', this.props.height, _placeholder, imageUrl, (__editorName) => { const answers_editormd = create_editorMD(_id, '100%', this.props.height, _placeholder, imageUrl, (__editorName) => {
react_id = `react_${__editorName.id}`; react_id = `react_${__editorName.id}`;
const that = window[react_id] const that = window[react_id]
setTimeout(() => { setTimeout(() => {
console.log('timeout', __editorName.id) console.log('timeout', __editorName.id)
__editorName.resize() __editorName.resize()
__editorName.cm && __editorName.cm.refresh() __editorName.cm && __editorName.cm.refresh()
}, that.props.refreshTimeout || 500) }, that.props.refreshTimeout || 500)
if (that.props.initValue != undefined && that.props.initValue != '') { if (that.props.initValue != undefined && that.props.initValue != '') {
__editorName.setValue(that.props.initValue) __editorName.setValue(that.props.initValue)
} }
if (that.state.initValue) { if (that.state.initValue) {
__editorName.setValue(that.state.initValue) __editorName.setValue(that.state.initValue)
} }
__editorName.cm.on("change", (_cm, changeObj) => { __editorName.cm.on("change", (_cm, changeObj) => {
that.contentChanged = true; that.contentChanged = true;
if (that.state.showError) { if (that.state.showError) {
that.setState({showError: false}) that.setState({showError: false})
} }
that.onEditorChange() that.onEditorChange()
}) })
that.props.onCMBlur && __editorName.cm.on('blur', () => { that.props.onCMBlur && __editorName.cm.on('blur', () => {
that.props.onCMBlur() that.props.onCMBlur()
}) })
that.props.onCMBeforeChange && __editorName.cm.on('beforeChange', (cm,change) => { that.props.onCMBeforeChange && __editorName.cm.on('beforeChange', (cm,change) => {
that.props.onCMBeforeChange(cm,change) that.props.onCMBeforeChange(cm,change)
}) })
that.answers_editormd = __editorName; that.answers_editormd = __editorName;
window[_id] = __editorName; window[_id] = __editorName;
}, initValue, this.onEditorChange,this.props.watch, { }, initValue, this.onEditorChange,this.props.watch, {
noStorage: this.props.noStorage, noStorage: this.props.noStorage,
showNullButton: this.props.showNullButton showNullButton: this.props.showNullButton
}, this); }, this);
} }
showError = () => { showError = () => {
this.setState({showError: true}) this.setState({showError: true})
} }
onEditorChange = () => { onEditorChange = () => {
if (!this.answers_editormd) return; if (!this.answers_editormd) return;
const val = this.answers_editormd.getValue(); const val = this.answers_editormd.getValue();
try { try {
this.props.onChange && this.props.onChange(val) this.props.onChange && this.props.onChange(val)
} catch(e) { } catch(e) {
// http://localhost:3007/courses/1309/common_homeworks/6566/setting // http://localhost:3007/courses/1309/common_homeworks/6566/setting
// 从这个页面,跳转到编辑页面,再在编辑页面点击返回的时候,这里会报错 // 从这个页面,跳转到编辑页面,再在编辑页面点击返回的时候,这里会报错
console.error('出错') console.error('出错')
console.error(e) console.error(e)
} }
} }
resize = () => { resize = () => {
if (!this.answers_editormd) { // 还未初始化 if (!this.answers_editormd) { // 还未初始化
return; return;
} }
this.answers_editormd.resize() this.answers_editormd.resize()
this.answers_editormd.cm && this.answers_editormd.cm.refresh() this.answers_editormd.cm && this.answers_editormd.cm.refresh()
this.answers_editormd.cm.focus() this.answers_editormd.cm.focus()
} }
getValue = () => { getValue = () => {
try { try {
return this.answers_editormd.getValue() return this.answers_editormd.getValue()
} catch (e) { } catch (e) {
return '' return ''
} }
} }
setValue = (val) => { setValue = (val) => {
try { try {
this.answers_editormd.setValue(val) this.answers_editormd.setValue(val)
} catch (e) { } catch (e) {
// TODO 这里多实例的时候前一个实例的state会被后面这个覆盖 参考NewWork.js http://localhost:3007/courses/1309/homework/9300/edit/1 // TODO 这里多实例的时候前一个实例的state会被后面这个覆盖 参考NewWork.js http://localhost:3007/courses/1309/homework/9300/edit/1
// 未初始化 // 未初始化
this.setState({ initValue: val }) this.setState({ initValue: val })
} }
} }
render() { render() {
let { let {
showError showError
} = this.state; } = this.state;
let { mdID, className, noStorage } = this.props; let { mdID, className, noStorage } = this.props;
let _style = {} let _style = {}
if (showError) { if (showError) {
_style.border = '1px solid red' _style.border = '1px solid red'
} }
return ( return (
<React.Fragment> <React.Fragment>
<div className={`df ${className}`} > <div className={`df ${className}`} >
{/* padding10-20 */} {/* padding10-20 */}
<div className="edu-back-greyf5 radius4" id={`mdEditor_${mdID}`} style={{..._style}}> <div className="edu-back-greyf5 radius4" id={`mdEditor_${mdID}`} style={{..._style}}>
<textarea style={{display: 'none'}} id="evaluate_script_show" name="content"></textarea> <textarea style={{display: 'none'}} id={`mdEditors_${mdID}`} name="content"></textarea>
<div className="CodeMirror cm-s-defualt"> <div className="CodeMirror cm-s-defualt">
</div> </div>
</div> </div>
</div> </div>
<div className={"fr rememberTip"}> <div className={"fr rememberTip"}>
{noStorage == true ? ' ' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"> </p>} {noStorage == true ? ' ' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"> </p>}
{/* {noStorage == true ? ' ' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"> </p>} */} {/* {noStorage == true ? ' ' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"> </p>} */}
</div> </div>
</React.Fragment> </React.Fragment>
) )
} }
} }

@ -1,6 +1,6 @@
import React, {Component} from 'react'; import React, {Component} from 'react';
import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Tooltip} from 'antd'; import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Tooltip,notification} from 'antd';
import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom"; import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
@ -184,7 +184,7 @@ export default class TPMquestion extends Component {
practice_url: newpractice_url, practice_url: newpractice_url,
go_back_url: newgo_back_url, go_back_url: newgo_back_url,
power:response.data.power, power:response.data.power,
questioMD:response.data.task_pass, // questioMD:response.data.task_pass,
answer:response.data.answer answer:response.data.answer
}) })
@ -192,7 +192,7 @@ export default class TPMquestion extends Component {
this.setState({ this.setState({
contentMdRefval:response.data.task_pass contentMdRefval:response.data.task_pass
}) })
this.contentMdRef.current.setValue(response.data.task_pass || '') // this.contentMdRef.current.setValue(response.data.task_pass || '')
if(response.data.chooses.length===0){ if(response.data.chooses.length===0){
this.questionadd() this.questionadd()
} }
@ -248,14 +248,14 @@ export default class TPMquestion extends Component {
practice_url: newpractice_url, practice_url: newpractice_url,
go_back_url: newgo_back_url, go_back_url: newgo_back_url,
power:response.data.power, power:response.data.power,
questioMD:response.data.task_pass, // questioMD:response.data.task_pass,
}) })
this.setState({ this.setState({
contentMdRefval:response.data.task_pass contentMdRefval:response.data.task_pass
}) })
this.contentMdRef.current.setValue(response.data.task_pass || '') // this.contentMdRef.current.setValue(response.data.task_pass || '')
if(response.data.chooses.length===0){ if(response.data.chooses.length===0){
this.questionadd() this.questionadd()
} }
@ -400,12 +400,14 @@ export default class TPMquestion extends Component {
} }
questionall=()=>{ questionall=()=>{
this.setState({ // this.setState({
activetype:"first", // activetype:"first",
newquestionaddtype:false, // newquestionaddtype:false,
editquestionaddtype:false, // editquestionaddtype:false,
questionaddtype:false // questionaddtype:false
}) // })
window.location.href = '/shixuns/'+this.props.match.params.shixunId+'/challenges/'+this.props.match.params.checkpointId+'/editquestion';
} }
questionadd=()=>{ questionadd=()=>{
$('html').animate({ $('html').animate({
@ -707,14 +709,22 @@ export default class TPMquestion extends Component {
// $('html').animate({ // $('html').animate({
// scrollTop: 10 // scrollTop: 10
// }, 200); // }, 200);
message.success("修改成功"); $('html').animate({
scrollTop: 10
}, 200);
notification.open({
message: '提示',
description:
'修改成功,请点击右侧加号继续添加',
});
this.setState({ this.setState({
questionaddtype:false, questionaddtype:false,
newquestioMDvaluetype:false, newquestioMDvaluetype:false,
newquestioMDvaluetypes:false, newquestioMDvaluetypes:false,
}) })
setTimeout(window.location.href="/shixuns/"+this.props.match.params.shixunId+"/challenges/"+this.props.match.params.checkpointId+"/editquestion"+"/"+response.data.challenge_choose_id,1000) // setTimeout(window.location.href="/shixuns/"+this.props.match.params.shixunId+"/challenges/"+this.props.match.params.checkpointId+"/editquestion"+"/"+response.data.challenge_choose_id,1000)
// this.gochooseid() // this.gochooseid()
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -761,12 +771,17 @@ export default class TPMquestion extends Component {
newquestioMDvaluetypes:false, newquestioMDvaluetypes:false,
questionaddarray:questionaddarrays questionaddarray:questionaddarrays
}) })
// $('html').animate({ $('html').animate({
// scrollTop: 10 scrollTop: 10
// }, 200); }, 200);
message.success("新建成功");
notification.open({
message: '提示',
description:
'新建成功,请点击右侧加号继续添加',
});
// this.getanswer_subitlist() // this.getanswer_subitlist()
this.gochooseid("/shixuns/"+this.props.match.params.shixunId+"/challenges/"+this.props.match.params.checkpointId+"/editquestion"+"/"+response.data.challenge_choose_id) // this.gochooseid("/shixuns/"+this.props.match.params.shixunId+"/challenges/"+this.props.match.params.checkpointId+"/editquestion"+"/"+response.data.challenge_choose_id)
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
}); });
@ -869,7 +884,8 @@ export default class TPMquestion extends Component {
} }
gochooseid=(url)=>{ gochooseid=(url)=>{
window.location.href =url window.location.href =url
// window.location.Reload(url)
// this.props.history.replace( url ); // this.props.history.replace( url );
// this.props.history.push( url ); // this.props.history.push( url );
// 返回 // 返回

@ -24,7 +24,10 @@ export default class TpmQuestionEdit extends Component {
render() { render() {
console.log( this.props.questionlists) console.log( this.props.neweditanswerRef)
console.log( this.props.neweditanswerRefval)
console.log( this.props.editanswersRef)
console.log( this.props.editanswersRefval)
return ( return (
<div> <div>
@ -34,7 +37,7 @@ export default class TpmQuestionEdit extends Component {
<div className="df"> <div className="df">
<span className="mr30 color-orange pt10">*</span> <span className="mr30 color-orange pt10">*</span>
<div className="flex1 mr20"> <div className="flex1 mr20">
<TPMMDEditor ref={this.props.neweditanswerRef} placeholder="请输入选择题的题干内容" mdID={'newquestioMDid'} refreshTimeout={1500} <TPMMDEditor ref={this.props.neweditanswerRef} placeholder="请输入选择题的题干内容" mdID={'editquestioMDid'} refreshTimeout={1500}
watch={true} className="courseMessageMD" initValue={this.props.neweditanswerRefval}></TPMMDEditor> watch={true} className="courseMessageMD" initValue={this.props.neweditanswerRefval}></TPMMDEditor>
</div> </div>

@ -24,7 +24,7 @@ export default class TpmQuestionNew extends Component {
render() { render() {
console.log( this.props.questionlists) // console.log( this.props.questionlists)
return ( return (
<div> <div>

@ -1,4 +1,9 @@
.height40 { .height40 {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
}
.line27{
line-height: 27px;
vertical-align: 1px;
} }

@ -2,7 +2,7 @@ import React, { Component } from 'react';
import { Redirect } from 'react-router'; import { Redirect } from 'react-router';
import {Modal, Button, Radio, Input, Checkbox,message} from 'antd'; import {Modal, Button, Radio, Input, Checkbox,message,Spin, Icon} from 'antd';
import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
@ -44,7 +44,8 @@ class Collaborators extends Component {
collaboratorListsum:10, collaboratorListsum:10,
collaboratorListsumtype:true, collaboratorListsumtype:true,
user_name:undefined, user_name:undefined,
school_name:undefined school_name:undefined,
spinnings:false
} }
} }
componentDidMount() { componentDidMount() {
@ -155,9 +156,11 @@ class Collaborators extends Component {
}) })
} }
onSearchadmin = (value) => { onSearchadmin = (value) => {
let {collaboratorList,user_name,school_name} = this.state; let {collaboratorList,user_name,school_name} = this.state;
this.setState({ this.setState({
Searchadmin: [], Searchadmin: [],
spinnings:true,
}) })
// if (value === "") { // if (value === "") {
// this.setState({ // this.setState({
@ -174,7 +177,9 @@ class Collaborators extends Component {
school_name:school_name, school_name:school_name,
}}).then((response) => { }}).then((response) => {
if (response.data.status === 403||response.data.status === 401||response.data.status === 500) { if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
this.setState({
spinnings:false
})
}else{ }else{
let newlist = response.data.users; let newlist = response.data.users;
for (var i = 0; i < newlist.length; i++) { for (var i = 0; i < newlist.length; i++) {
@ -182,7 +187,8 @@ class Collaborators extends Component {
} }
this.setState({ this.setState({
Searchadmin: newlist, Searchadmin: newlist,
collaboratorList: collaboratorList collaboratorList: collaboratorList,
spinnings:false
}) })
} }
@ -404,7 +410,10 @@ class Collaborators extends Component {
lineHeight: '30px', lineHeight: '30px',
}; };
// console.log(collaboratorList) // console.log(collaboratorList)
return (
const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
return (
<React.Fragment> <React.Fragment>
<p className="clearfix mt30" <p className="clearfix mt30"
style={{display:this.props.identity<5?"block":"none"}} style={{display:this.props.identity<5?"block":"none"}}
@ -412,7 +421,7 @@ class Collaborators extends Component {
<a onClick={() => this.showCollaboratorsvisible("cooperation")} <a onClick={() => this.showCollaboratorsvisible("cooperation")}
className="edu-default-btn edu-greenback-btn fr mr20 height40" className="edu-default-btn edu-greenback-btn fr mr20 height40"
data-remote="true"> data-remote="true">
+ 添加合作 <span className={"line27"}>+ </span>
</a> </a>
<a onClick={() => this.showCollaboratorsvisible("admin")} <a onClick={() => this.showCollaboratorsvisible("admin")}
style={{display:this.props.identity===1?"block":"none"}} style={{display:this.props.identity===1?"block":"none"}}
@ -467,6 +476,7 @@ class Collaborators extends Component {
visible={Collaboratorsvisibleadmin} visible={Collaboratorsvisibleadmin}
closable={false} closable={false}
footer={null} footer={null}
width={800}
> >
{/*<Search*/} {/*<Search*/}
{/*placeholder="输入用户的姓名、昵称、邮箱进行搜索"*/} {/*placeholder="输入用户的姓名、昵称、邮箱进行搜索"*/}
@ -475,53 +485,53 @@ class Collaborators extends Component {
{/*onInput={this.onSearchadmins}*/} {/*onInput={this.onSearchadmins}*/}
{/*style={{width: '100%'}}*/} {/*style={{width: '100%'}}*/}
{/*/>*/} {/*/>*/}
<span className="mr10">姓名:</span> <span className="mr10">姓名或手机号:</span>
<Input allowClear placeholder="请输入真实姓名" value={user_name} onInput={(e) => {this.setState({user_name: e.target.value})}} <Input placeholder="请输入姓名或手机号码搜索" value={user_name} onInput={(e) => {this.setState({user_name: e.target.value})}}
style={{ width: '130px'}} style={{ width: '215px'}}
></Input> ></Input>
<span className="label ml10 " style={{ minWidth: '36px' }}>单位:</span> <span className="label ml10 " style={{ minWidth: '36px' }}>单位:</span>
<Input allowClear placeholder="请输入单位名称" className="ml10" value={school_name} onInput={(e) => {this.setState({school_name: e.target.value})}} <Input placeholder="请输入单位名称" className="ml10" value={school_name} onInput={(e) => {this.setState({school_name: e.target.value})}}
style={{ width: '135px'}}> style={{ width: '215px'}}
>
</Input> </Input>
<a className="task-btn task-btn-orange" onClick={() => this.onSearchadmin()} <a className="task-btn task-btn-orange ml20" onClick={() => this.onSearchadmin()}
style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}} style={{ height: '30px', lineHeight: '30px', width: '70px'}}
>搜索</a> >搜索</a>
<p className="clearfix pl35 mt20"> <p className="clearfix pl35 mt20">
<span className="fl edu-txt-w80 task-hide font-bd ml10 edu-txt-left">姓名</span> <span className="fl edu-txt-w100 task-hide font-bd ml10 edu-txt-left">姓名</span>
<span className="fl edu-txt-w80 task-hide font-bd">职业</span> <span className="fl edu-txt-w100 task-hide font-bd">职业</span>
<span className="fl edu-txt-w180 task-hide font-bd ml50">单位</span> <span className="fl edu-txt-w180 task-hide font-bd ml80">单位</span>
</p> </p>
<div className="mt5" style={{background: '#f7f9fd'}}> <div className="mt5" style={{background: '#f7f9fd'}}>
<Spin indicator={antIcon} spinning={this.state.spinnings}>
<div className="clearfix"> <div className="clearfix">
<ul className="upload_select_box fl" id="search_not_teachers_list" onScroll={this.contentViewScrolledit}> <ul className="upload_select_box fl" id="search_not_teachers_list" onScroll={this.contentViewScrolledit}>
{Searchadmin.length === 0 ? <li style={{textAlign: 'center'}}> {Searchadmin.length === 0 ? <li style={{textAlign: 'center'}}>
<span>请试试搜索一下</span> <span>请试试搜索一下</span>
</li> : Searchadmin.map((item, key) => { </li> : Searchadmin.map((item, key) => {
return ( return (
<li key={key} style={{display: item.identify === "专业人士" ? "none" : "block"}}> <li key={key} style={{display: item.identify === "专业人士" ? "none" : "block"}}>
<Checkbox className="fl mr20" checked={item.checked} <Checkbox className="fl mr20" checked={item.checked}
onChange={(e) => this.selectChangenickname(e, key)} onChange={(e) => this.selectChangenickname(e, key)}
id={item.user_id}></Checkbox> id={item.user_id}></Checkbox>
<a className="task-hide color-grey3 fl span1 edu-txt-w80 edu-txt-left">{item.nickname}</a> <a className="task-hide color-grey3 fl span1 edu-txt-w80 edu-txt-left">{item.nickname}</a>
<span className="task-hide fl color-grey edu-txt-w80 span2">{item.identify}</span> <span className="task-hide fl color-grey edu-txt-w80 span2">{item.identify}</span>
<span <span
title={item.school_name} title={item.school_name}
style={{width: '150px'}} style={{width: '150px'}}
className="span3 color-grey fl edu-txt-w260 task-hide ml50 task-hide" >{item.school_name}</span> className="span3 color-grey fl edu-txt-w260 task-hide ml50 task-hide" >{item.school_name}</span>
</li> </li>
) )
}) })
} }
</ul> </ul>
</div> </div>
</Spin>
</div> </div>
<div className="mt10 clearfix"> <div className="mt10 clearfix">
<span className="fl mr15"> <span className="fl mr15">
<Checkbox className="fl" checked={allChangechecked} onChange={this.allChange}>全选</Checkbox> <Checkbox className="fl" checked={allChangechecked} onChange={this.allChange}>全选</Checkbox>
<div className="fl" style={{height: '27px'}}> <div className="fl" style={{height: '27px'}}>

Loading…
Cancel
Save