From 5f1847ea355b15a788063d27982774a4f1f9394b Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 16 Jul 2019 09:31:39 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/page/main/CodeEvaluateView.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/page/main/CodeEvaluateView.css b/public/react/src/modules/page/main/CodeEvaluateView.css
index 9deee0fb2..7901ef29e 100644
--- a/public/react/src/modules/page/main/CodeEvaluateView.css
+++ b/public/react/src/modules/page/main/CodeEvaluateView.css
@@ -6,7 +6,7 @@
 }
 #game_test_set_results .-task-ces-top {
 	background: #1F2F3B;
-	padding: 5px 20px;
+	padding: 9px 20px;
 }
 
 

From b95c8b17cb4e7d78a58fb76ff059367108650f1e Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 16 Jul 2019 10:13:18 +0800
Subject: [PATCH 02/10] message

---
 .../courses/busyWork/CommonWorkDetailIndex.js | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index 1986ddd43..dd8c7691d 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -8,12 +8,13 @@ import { CNotificationHOC } from '../common/CNotificationHOC'
 import { RouteHOC } from './common'
 
 import locale from 'antd/lib/date-picker/locale/zh_CN';
-import { WordsBtn, MarkdownToHtml, trigger } from 'educoder';
+import { WordsBtn, MarkdownToHtml, trigger, queryString } from 'educoder';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 import CoursesListType from '../coursesPublic/CoursesListType';
 import AccessoryModal from "../coursesPublic/AccessoryModal";
 import PublishRightnow from './PublishRightnow'
+import DownloadMessage from '../../modals/DownloadMessage';
 
 import '../css/Courses.css'
 import CBreadcrumb from '../common/CBreadcrumb'
@@ -121,9 +122,17 @@ class CommonWorkDetailIndex extends Component{
     }
     const isAdmin = this.props.isAdmin()
 
-    let exportUrl = `/api/homework_commons/${workId}/works_list.zip`
-    const exportResultUrl = `/api/homework_commons/${workId}/works_list.xlsx`
-
+    
+    let exportParams = {}
+    const isListModule = childModuleName == '作品列表';
+    // 是列表页
+    let params = {}
+    if (isListModule) {
+      // TODO
+      // params = this.refs.commonWorkList._getRequestParams()
+    }
+    let exportUrl = `/homework_commons/${workId}/works_list.zip?${queryString.stringify(params)}`
+    let exportResultUrl = `/homework_commons/${workId}/works_list.xlsx?${queryString.stringify(params)}`
     return (
         <div>
           <PublishRightnow ref={this.publishModal} showActionButton={false} {...this.props} checkBoxValues={[workId]} 
@@ -132,6 +141,9 @@ class CommonWorkDetailIndex extends Component{
           ></PublishRightnow>
           <PublishRightnow ref={this.endModal} showActionButton={false} {...this.props} checkBoxValues={[workId]} 
                 isPublish={false} doWhenSuccess={this.doWhenSuccess}></PublishRightnow> 
+
+					<DownloadMessage ref="DownloadMessage" {...this.props} />
+          
           <div className="newMain clearfix worklist1">
             <div className={"educontent mt20"}>
               <style>{`
@@ -189,7 +201,7 @@ class CommonWorkDetailIndex extends Component{
                 <div className="mt10 clearfix edu-back-white poll_list pl5">
                   <Link 
                         onClick={() => this.setState({moduleName: '作品列表'})}
-                        className={`${childModuleName == '作品列表' ? 'active' : '' } `}
+                        className={`${isListModule ? 'active' : '' } `}
                         to={`/courses/${courseId}/${moduleEngName}/${workId}/list`}>作品列表</Link>
                   <Link 
                         onClick={() => this.setState({moduleName: '作业问答'})}
@@ -228,8 +240,12 @@ class CommonWorkDetailIndex extends Component{
                         {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
                         导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                         <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                            <li><a href={exportResultUrl} className="color-dark">导出成绩</a></li>
-                            <li><a href={exportUrl} className="color-dark">导出作品附件</a></li>
+                            <li><a href={"javascript:void(0)"} className="color-dark"
+                              	  onClick={() => this.refs.DownloadMessage.confirmysl(exportResultUrl, exportParams)}
+                            >导出成绩</a></li>
+                            <li><a href={"javascript:void(0)"} className="color-dark"
+                              	  onClick={() => this.refs.DownloadMessage.confirmysl(exportUrl, exportParams)}
+                            >导出作品附件</a></li>
                         </ul>
                         </li>:""}
 
@@ -293,7 +309,7 @@ class CommonWorkDetailIndex extends Component{
                     {/* 作品列表 */}
                     <Route exact path="/courses/:coursesId/common_homeworks/:workId/list"
                         render={
-                        (props) => (<CommonWorkList {...this.props} {...props} {...this.state} {...commonHandler}/>)
+                        (props) => (<CommonWorkList ref="commonWorkList" {...this.props} {...props} {...this.state} {...commonHandler}/>)
                         }
                     ></Route>
 

From e112369ff174723377714b561d845aea654e416a Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 16 Jul 2019 10:13:28 +0800
Subject: [PATCH 03/10] lang

---
 public/react/src/modules/page/component/monaco/TPIMonaco.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/react/src/modules/page/component/monaco/TPIMonaco.js b/public/react/src/modules/page/component/monaco/TPIMonaco.js
index 1d5193a6e..d6c0ba5cc 100644
--- a/public/react/src/modules/page/component/monaco/TPIMonaco.js
+++ b/public/react/src/modules/page/component/monaco/TPIMonaco.js
@@ -154,11 +154,13 @@ function checkIfLoaded (callback) {
 const mirror2LanguageMap = {
     'JFinal': 'java',
     'Java': 'java',
+    'JavaWeb': 'java',
     'Kotlin': 'java',
 
     'Html': 'html',
     'Css': 'css',
     'Javascript': 'javascript',
+    'JavaScript': 'javascript',
 
     'C/C++': 'cpp',
     'MachineLearning': 'python',
@@ -173,6 +175,7 @@ function getLanguageByMirrorName(mirror_name) {
     let lang = 'javascript'
     if (mirror_name && mirror_name.length) {
         // 需要倒着遍历， html、css的实训，主评测语言环境是python，小类别是html或css
+        // TODO http://localhost:3007/tasks/hmcwa3g8typ5?debug=t   ["Python3.6", "VNC", "Html"]
         for (let i = mirror_name.length - 1; i >= 0; i--) {
             let languageVal = mirror2LanguageMap[mirror_name[i]];
             if (languageVal) {

From 80e189b353eee6cc57380e7f295c87d801b91e54 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 16 Jul 2019 10:13:38 +0800
Subject: [PATCH 04/10] //

---
 .../react/src/modules/page/component/monaco/TPIMonacoConfig.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/page/component/monaco/TPIMonacoConfig.js b/public/react/src/modules/page/component/monaco/TPIMonacoConfig.js
index 5a80304ee..d5880ab06 100644
--- a/public/react/src/modules/page/component/monaco/TPIMonacoConfig.js
+++ b/public/react/src/modules/page/component/monaco/TPIMonacoConfig.js
@@ -1,4 +1,4 @@
-import * as monaco from 'monaco-editor'
+// import * as monaco from 'monaco-editor'
 import _ from 'lodash'
 const ifelse = {
     label: 'ifelse',

From 47a26ca47a57a56dd621745f91b7f0f6869379c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 16 Jul 2019 10:43:44 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/config/webpack.config.dev.js     |   2 +-
 .../modules/tpm/challengesnew/TPMMDEditor.js  | 676 +++++++++---------
 .../modules/tpm/challengesnew/TPMquestion.js  |  54 +-
 .../tpm/challengesnew/TpmQuestionEdit.js      |   7 +-
 .../tpm/challengesnew/TpmQuestionNew.js       |   2 +-
 .../Collaborators/Collaborators.css           |  11 +-
 .../Collaborators/Collaborators.js            |  94 +--
 7 files changed, 440 insertions(+), 406 deletions(-)

diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index 80973be75..11cfc1962 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -29,7 +29,7 @@ const env = getClientEnvironment(publicUrl);
 module.exports = {
   // 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
-	devtool: "source-map", // 开启调试
+	// devtool: "source-map", // 开启调试
   // These are the "entry points" to our application.
   // 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.
diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
index 445d7b759..93f50d704 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
@@ -1,338 +1,338 @@
-import React, {Component} from 'react';
-
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
-
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
-
-// import "antd/dist/antd.css";
-
-import { getImageUrl, toPath, getUrl } from 'educoder';
-import '../../courses/css/Courses.css'
-
-import axios from 'axios';
-
-import './css/TPMchallengesnew.css';
-require('codemirror/lib/codemirror.css');
-
-let origin = getUrl();
-
-let path = getUrl("/editormd/lib/")
-
-const $ = window.$;
-
-let timeout;
-
-let currentValue;
-
-const Option = Select.Option;
-
-const RadioGroup = Radio.Group;
-
-
-
-// 保存数据
-function md_add_data(k,mdu,d){
-    window.sessionStorage.setItem(k+mdu,d);
-}
-
-// 清空保存的数据
-function md_clear_data(k,mdu,id){
-    window.sessionStorage.removeItem(k+mdu);
-    var id1 = "#e_tip_"+id;
-    var id2 = "#e_tips_"+id;
-    if(k == 'content'){
-        $(id2).html("　");
-    }else{
-        $(id1).html("　");
-    }
-}
-window.md_clear_data = md_clear_data
-// editor 存在了jquery对象上，应用不需要自己写md_rec_data方法了
-function md_rec_data(k, mdu, id) {
-    if (window.sessionStorage.getItem(k + mdu) !== null) {
-        var editor = $("#e_tips_" + id).data('editor');
-        editor.setValue(window.sessionStorage.getItem(k + mdu));
-        // debugger;
-        // /shixuns/b5hjq9zm/challenges/3977/tab=3  setValue可能导致editor样式问题
-        md_clear_data(k, mdu, id);
-    }
-}
-window.md_rec_data = md_rec_data;
-
-function md_elocalStorage(editor,mdu,id){
-    if (window.sessionStorage){
-        var oc = window.sessionStorage.getItem('content'+mdu);
-        if(oc !== null ){
-            console.log("#e_tips_"+id)
-            $("#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>';
-            $("#e_tips_"+id).html(h);
-        }
-        setInterval(function() {
-            var d = new Date();
-            var h = d.getHours();
-            var m = d.getMinutes();
-            var s = d.getSeconds();
-            h = h < 10 ? '0' + h : h;
-            m = m < 10 ? '0' + m : m;
-            s = s < 10 ? '0' + s : s;
-            if(editor.getValue().trim() != ""){
-                md_add_data("content",mdu,editor.getValue());
-                var id1 = "#e_tip_"+id;
-                var id2 = "#e_tips_"+id;
-                
-                var textStart = " 数据已于 "
-                var text = textStart + h + ':' + m + ':' + s +" 保存 ";
-                // 占位符   
-                var oldHtml = $(id2).html();
-                if (oldHtml && oldHtml != '　' && oldHtml.startsWith(textStart) == false) {
-                    $(id2).html( oldHtml.split('　(')[0] + `　(${text})`);
-                } else {
-                    $(id2).html(text);
-                }
-                // $(id2).html("");
-            }
-        },10000);
-
-    }else{
-        $("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
-    }
-}
-
-
-function create_editorMD(id, width, high, placeholder, imageUrl, callback, initValue, 
-        onchange, watch, { noStorage, showNullButton }, that) {
-    // 还是出现了setting只有一份，被共用的问题
-    
-    var editorName = window.editormd(id, {
-        width: width,
-        height: high===undefined?400:high,
-        path: path,   // "/editormd/lib/"
-        markdown : initValue,
-
-        dialogLockScreen: false,
-        watch:watch===undefined?true:watch,
-        syncScrolling: "single",
-        tex: true,
-        tocm: true,
-        emoji: true,
-        taskList: true,
-        codeFold: true,
-        searchReplace: true,
-        htmlDecode: "style,script,iframe",
-        sequenceDiagram: true,
-        autoFocus: false,
-
-        // mine
-        
-        toolbarIcons: function (mdEditor) {
-            let react_id = `react_${mdEditor.id}`;
-            const __that = window[react_id]
-
-            // Or return editormd.toolbarModes[name]; // full, simple, mini
-            // Using "||" set icons align right.
-            const icons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"];
-            if (__that.props.showNullButton) {
-                icons.push('nullBtton')
-            }
-            return icons
-        },
-        toolbarCustomIcons: {
-            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></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>",
-        },
-        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-        saveHTMLToTextarea: true,
-        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-        dialogMaskOpacity: 0.6,
-        placeholder: placeholder,
-        imageUpload: true,
-        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL: imageUrl,//url
-        onchange: onchange,
-        onload: function() {
-            let _id = this.id   // 如果要使用this，这里不能使用箭头函数
-            let _editorName = this;
-            let react_id = `react_${_editorName.id}`;
-            const __that = window[react_id]
-            
-            // this.previewing();
-            // let _id = id;
-            $("#" + _id + " [type=\"latex\"]").bind("click", function () {
-                _editorName.cm.replaceSelection("```latex");
-                _editorName.cm.replaceSelection("\n");
-                _editorName.cm.replaceSelection("\n");
-                _editorName.cm.replaceSelection("```");
-                var __Cursor = _editorName.cm.getDoc().getCursor();
-                _editorName.cm.setCursor(__Cursor.line - 1, 0);
-            });
-
-            $("#" + _id + " [type=\"inline\"]").bind("click", function () {
-                _editorName.cm.replaceSelection("$$$$");
-                var __Cursor = _editorName.cm.getDoc().getCursor();
-                _editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
-                _editorName.cm.focus();
-            });
-            $("[type=\"inline\"]").attr("title", "行内公式");
-            $("[type=\"latex\"]").attr("title", "多行公式");
-
-            if (__that.props.showNullButton) {
-                const NULL_CH = '▁'
-                // const NULL_CH = '〇'
-                // const NULL_CH = '🈳'
-                
-                $("#" + _id + " [type=\"nullBtton\"]").bind("click", function () {
-                    _editorName.cm.replaceSelection(NULL_CH);
-                    // var __Cursor = _editorName.cm.getDoc().getCursor();
-                    // _editorName.cm.setCursor(__Cursor.line - 1, 0);
-                });
-            }
-
-            if (noStorage == true) {
-
-            } else {
-                md_elocalStorage(_editorName, `MDEditor__${_id}`, _id);
-            }
-
-            callback && callback(_editorName)
-        }
-    });
-    return editorName;
-}
-
-
-export default class TPMMDEditor extends Component {
-    constructor(props) {
-        super(props)
-        this.state = {
-            initValue: ''
-        }
-    }
-    componentDidUpdate(prevProps, prevState) {
-        // 不能加，影响了试卷填空题
-        // if (this.props.initValue != prevProps.initValue) {
-        //     this.answers_editormd.setValue(this.props.initValue)
-        // }
-    }
-    
-    // react_mdEditor_
-    componentDidMount = () => {
-        const { mdID, initValue, placeholder, showNullButton} = this.props;
-        
-        let _id = `mdEditor_${mdID}`
-        this.contentChanged = false;
-        const _placeholder = placeholder || "";
-        // amp;
-        // 编辑时要传memoId
-        const imageUrl = `/api/attachments.json`;
-        // 创建editorMd
-        let react_id = `react_${_id}`;
-        window[react_id] = this
-        const answers_editormd = create_editorMD(_id, '100%', this.props.height, _placeholder, imageUrl, (__editorName) => {
-            react_id = `react_${__editorName.id}`;
-            const that = window[react_id]
-
-            setTimeout(() => {
-                console.log('timeout', __editorName.id)
-                __editorName.resize()
-                __editorName.cm && __editorName.cm.refresh()
-            }, that.props.refreshTimeout || 500)
-            if (that.props.initValue != undefined && that.props.initValue != '') {
-                __editorName.setValue(that.props.initValue)
-            }
-            if (that.state.initValue) {
-                __editorName.setValue(that.state.initValue)
-            }
-            __editorName.cm.on("change", (_cm, changeObj) => {
-                that.contentChanged = true;
-                if (that.state.showError) {
-                    that.setState({showError: false})
-                }
-                that.onEditorChange()
-            })
-            that.props.onCMBlur && __editorName.cm.on('blur', () => {
-                that.props.onCMBlur()
-            })
-            that.props.onCMBeforeChange && __editorName.cm.on('beforeChange', (cm,change) => {
-                that.props.onCMBeforeChange(cm,change)
-            })
-            that.answers_editormd = __editorName;
-            window[_id] = __editorName;
-        }, initValue, this.onEditorChange,this.props.watch, {
-            noStorage: this.props.noStorage,
-            showNullButton: this.props.showNullButton
-        }, this);
-        
-    }
-    showError = () => {
-        this.setState({showError: true})
-    }
-    onEditorChange = () => {
-        if (!this.answers_editormd) return;
-        const val = this.answers_editormd.getValue();
-        try {
-            this.props.onChange && this.props.onChange(val)
-        } catch(e) {
-            // http://localhost:3007/courses/1309/common_homeworks/6566/setting 
-            // 从这个页面，跳转到编辑页面，再在编辑页面点击返回的时候，这里会报错
-            console.error('出错')
-            console.error(e)
-        }
-    }
-    resize = () => {
-        if (!this.answers_editormd) { // 还未初始化
-            return;
-        }
-        this.answers_editormd.resize()
-        this.answers_editormd.cm && this.answers_editormd.cm.refresh()
-        this.answers_editormd.cm.focus()
-    }
-
-    getValue = () => {
-        try {
-            return this.answers_editormd.getValue()
-        } catch (e) {
-            return ''
-        }
-    }
-    setValue = (val) => {
-        try {
-            this.answers_editormd.setValue(val)
-        } catch (e) {
-            // TODO 这里多实例的时候，前一个实例的state会被后面这个覆盖 参考NewWork.js    http://localhost:3007/courses/1309/homework/9300/edit/1
-            // 未初始化
-            this.setState({ initValue: val })
-        }
-    }
-    
-    render() {
-
-        let {
-            showError
-        } = this.state;
-        let { mdID, className, noStorage } = this.props;
-        let _style = {}
-        if (showError) {
-            _style.border = '1px solid red'
-        }
-        return (
-            <React.Fragment>
-                <div className={`df ${className}`} >
-                {/* padding10-20  */}
-                    <div className="edu-back-greyf5 radius4" id={`mdEditor_${mdID}`} style={{..._style}}>
-                        <textarea style={{display: 'none'}}  id="evaluate_script_show" name="content"></textarea>
-                        <div className="CodeMirror cm-s-defualt">
-                        </div>
-                    </div>
-                </div>
-                <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>} */}
-                </div>
-            </React.Fragment>
-        )
-    }
-}
-
-
+import React, {Component} from 'react';
+
+import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
+
+import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
+
+// import "antd/dist/antd.css";
+
+import { getImageUrl, toPath, getUrl } from 'educoder';
+import '../../courses/css/Courses.css'
+
+import axios from 'axios';
+
+import './css/TPMchallengesnew.css';
+require('codemirror/lib/codemirror.css');
+
+let origin = getUrl();
+
+let path = getUrl("/editormd/lib/")
+
+const $ = window.$;
+
+let timeout;
+
+let currentValue;
+
+const Option = Select.Option;
+
+const RadioGroup = Radio.Group;
+
+
+
+// 保存数据
+function md_add_data(k,mdu,d){
+    window.sessionStorage.setItem(k+mdu,d);
+}
+
+// 清空保存的数据
+function md_clear_data(k,mdu,id){
+    window.sessionStorage.removeItem(k+mdu);
+    var id1 = "#e_tip_"+id;
+    var id2 = "#e_tips_"+id;
+    if(k == 'content'){
+        $(id2).html("　");
+    }else{
+        $(id1).html("　");
+    }
+}
+window.md_clear_data = md_clear_data
+// editor 存在了jquery对象上，应用不需要自己写md_rec_data方法了
+function md_rec_data(k, mdu, id) {
+    if (window.sessionStorage.getItem(k + mdu) !== null) {
+        var editor = $("#e_tips_" + id).data('editor');
+        editor.setValue(window.sessionStorage.getItem(k + mdu));
+        // debugger;
+        // /shixuns/b5hjq9zm/challenges/3977/tab=3  setValue可能导致editor样式问题
+        md_clear_data(k, mdu, id);
+    }
+}
+window.md_rec_data = md_rec_data;
+
+function md_elocalStorage(editor,mdu,id){
+    if (window.sessionStorage){
+        var oc = window.sessionStorage.getItem('content'+mdu);
+        if(oc !== null ){
+            console.log("#e_tips_"+id)
+            $("#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>';
+            $("#e_tips_"+id).html(h);
+        }
+        setInterval(function() {
+            var d = new Date();
+            var h = d.getHours();
+            var m = d.getMinutes();
+            var s = d.getSeconds();
+            h = h < 10 ? '0' + h : h;
+            m = m < 10 ? '0' + m : m;
+            s = s < 10 ? '0' + s : s;
+            if(editor.getValue().trim() != ""){
+                md_add_data("content",mdu,editor.getValue());
+                var id1 = "#e_tip_"+id;
+                var id2 = "#e_tips_"+id;
+                
+                var textStart = " 数据已于 "
+                var text = textStart + h + ':' + m + ':' + s +" 保存 ";
+                // 占位符   
+                var oldHtml = $(id2).html();
+                if (oldHtml && oldHtml != '　' && oldHtml.startsWith(textStart) == false) {
+                    $(id2).html( oldHtml.split('　(')[0] + `　(${text})`);
+                } else {
+                    $(id2).html(text);
+                }
+                // $(id2).html("");
+            }
+        },10000);
+
+    }else{
+        $("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
+    }
+}
+
+
+function create_editorMD(id, width, high, placeholder, imageUrl, callback, initValue, 
+        onchange, watch, { noStorage, showNullButton }, that) {
+    // 还是出现了setting只有一份，被共用的问题
+    
+    var editorName = window.editormd(id, {
+        width: width,
+        height: high===undefined?400:high,
+        path: path,   // "/editormd/lib/"
+        markdown : initValue,
+
+        dialogLockScreen: false,
+        watch:watch===undefined?true:watch,
+        syncScrolling: "single",
+        tex: true,
+        tocm: true,
+        emoji: true,
+        taskList: true,
+        codeFold: true,
+        searchReplace: true,
+        htmlDecode: "style,script,iframe",
+        sequenceDiagram: true,
+        autoFocus: false,
+
+        // mine
+        
+        toolbarIcons: function (mdEditor) {
+            let react_id = `react_${mdEditor.id}`;
+            const __that = window[react_id]
+
+            // Or return editormd.toolbarModes[name]; // full, simple, mini
+            // Using "||" set icons align right.
+            const icons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"];
+            if (__that.props.showNullButton) {
+                icons.push('nullBtton')
+            }
+            return icons
+        },
+        toolbarCustomIcons: {
+            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></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>",
+        },
+        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
+        saveHTMLToTextarea: true,
+        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
+        dialogMaskOpacity: 0.6,
+        placeholder: placeholder,
+        imageUpload: true,
+        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
+        imageUploadURL: imageUrl,//url
+        onchange: onchange,
+        onload: function() {
+            let _id = this.id   // 如果要使用this，这里不能使用箭头函数
+            let _editorName = this;
+            let react_id = `react_${_editorName.id}`;
+            const __that = window[react_id]
+            
+            // this.previewing();
+            // let _id = id;
+            $("#" + _id + " [type=\"latex\"]").bind("click", function () {
+                _editorName.cm.replaceSelection("```latex");
+                _editorName.cm.replaceSelection("\n");
+                _editorName.cm.replaceSelection("\n");
+                _editorName.cm.replaceSelection("```");
+                var __Cursor = _editorName.cm.getDoc().getCursor();
+                _editorName.cm.setCursor(__Cursor.line - 1, 0);
+            });
+
+            $("#" + _id + " [type=\"inline\"]").bind("click", function () {
+                _editorName.cm.replaceSelection("$$$$");
+                var __Cursor = _editorName.cm.getDoc().getCursor();
+                _editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+                _editorName.cm.focus();
+            });
+            $("[type=\"inline\"]").attr("title", "行内公式");
+            $("[type=\"latex\"]").attr("title", "多行公式");
+
+            if (__that.props.showNullButton) {
+                const NULL_CH = '▁'
+                // const NULL_CH = '〇'
+                // const NULL_CH = '🈳'
+                
+                $("#" + _id + " [type=\"nullBtton\"]").bind("click", function () {
+                    _editorName.cm.replaceSelection(NULL_CH);
+                    // var __Cursor = _editorName.cm.getDoc().getCursor();
+                    // _editorName.cm.setCursor(__Cursor.line - 1, 0);
+                });
+            }
+
+            if (noStorage == true) {
+
+            } else {
+                md_elocalStorage(_editorName, `MDEditor__${_id}`, _id);
+            }
+
+            callback && callback(_editorName)
+        }
+    });
+    return editorName;
+}
+
+
+export default class TPMMDEditor extends Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+            initValue: ''
+        }
+    }
+    componentDidUpdate(prevProps, prevState) {
+        // 不能加，影响了试卷填空题
+        // if (this.props.initValue != prevProps.initValue) {
+        //     this.answers_editormd.setValue(this.props.initValue)
+        // }
+    }
+    
+    // react_mdEditor_
+    componentDidMount = () => {
+        const { mdID, initValue, placeholder, showNullButton} = this.props;
+        
+        let _id = `mdEditor_${mdID}`
+        this.contentChanged = false;
+        const _placeholder = placeholder || "";
+        // amp;
+        // 编辑时要传memoId
+        const imageUrl = `/api/attachments.json`;
+        // 创建editorMd
+        let react_id = `react_${_id}`;
+        window[react_id] = this
+        const answers_editormd = create_editorMD(_id, '100%', this.props.height, _placeholder, imageUrl, (__editorName) => {
+            react_id = `react_${__editorName.id}`;
+            const that = window[react_id]
+
+            setTimeout(() => {
+                console.log('timeout', __editorName.id)
+                __editorName.resize()
+                __editorName.cm && __editorName.cm.refresh()
+            }, that.props.refreshTimeout || 500)
+            if (that.props.initValue != undefined && that.props.initValue != '') {
+                __editorName.setValue(that.props.initValue)
+            }
+            if (that.state.initValue) {
+                __editorName.setValue(that.state.initValue)
+            }
+            __editorName.cm.on("change", (_cm, changeObj) => {
+                that.contentChanged = true;
+                if (that.state.showError) {
+                    that.setState({showError: false})
+                }
+                that.onEditorChange()
+            })
+            that.props.onCMBlur && __editorName.cm.on('blur', () => {
+                that.props.onCMBlur()
+            })
+            that.props.onCMBeforeChange && __editorName.cm.on('beforeChange', (cm,change) => {
+                that.props.onCMBeforeChange(cm,change)
+            })
+            that.answers_editormd = __editorName;
+            window[_id] = __editorName;
+        }, initValue, this.onEditorChange,this.props.watch, {
+            noStorage: this.props.noStorage,
+            showNullButton: this.props.showNullButton
+        }, this);
+        
+    }
+    showError = () => {
+        this.setState({showError: true})
+    }
+    onEditorChange = () => {
+        if (!this.answers_editormd) return;
+        const val = this.answers_editormd.getValue();
+        try {
+            this.props.onChange && this.props.onChange(val)
+        } catch(e) {
+            // http://localhost:3007/courses/1309/common_homeworks/6566/setting 
+            // 从这个页面，跳转到编辑页面，再在编辑页面点击返回的时候，这里会报错
+            console.error('出错')
+            console.error(e)
+        }
+    }
+    resize = () => {
+        if (!this.answers_editormd) { // 还未初始化
+            return;
+        }
+        this.answers_editormd.resize()
+        this.answers_editormd.cm && this.answers_editormd.cm.refresh()
+        this.answers_editormd.cm.focus()
+    }
+
+    getValue = () => {
+        try {
+            return this.answers_editormd.getValue()
+        } catch (e) {
+            return ''
+        }
+    }
+    setValue = (val) => {
+        try {
+            this.answers_editormd.setValue(val)
+        } catch (e) {
+            // TODO 这里多实例的时候，前一个实例的state会被后面这个覆盖 参考NewWork.js    http://localhost:3007/courses/1309/homework/9300/edit/1
+            // 未初始化
+            this.setState({ initValue: val })
+        }
+    }
+    
+    render() {
+
+        let {
+            showError
+        } = this.state;
+        let { mdID, className, noStorage } = this.props;
+        let _style = {}
+        if (showError) {
+            _style.border = '1px solid red'
+        }
+        return (
+            <React.Fragment>
+                <div className={`df ${className}`} >
+                {/* padding10-20  */}
+                    <div className="edu-back-greyf5 radius4" id={`mdEditor_${mdID}`} style={{..._style}}>
+                        <textarea style={{display: 'none'}}   id={`mdEditors_${mdID}`} name="content"></textarea>
+                        <div className="CodeMirror cm-s-defualt">
+                        </div>
+                    </div>
+                </div>
+                <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>} */}
+                </div>
+            </React.Fragment>
+        )
+    }
+}
+
+
diff --git a/public/react/src/modules/tpm/challengesnew/TPMquestion.js b/public/react/src/modules/tpm/challengesnew/TPMquestion.js
index 60840b81f..86451e3ec 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMquestion.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMquestion.js
@@ -1,6 +1,6 @@
 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";
 
@@ -184,7 +184,7 @@ export default class TPMquestion extends Component {
                             practice_url: newpractice_url,
                             go_back_url: newgo_back_url,
                             power:response.data.power,
-                            questioMD:response.data.task_pass,
+                            // questioMD:response.data.task_pass,
                             answer:response.data.answer
 
                         })
@@ -192,7 +192,7 @@ export default class TPMquestion extends Component {
 												this.setState({
 													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){
                             this.questionadd()
                         }
@@ -248,14 +248,14 @@ export default class TPMquestion extends Component {
                         practice_url: newpractice_url,
                         go_back_url: newgo_back_url,
                         power:response.data.power,
-                        questioMD:response.data.task_pass,
+                        // questioMD:response.data.task_pass,
 
                     })
 
 										this.setState({
 											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){
                         this.questionadd()
                     }
@@ -400,12 +400,14 @@ export default class TPMquestion extends Component {
     }
 
     questionall=()=>{
-        this.setState({
-            activetype:"first",
-            newquestionaddtype:false,
-            editquestionaddtype:false,
-					  questionaddtype:false
-        })
+        // this.setState({
+        //     activetype:"first",
+        //     newquestionaddtype:false,
+        //     editquestionaddtype:false,
+				// 	  questionaddtype:false
+        // })
+
+			window.location.href = '/shixuns/'+this.props.match.params.shixunId+'/challenges/'+this.props.match.params.checkpointId+'/editquestion';
     }
     questionadd=()=>{
         $('html').animate({
@@ -707,14 +709,22 @@ export default class TPMquestion extends Component {
                 // $('html').animate({
                 //     scrollTop: 10
                 // }, 200);
-                message.success("修改成功");
+							$('html').animate({
+								scrollTop: 10
+							}, 200);
+
+							notification.open({
+								message: '提示',
+								description:
+									'修改成功，请点击右侧加号继续添加',
+							});
 
                 this.setState({
                     questionaddtype:false,
                     newquestioMDvaluetype: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()
             }).catch((error) => {
                 console.log(error)
@@ -761,12 +771,17 @@ export default class TPMquestion extends Component {
                     newquestioMDvaluetypes:false,
                     questionaddarray:questionaddarrays
                 })
-                // $('html').animate({
-                //     scrollTop: 10
-                // }, 200);
-                message.success("新建成功");
+                $('html').animate({
+                    scrollTop: 10
+                }, 200);
+
+								notification.open({
+									message: '提示',
+									description:
+										'新建成功，请点击右侧加号继续添加',
+								});
                 // 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) => {
                 console.log(error)
             });
@@ -869,7 +884,8 @@ export default class TPMquestion extends Component {
     }
 
     gochooseid=(url)=>{
-      window.location.href =url
+     window.location.href =url
+			// window.location.Reload(url)
 			// this.props.history.replace( url );
 			// this.props.history.push( url );
 		//	返回
diff --git a/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js b/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
index 7de8529d7..a037e62dc 100644
--- a/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
+++ b/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
@@ -24,7 +24,10 @@ export default class TpmQuestionEdit extends Component {
 
 
 	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 (
 			<div>
 
@@ -34,7 +37,7 @@ export default class TpmQuestionEdit extends Component {
 						<div className="df">
 							<span className="mr30 color-orange pt10">*</span>
 							<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>
 							</div>
 
diff --git a/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js b/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
index 76a540e0c..58632b96b 100644
--- a/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
+++ b/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
@@ -24,7 +24,7 @@ export default class TpmQuestionNew extends Component {
 
 
 	render() {
-		console.log(	this.props.questionlists)
+		// console.log(	this.props.questionlists)
 		return (
 			<div>
 
diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css
index 102db226b..31917086f 100644
--- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css
+++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css
@@ -1,4 +1,9 @@
-.height40 {
-    height: 30px;
-    line-height: 30px;
+.height40 {
+    height: 30px;
+    line-height: 30px;
+}
+
+.line27{
+    line-height: 27px;
+    vertical-align: 1px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
index d629a1c5b..7811d12fd 100644
--- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
+++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 
 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";
 
@@ -44,7 +44,8 @@ class Collaborators extends Component {
             collaboratorListsum:10,
             collaboratorListsumtype:true,
 					  user_name:undefined,
-					  school_name:undefined
+					  school_name:undefined,
+						spinnings:false
         }
     }
     componentDidMount() {
@@ -155,9 +156,11 @@ class Collaborators extends Component {
         })
     }
     onSearchadmin = (value) => {
+
         let {collaboratorList,user_name,school_name} = this.state;
 			  this.setState({
 				       Searchadmin: [],
+					     spinnings:true,
 				    })
         // if (value === "") {
         //     this.setState({
@@ -174,7 +177,9 @@ class Collaborators extends Component {
 					school_name:school_name,
 				}}).then((response) => {
 				if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
-
+					this.setState({
+						spinnings:false
+					})
 				}else{
 					let newlist = response.data.users;
 					for (var i = 0; i < newlist.length; i++) {
@@ -182,7 +187,8 @@ class Collaborators extends Component {
 					}
 					this.setState({
 						Searchadmin: newlist,
-						collaboratorList: collaboratorList
+						collaboratorList: collaboratorList,
+						spinnings:false
 					})
 				}
 
@@ -404,7 +410,10 @@ class Collaborators extends Component {
             lineHeight: '30px',
         };
          // console.log(collaboratorList)
-        return (
+
+		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
+
+		return (
             <React.Fragment>
                 <p className="clearfix mt30"
                    style={{display:this.props.identity<5?"block":"none"}}
@@ -412,7 +421,7 @@ class Collaborators extends Component {
                     <a onClick={() => this.showCollaboratorsvisible("cooperation")}
                        className="edu-default-btn edu-greenback-btn fr mr20 height40"
                        data-remote="true">
-                        + 添加合作者
+                        <span className={"line27"}>+ </span>添加合作者
                     </a>
                     <a onClick={() => this.showCollaboratorsvisible("admin")}
                        style={{display:this.props.identity===1?"block":"none"}}
@@ -467,6 +476,7 @@ class Collaborators extends Component {
                     visible={Collaboratorsvisibleadmin}
                     closable={false}
                     footer={null}
+										width={800}
                 >
                     {/*<Search*/}
                         {/*placeholder="输入用户的姓名、昵称、邮箱进行搜索"*/}
@@ -475,53 +485,53 @@ class Collaborators extends Component {
                         {/*onInput={this.onSearchadmins}*/}
                         {/*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})}}
-												 style={{ width: '130px'}}
+									<Input  placeholder="请输入姓名或手机号码搜索" value={user_name} onInput={(e) => {this.setState({user_name: e.target.value})}}
+												 style={{ width: '215px'}}
 									></Input>
 									<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})}}
-									style={{ width: '135px'}}>
+								 <Input  placeholder="请输入单位名称" className="ml10" value={school_name} onInput={(e) => {this.setState({school_name: e.target.value})}}
+									style={{ width: '215px'}}
+								 >
 								</Input>
 
-									<a className="task-btn task-btn-orange" onClick={() => this.onSearchadmin()}
-										 style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}}
+									<a className="task-btn task-btn-orange ml20" onClick={() => this.onSearchadmin()}
+										 style={{ height: '30px', lineHeight: '30px', width: '70px'}}
 									>搜索</a>
 									<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-w80 task-hide font-bd">职业</span>
-										<span className="fl edu-txt-w180 task-hide font-bd ml50">单位</span>
+										<span className="fl edu-txt-w100 task-hide font-bd ml10 edu-txt-left">姓名</span>
+										<span className="fl edu-txt-w100 task-hide font-bd">职业</span>
+										<span className="fl edu-txt-w180 task-hide font-bd ml80">单位</span>
 									</p>
                     <div className="mt5" style={{background: '#f7f9fd'}}>
-
-                        <div className="clearfix">
-                            <ul className="upload_select_box fl" id="search_not_teachers_list"    onScroll={this.contentViewScrolledit}>
-                                {Searchadmin.length === 0 ? <li style={{textAlign: 'center'}}>
-                                    <span>请试试搜索一下</span>
-                                </li> : Searchadmin.map((item, key) => {
-                                    return (
-                                        <li key={key} style={{display: item.identify === "专业人士" ? "none" : "block"}}>
-                                            <Checkbox className="fl mr20" checked={item.checked}
-                                                      onChange={(e) => this.selectChangenickname(e, key)}
-                                                      id={item.user_id}></Checkbox>
-                                            <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
-																							  title={item.school_name}
-																								style={{width: '150px'}}
-                                                className="span3 color-grey fl edu-txt-w260 task-hide ml50 task-hide" >{item.school_name}</span>
-                                        </li>
-                                    )
-                                })
-
-                                }
-                            </ul>
-                        </div>
+											<Spin indicator={antIcon} spinning={this.state.spinnings}>
+												<div className="clearfix">
+													<ul className="upload_select_box fl" id="search_not_teachers_list"    onScroll={this.contentViewScrolledit}>
+														{Searchadmin.length === 0 ? <li style={{textAlign: 'center'}}>
+															<span>请试试搜索一下</span>
+														</li> : Searchadmin.map((item, key) => {
+															return (
+																<li key={key} style={{display: item.identify === "专业人士" ? "none" : "block"}}>
+																	<Checkbox className="fl mr20" checked={item.checked}
+																						onChange={(e) => this.selectChangenickname(e, key)}
+																						id={item.user_id}></Checkbox>
+																	<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
+																		title={item.school_name}
+																		style={{width: '150px'}}
+																		className="span3 color-grey fl edu-txt-w260 task-hide ml50 task-hide" >{item.school_name}</span>
+																</li>
+															)
+														})
+
+														}
+													</ul>
+												</div>
+											</Spin>
                     </div>
-
                     <div className="mt10 clearfix">
-
               <span className="fl mr15">
                   <Checkbox className="fl" checked={allChangechecked} onChange={this.allChange}>全选</Checkbox>
                   <div className="fl" style={{height: '27px'}}>

From 762f3a413d3ea11c53a1229995c3526ae951b03e Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 16 Jul 2019 10:49:10 +0800
Subject: [PATCH 06/10] save

---
 public/react/src/modules/user/account/AccountBasicEdit.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index 7463fa632..f7e58b8de 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -101,7 +101,11 @@ class AccountBasic extends Component {
     this.props.form.validateFieldsAndScroll((err, values) => {
       console.log(values);
       let {basicInfo}=this.props;
-      if(!err){
+      // TODO 为什么modal里的form影响到这里的了
+      if (err) {
+        delete err.depart
+      }
+      if(!err || Object.keys(err).length == 0){
         let url=`/users/accounts/${basicInfo.id}.json`
         axios.put((url),{
           nickname:values.nickname,
@@ -117,7 +121,9 @@ class AccountBasic extends Component {
           department_id:this.state.department_id
         }).then((result)=>{
           if(result){
+            this.props.showNotification('保存成功')
             this.props.getBasicInfo();
+            this.props.history.push('/account/profile')
           }
         }).catch((error)=>{
           console.log(error);

From 471f92d857f58feba0b673ec924ddc0a52d01fee Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 16 Jul 2019 10:54:55 +0800
Subject: [PATCH 07/10] =?UTF-8?q?ToolTip=20title=3D"=E5=88=A0=E9=99=A4">?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/challengesnew/TPManswer2.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/tpm/challengesnew/TPManswer2.js b/public/react/src/modules/tpm/challengesnew/TPManswer2.js
index ef850994d..256bc1d00 100644
--- a/public/react/src/modules/tpm/challengesnew/TPManswer2.js
+++ b/public/react/src/modules/tpm/challengesnew/TPManswer2.js
@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 
-import {Input, InputNumber, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
+import {Input, InputNumber, Select, Radio, Checkbox, Popconfirm, message, Modal, ToolTip} from 'antd';
 
 import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
 
@@ -320,9 +320,11 @@ export default class TPManswer extends Component {
                                     return <div className="levelSection" id={`levelSection${index}`} style={{ clear: 'both' }}>
                                         <span className="mr4 color-orange pt10">*</span>
                                         <p className="color-grey-6 font-16 mb30 mt10" style={{ display: "inline" }}>级别{index + 1}</p>
+                                        <ToolTip title="删除">
                                         <a className="fr sample_icon_remove mr30 mt8" onClick={()=>this.delanswers(index)}>
                                             <i  className="fa fa-times-circle color-grey-c font-16 fl"  ></i>
                                         </a>
+                                        </ToolTip>
                                         <div className=" color-grey-6 font-16" style={{ marginLeft: "9px", margin: '8px 9px'}}>
                                             <div className=" ">
                                                 <span>名称：</span>

From 94446c536f88c121028bda1eb1c56521fd70d548 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 16 Jul 2019 10:56:39 +0800
Subject: [PATCH 08/10] Tooltip

---
 public/react/src/modules/tpm/challengesnew/TPManswer2.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/tpm/challengesnew/TPManswer2.js b/public/react/src/modules/tpm/challengesnew/TPManswer2.js
index 256bc1d00..6218cc468 100644
--- a/public/react/src/modules/tpm/challengesnew/TPManswer2.js
+++ b/public/react/src/modules/tpm/challengesnew/TPManswer2.js
@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 
-import {Input, InputNumber, Select, Radio, Checkbox, Popconfirm, message, Modal, ToolTip} from 'antd';
+import {Input, InputNumber, Select, Radio, Checkbox, Popconfirm, message, Modal, Tooltip} from 'antd';
 
 import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
 
@@ -320,11 +320,11 @@ export default class TPManswer extends Component {
                                     return <div className="levelSection" id={`levelSection${index}`} style={{ clear: 'both' }}>
                                         <span className="mr4 color-orange pt10">*</span>
                                         <p className="color-grey-6 font-16 mb30 mt10" style={{ display: "inline" }}>级别{index + 1}</p>
-                                        <ToolTip title="删除">
+                                        <Tooltip title="删除">
                                         <a className="fr sample_icon_remove mr30 mt8" onClick={()=>this.delanswers(index)}>
                                             <i  className="fa fa-times-circle color-grey-c font-16 fl"  ></i>
                                         </a>
-                                        </ToolTip>
+                                        </Tooltip>
                                         <div className=" color-grey-6 font-16" style={{ marginLeft: "9px", margin: '8px 9px'}}>
                                             <div className=" ">
                                                 <span>名称：</span>

From 768ff5869927eab9c8873ef45e77d7fd2fd27dba Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 16 Jul 2019 11:08:00 +0800
Subject: [PATCH 09/10] this.props.fetchRepositoryCode(props, null, null, true)

---
 public/react/src/modules/page/MainContentContainer.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/page/MainContentContainer.js b/public/react/src/modules/page/MainContentContainer.js
index daa4b65b6..c343efcf2 100644
--- a/public/react/src/modules/page/MainContentContainer.js
+++ b/public/react/src/modules/page/MainContentContainer.js
@@ -337,12 +337,16 @@ class MainContentContainer extends Component {
 								this.oldGameIdentifier = null;
 								return;
 							}
+							// 重试调用的这个 this.props.fetchRepositoryCode(this.props, null, null, true)
 							setTimeout(() => {
 								this.fetchRepositoryCode(props, arg_path, type, 1)
 							}, 1500);
 						}
 					}
-				}else{
+				} else if (fetchRepositoryCodeResponse.data.status === -4) {
+					// 异常 直接重试
+					this.fetchRepositoryCode(props, null, null, true)
+				} else{
 					this.setState({ isEditablePath, currentPath: path });
 					this.oldRepositoryCode = fetchRepositoryCodeResponse.data.content || '';
 					this.updateRepositoryCode(this.oldRepositoryCode, updateCodeMirror)

From db96b472116d2f1b73fd87d4b6810dd81c52931d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 16 Jul 2019 11:12:17 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/comment/Comments.js  | 1163 +++++++++--------
 .../courses/coursesPublic/ShixunModal.js      |   46 +-
 .../tpm/challengesnew/TPMchallengesnew.js     |    1 +
 .../modules/tpm/component/TPMRightSection.js  |    4 +-
 .../tpm/shixunchild/Challenges/Challenges.js  |    2 +-
 5 files changed, 614 insertions(+), 602 deletions(-)

diff --git a/public/react/src/modules/comment/Comments.js b/public/react/src/modules/comment/Comments.js
index ec7d6a5a8..c07bd5de2 100644
--- a/public/react/src/modules/comment/Comments.js
+++ b/public/react/src/modules/comment/Comments.js
@@ -1,579 +1,586 @@
-import React, { Component } from 'react';
-
-import Dialog, {
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-} from 'material-ui/Dialog';
-import Button from 'material-ui/Button';
-import Tooltip from 'material-ui/Tooltip';
-
-import Pagination from 'rc-pagination';
-import 'rc-pagination/assets/index.css';
-
-import { getImageUrl, toPath } from 'educoder';
-
-import Input, { InputLabel } from 'material-ui/Input';
-
-import { FormControl, FormHelperText } from 'material-ui/Form';
-
-import CommentItemKEEditor from './CommentItemKEEditor';
-import CommentItemMDEditor from './CommentItemMDEditor';
-
-import './Comment.css'
-import Modals from '../modals/Modals'
-
-/*
-	-------------------------- 样式相关
-	class 改成 className
-	style 需要传入json对象				style="margin:0px">  ->   style={{ margin:"0px" }}>
-	margin-top -> marginTop
-	onclick -> onClick         驼峰
-	
-	-------------------------- 模板语法相关
-	页面都在前端组装、渲染
-		rails模板的 if等逻辑改成js实现
-		客户端需要能判断 User.current.manager_of_shixun?(comment.dis_id)
-	
-	-------------------------- 现有ui控件的使用方式
-	方案1: 换成对应的react组件，然后再调用(控件简单时推荐)
-	方案2: 在react环境中使用若干jquery插件(控件复杂，又无react环境下的替代方案时考虑使用)
-	
-	-------------------------- 
-	需要服务端提供对应的rest api
-	
-
-*/
-
-const _origin = window.location.origin;
-
-
-/*
-	用到的props: 
-		user   user_url image_url
-		
-		loadingComments--
-		comment_count_without_reply	
-		currentPage
-		comments
-		
-		接口
-		deleteComment			删除
-		onPaginationChange    翻页变化
-		commentPraise			点赞
-		hiddenComment			隐藏
-		rewardCode				奖励
-
-*/
-class Comments extends Component {
-	constructor(props) {
-		super(props)
-
-		this.handleDialogClose = this.handleDialogClose.bind(this)
-		this.handleGoldRewardDialogClose = this.handleGoldRewardDialogClose.bind(this)
-
-		this.state = {
-			dialogOpen: false,
-			goldRewardDialogOpen: false,
-			goldRewardInput: '',
-
-			showReplyEditorFlag: false,	// false->true or true->false时切换editor显示或隐藏
-			currentReplyComment: null
-		}
-	}
-	componentWillUnmount() {
-		const $ = window.$;
-		$(document).off("onReply");
-	}
-	componentDidMount() {
-		setTimeout(()=>{
-			const $ = window.$;
-			// 绑定后会自动off？ 加timeout试试
-			$(document).on("onReply", (e, args)=>{
-				const { commentContent, id, editor } = args;
-
-				this.props.replyComment(commentContent, id, editor)
-			});
-		}, 1000)
-		
-	}
-	initReply(comment) {
-		this.props.initReply && this.props.initReply(comment)
-		// 如果配置的使用kindEditor
-		if (window.__useKindEditor === true) {
-			const { user } = this.props;
-			console.log('initReply ', comment)
-
-			const $ = window.$;
-			var id = comment.id
-			var reply_message_el = `#reply_message_${id}`
-			var reply_iconup_el = `#reply_iconup_${id}`
-			if($(reply_message_el).html() == "") {
-			    $(".reply_to_message").html("");
-			    $(reply_message_el).html(`<div className=\"orig_reply_box borderBottomNone reply_to_message\" id=\"reply_to_message_${id}\">\n      <div class=\"homepagePostReplyPortrait mr15 imageFuzzy fl\" id=\"reply_image_${id}\"><a href=\"${user.user_url}\" target=\"_blank\" alt=\"用户头像\"><img alt=\"0?1442652658\" height=\"33\" src=\"${_origin}/images/${user.image_url}\" width=\"33\" /><\/a><\/div>\n      <div class=\"orig_textarea fl\" style=\"margin-bottom: 0px\">\n        <div nhname=\'new_message_${id}\'>\n              <form accept-charset=\"UTF-8\" action=\"/discusses?challenge_id=118&amp;dis_id=61&amp;dis_type=Shixun\" data-remote=\"true\" id=\"new_comment_form\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input name=\"authenticity_token\" type=\"hidden\" value=\"HJTbMpfI8LKUpwghfkvgB2SaMmcIVyVdAezyKmzJ7FU=\" /><\/div>\n                  <input type=\"hidden\" id=\"dis_reply_id\" name=\"reply_id\" value=\"${id}\">\n                  <div nhname=\'toolbar_container_${id}\'><\/div>\n                  <textarea placeholder=\"有问题或有建议，请直接给我留言吧！\" id=\"comment_news_${id}\" style=\"display: none\" nhname=\'new_message_textarea_${id}\' name=\"content\"><\/textarea>\n                  <a id=\"new_message_submit_btn_${id}\" href=\"javascript:void(0)\" onclick=\"this.style.display=\'none\'\" class=\"mt10 task-btn task-btn-orange fr\">${this.props.buttonText || '发送'}<\/a>\n                  <div class=\"cl\"><\/div>\n                  <p nhname=\'contentmsg_${id}\'><\/p>\n<\/form>        <\/div>\n        <div class=\"cl\"><\/div>\n      <\/div>\n  <div class=\"cl\"><\/div>\n<\/div>\n`);	//" ide语法识别
-			    $(reply_iconup_el).show();
-			    $(function(){
-			        window.sd_create_editor_from_data(id ,null,"100%", "Discuss");
-			    });
-				
-			}else {
-				if ($(reply_message_el).is(':visible')) {
-					$(reply_message_el).hide();
-				} else {
-					$(reply_message_el).show();
-				}
-			    // $(reply_message_el).html("");
-			    
-			    // $(reply_iconup_el).hide();
-			}
-		} else {			// MD
-			this.setState({
-				currentReplyComment: comment,
-				showReplyEditorFlag: !this.state.showReplyEditorFlag
-			})		
-		}
-	}
-	// enableReplyTo
-	// onClick={() => this.replyTo(item.user_id)}
-	replyTo = (toUserId) => {
-
-	}
-	renderChildenComments(comment) {
-		if (!comment.children || comment.children.length === 0) {
-			return ''
-		}
-		const { user } = this.props;
-		let childCommentsElement = comment.children.map((item, index) =>{
-			let _content = this.parseCommentContent(item.content);
-
-			return (
-				<div key={index} className="childComment" >
-				<div className="J_Comment_Info clearfix mt3">
-					<div className="t_info fl">
-						<a href={`${_origin}/users/${item.user_login}`} className="content-username hide fl">
-							{item.username}
-						</a>
-						<span className="t_area fl">{item.time}</span>
-						{/* { item.position ? <span className="fl color-light-green font-14 ml15">[第{item.position}关]</span> : ""} */}
-						{	
-							item.reward ?
-							<Tooltip title={ `已奖励金币${item.reward}` } disableFocusListener={true}>
-								<a href="javascript:void(0);" style={{ marginLeft: '20px', cursor: 'default'}}
-									className={`rewarded color-grey-8 font-12 fl ${ item.admin === true ? '': 'normalUser'}`}
-								>
-									<i className="iconfont icon-gift mr5 color-orange fl" style={{display: 'inline'}}></i><span className="fl">{item.reward}</span>
-								</a>
-							</Tooltip> : ''
-						}
-					</div>
-
-					<p className="fr  orig_reply lineh-20">
-							<span id="hidden_discuss_btn_952">
-							</span>
-
-							{this.props.showRewardButton != false && comment.admin === true ? 
-								<a href="javascript:void(0);" className="color-grey-8" onClick={() => this.showGoldRewardDialog(comment, item) }>
-									<Tooltip title={ "给TA奖励金币" } disableFocusListener={true}>
-										<i className="iconfont icon-jiangli fl"></i>
-									</Tooltip>
-								</a>
-							:""}
-
-							{/*子回复还没hidden字段*/}
-							{false && comment.admin === true ? 
-									<Tooltip title={ item.hidden ? "取消隐藏" : "隐藏评论" }>
-									<a href="javascript:void(0);" className="color-grey-8" onClick={() => this.onCommentBtnClick(comment, item, item.hidden ? 'hiddenCancel' : 'hidden') }>
-										<i className={`fa ${item.hidden ? 'fa-eye' : 'fa-eye-slash'} mr5`}></i>
-									</a>
-									</Tooltip>
-							:""}
-
-							{/* 新版user_id不准，获取方式不对 */}
-							{ comment.admin === true || item.can_delete || item.user_id === user.user_id || item.user_login == user.login ? 
-								<a href="javascript:void(0);" className="color-grey-8" id="delete_reply_118_952" onClick={() => this.onCommentBtnClick(comment, item, 'delete') }>
-									<Tooltip title={ "删除" } disableFocusListener={true}>
-										<i className="iconfont icon-shanchu mr5"></i>
-									</Tooltip>
-								</a>
-              : ''}
-
-                    {/*
-                        <span className="ml5 mr5 color-grey-8">|</span>
-
-                    	<span className="reply_praise_count_952">
-                            <a href="/praise_tread/praise_plus?obj_id=952&amp;obj_type=Discuss&amp;type=reply&amp;user_activity_id=952" data-remote="true" className="fr mr5 color-grey-8" data-tip-down="点赞">
-      							<i className="fa fa-thumbs-up mr5"></i>赞
-    							
-      							<span className="ml5 fr"></span>
-								</a>
-
-                    	</span>*/}
-                  	</p>
-
-					{/* currentUser.id == item.creator_user.id && (
-						<p className="fr mr10 orig_repll">
-							<span id={`hidden_discuss_btn_${item.id}`}>
-								<a href="javascript:void(0);" className="color-grey-8" onClick={ this.onCommentBtnClick(comment, item, 'delete') } >
-									<i className="far fa-trash-alt mr5"></i>删除
-								</a>
-                    			<span className="ml5 mr5 color-grey-8">|</span>
-							</span>
-						</p>
-					)*/}
-				</div>
-
-					<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
-						<div className="color-grey-3" id={`reply_content_${item.id}`}>
-							<div className={"break_word_comments markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
-							<div className="cl"></div>
-						</div>
-					</div>
-				</div>
-
-				)
-		})
-		return childCommentsElement
-	}
-	parseCommentContent = (oldContent) => {
-		if (oldContent && oldContent.startsWith('<') && oldContent.endsWith('>')) {
-		} else if (window.$('#md_div').length) {	// 有这个临时处理md内容的dom
-			window.$('#md_div').html('')
-			// markdown to html
-			try {	
-				var markdwonParser = window.editormd.markdownToHTML("md_div", {
-						markdown: oldContent,
-						emoji: true,
-										htmlDecode: "style,script,iframe",  // you can filter tags decode
-										taskList: true,
-										tex: true,  // 默认不解析
-										flowChart: true,  // 默认不解析
-										sequenceDiagram: true // 默认不解析
-						});
-				oldContent = window.$('#md_div').html()
-			} catch (e) {
-				// TODO 可能公式parse时报错了
-				console.error(e)
-			}
-		}
-		return oldContent;
-	}
-	renderComments() {
-		let { comments, currentUser, deleteComment, commentPraise, hiddenComment, user } = this.props;
-		const { showReplyEditorFlag, currentReplyComment } = this.state;
-		if (!comments || comments.length === 0) {
-			return;
-		}
-		// "https://www.educoder.net/users/m02945638"
-		let commentsElement = comments.map((item, index) => {
-			let _content
-		
-			_content = this.parseCommentContent(item.content);
-			
-			return (
-				<div className="comment_item_cont df clearfix" key={index}>
-					<div className="J_Comment_Face fl">
-						<a href={`${_origin}/users/${item.user_login}`} target="_blank">
-							<img alt="用户头像" height="50" src={getImageUrl(`images/${item.image_url}`)} width="50"/>
-						</a>
-					</div>
-
-					<div className="t_content fl">
-						<div className="J_Comment_Reply">
-							<div className="comment_orig_content" style={{ margin:"0px" }}>
-								
-
-								<div className="J_Comment_Info clearfix mt3">
-									<div className="t_info fl">
-										<a href={`${_origin}/users/${item.user_login}`} className="content-username hide fl">
-											{item.username}
-										</a>
-										<span className="t_area fl">{item.time}</span>
-										{ item.position && <span className="fl color-light-green font-14 ml15">[第{item.position}关]</span> }
-										{ item.game_url ? 
-											<Tooltip title={ `点击查看TA的代码页面` } disableFocusListener={true}>
-												<a href={item.game_url} target="_blank" className="fl font-14 ml15"
-														style={{ color: "#4CACFF", cursor: "pointer" }}
-												>查看</a>
-											</Tooltip> : ""}
-
-										{	
-											item.reward ?
-											<Tooltip title={ `已奖励金币${item.reward}` } disableFocusListener={true}>
-												<a href="javascript:void(0);" style={{ marginLeft: '20px', cursor: 'default'}}
-														className={`rewarded color-grey-8 font-12 fl ${ item.admin === true ? '': 'normalUser'}`}
-												>
-													<i className="iconfont icon-gift mr5 color-orange fl"></i><span className="fl">{item.reward}</span>
-												</a>
-											</Tooltip> : ''
-										}
-									</div>
-
-									{/* currentUser.id == item.creator_user.id && (
-										<p className="fr mr10 orig_repll">
-											<span id={`hidden_discuss_btn_${item.id}`}>
-												<a href="javascript:void(0);" className="color-grey-8" onClick={ deleteComment.bind(this, item, index) } >
-													<i className="far fa-trash-alt mr5"></i>删除
-												</a>
-	                                			<span className="ml5 mr5 color-grey-8">|</span>
-											</span>
-										</p>
-									)*/}
-								</div>
-
-								<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
-									<div className="color-grey-3" id={`reply_content_${item.id}`}>
-										{/* 改成后端返回了的，都是要显示的，不管hidden的值是true还是false */}
-
-										{/* { item.hidden && ((this.props.onlySuperAdminCouldHide && !item.isSuperAdmin) 
-												|| !this.props.onlySuperAdminCouldHide && item.admin === false && (item.manager === false || item.manager == undefined))
-											? <p className="color-orange font-16">违规评论已被屏蔽！</p>
-											:  */}
-											<div  className={"break_word_comments  markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
-										{/* } */}
-										<div className="cl"></div>
-									</div>
-								</div>
-								<div className="childrenCommentsView">
-									{(item && item.children && item.children.length) ? <div className="trangle"></div>: ''}
-									{this.renderChildenComments(item)}
-									{ item.isAllChildrenLoaded != true && item.children && this.props.isChildCommentPagination == true && item.child_message_count > 5? 
-										<Tooltip title={ "点击查看更多回复" } disableFocusListener={true}>
-											<div className="loadMoreChildComments" onClick={() => {this.props.loadMoreChildComments && this.props.loadMoreChildComments(item)}}>
-												<i className="iconfont icon-xiajiantou"></i>
-											</div>
-										</Tooltip>
-									: ''}
-								</div>
-								{/*mr10 */}
-								<p className="fr orig_reply">
-										<span id="hidden_discuss_btn_952">
-										</span>
-
-										{/* && !item.reward  */}
-										{this.props.showRewardButton != false && item.admin === true ? 
-											<a href="javascript:void(0);" className="color-grey-8 fl mt2" onClick={() => this.showGoldRewardDialog(item) }>
-												<Tooltip title={ "给TA奖励金币" } disableFocusListener={true}>
-													<i className="iconfont icon-jiangli mr5 fl"></i>
-												</Tooltip>
-											</a>
-										:""}
-
-										{ (this.props.onlySuperAdminCouldHide && item.isSuperAdmin || !this.props.onlySuperAdminCouldHide && item.admin === true) ? 
-										<Tooltip title={ item.hidden ? "取消隐藏" : "隐藏评论" } disableFocusListener={true}>
-										<a href="javascript:void(0);" className="color-grey-8 fl mt1" onClick={() => this.onCommentBtnClick(item, '', item.hidden ? 'hiddenCancel' : 'hidden') }>
-											<i className={` ${item.hidden ? 'iconfont icon-yincangbiyan' : 'fa fa-eye'} mr5`}></i>
-										</a>
-										</Tooltip>
-										:""}
-
-	                                
-	                                
-										{ item.admin && ( !item.children || item.children.length === 0 )? 
-	                    	<a href="javascript:void(0);" className="color-grey-8" onClick={() => this.onCommentBtnClick(item, '', 'delete') }>
-													<Tooltip title={ "删除" } disableFocusListener={true}>
-														<i className="iconfont icon-shanchu mr5"></i>
-													</Tooltip>
-												</a>	: '' }
-
-	                                {/* <span className="ml5 mr5 color-grey-8">|</span>*/}
-	                                
-										<a href={`javascript:void(0)`} className="color-grey-8"
-												onClick={() => this.initReply(item) } >
-											<Tooltip title={ "回复" }>
-												<i className="iconfont icon-huifu1 mr5"></i>
-											</Tooltip>
-										</a>
-	                              	
-
-										{/* <span className="ml5 mr5 color-grey-8">|</span>*/}
-										<span className="reply_praise_count_952">
-											<Tooltip title={ item.user_praise ? "取消点赞" : "点赞" }>
-												<a href={`javascript:void(0)`} className={`fr mr5  ${item.user_praise ? 'color-orange03' : 'color-grey-8'}`} onClick={()=>commentPraise(item.id)}>
-														<i className={ item.user_praise ? "iconfont icon-dianzan mr3" : "iconfont icon-dianzan-xian mr3" }></i>
-													
-														<span className="fr font-14" style={{ marginTop: '1px'}}>{item.praise_count?item.praise_count:''}</span>
-												</a>
-												</Tooltip>
-										</span>
-	              </p>
-								{ window.__useKindEditor ? <CommentItemKEEditor showReplyEditorFlag={showReplyEditorFlag} 
-		                          	currentReplyComment={currentReplyComment}
-		                          	item={item}
-		                          	user={user}
-		                          >
-		                          </CommentItemKEEditor>
-		                          :
-		                          <CommentItemMDEditor showReplyEditorFlag={showReplyEditorFlag} 
-		                          	currentReplyComment={currentReplyComment}
-		                          	item={item}
-		                          	user={user}
-									buttonText={this.props.buttonText}
-		                          >
-		                          </CommentItemMDEditor>
-		                      }
-		                          {/* <div id={`reply_message_${item.id}`} className="reply_to_message"></div> */}
-		                        
-							</div>
-						</div>
-					</div>
-				</div>
-			)
-		})
-		/*
-			/users/reply_to?reply_id=${item.id}&amp;type=Challenge&amp;user_activity_id=118
-		*/
-		/*	
-			onclick="delete_confirm_box_2('<%= discuss_path(comment, :challenge_id => @game_challenge) %>', '确定要删除该条回复吗？')"
-			delete按钮
-			id=`delete_reply_<%=@game_challenge.id %>_<%=comment.id %>`
-
-		*/
-		return commentsElement;
-	}
-
-	onCommentBtnClick(comment, childComment, dialogType) {
-		this.comment = comment;
-		this.childComment = childComment;
-		this.setState({dialogOpen: true, dialogType: dialogType})
-	}
-	handleDialogClose() {
-		this.setState({
-			dialogOpen: false
-		})
-	}
-	onDialogOkBtnClick = () => {
-
-		const { deleteComment, hiddenComment } = this.props;
-		const { dialogType } = this.state;
-		if (dialogType === 'delete') {
-			deleteComment(this.comment, this.childComment ? this.childComment.id : '')
-		} else if (dialogType === 'hidden' || dialogType === 'hiddenCancel' ) {
-			hiddenComment(this.comment, this.childComment ? this.childComment.id : '')
-		}
-
-		this.setState({dialogOpen: false})
-	}
-
-	showGoldRewardDialog(comment, childComment) {
-		if (comment.admin === true) {
-			this.comment = comment;
-			this.childComment = childComment;
-			this.setState({goldRewardDialogOpen: true})
-		}
-	}
-	handleGoldRewardDialogClose() {
-		this.setState({
-			goldRewardDialogOpen: false
-		})
-	}
-	onGoldRewardDialogOkBtnClick() {
-		console.log('onGoldRewardDialogOkBtnClick')
-		const { goldRewardInput } = this.state;
-		if (!goldRewardInput || goldRewardInput === '0' || goldRewardInput.indexOf('-') !== -1) {
-			this.setState({ goldRewardInputError: true})
-			return;
-		} else {
-			this.setState({goldRewardDialogOpen: false})
-			this.props.rewardCode(this.comment, this.childComment, goldRewardInput)
-		}
-	}
-	onGoldRewardInputChange(event) {
-		 this.setState({ goldRewardInput: event.target.value, goldRewardInputError: false });
-	}
-	render() {
-		const { deleteComment, onPaginationChange, comment_count_without_reply, currentPage, comments, usingAntdModal } = this.props;
-		const { dialogOpen, goldRewardDialogOpen, dialogType, goldRewardInputError } = this.state;
-
-		const goldRewardInputErrorObj = goldRewardInputError ? {'error': 'error'} : {}
-
-		return (
-			<div className="fit -scroll" style={{ 'overflow-x': 'hidden'}}>
-				
-						
-						{ usingAntdModal ? <Modals
-                modalsType={dialogOpen}
-                modalsTopval={
-									dialogType === 'delete' ? '确定要删除该条回复吗？'
-										: dialogType === 'hidden' ? '确定要隐藏该条回复吗？' 
-										: dialogType === 'hiddenCancel' ? '确定要取消隐藏该条回复吗？' : ''
-								}
-                modalsBottomval={""}
-                modalCancel={this.handleDialogClose}
-                modalSave={this.onDialogOkBtnClick}
-						>
-						</Modals> : 
-						<Dialog
-		          	open={dialogOpen}
-		          	onClose={this.handleDialogClose}
-		        >	
-			       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
-		          	<DialogContent>
-			            <DialogContentText id="alert-dialog-description" style={{textAlign: 'center'}}>
-			            	{
-			            		dialogType === 'delete' ? '确定要删除该条回复吗？'
-			            			: dialogType === 'hidden' ? '确定要隐藏该条回复吗？' 
-			            				: dialogType === 'hiddenCancel' ? '确定要取消隐藏该条回复吗？' : ''
-			            	}
-			            </DialogContentText>
-		          	</DialogContent>
-		          	<DialogActions>
-			            <Button onClick={this.handleDialogClose} color="primary">
-			              取消
-			            </Button>
-			            <Button variant="raised" 	
-			            	onClick={() => this.onDialogOkBtnClick() } color="primary" autoFocus>
-			              确定
-			            </Button>
-		          	</DialogActions>
-							</Dialog> 
-						}
-
-		        <Dialog
-		          	open={goldRewardDialogOpen}
-		          	onClose={this.handleGoldRewardDialogClose}
-		        >	
-			       	<DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle>
-		          	<DialogContent>
-			            
-			            	<FormControl { ...goldRewardInputErrorObj } aria-describedby="name-error-text">
-					          	<InputLabel htmlFor="goldReward">请输入奖励的金币数量</InputLabel>
-					          	<Input id="goldReward"  type="number" value={this.state.goldRewardInput} onChange={(e) => this.onGoldRewardInputChange(e)} />
-					          	{ goldRewardInputError ? <FormHelperText id="name-error-text">奖励金币不能为空或负数</FormHelperText> : ''}
-					        </FormControl>
-
-				        {/*<DialogContentText id="alert-dialog-description" style={{textAlign: 'center'}}>    </DialogContentText>*/}
-		          	</DialogContent>
-		          	<DialogActions>
-			            <Button onClick={this.handleGoldRewardDialogClose} color="primary">
-			              取消
-			            </Button>
-			            <Button variant="raised" 	
-			            	onClick={() => this.onGoldRewardDialogOkBtnClick() } color="primary" autoFocus>
-			              确定
-			            </Button>
-		          	</DialogActions>
-		        </Dialog>
-
-
-				<div className="-layout-v -fit">
-					<div className="panel-comment_item" >
-
-						{this.renderComments()}	
-
-					</div>
-					{ (comment_count_without_reply > 10 ) ? 
-						<div className="paginationSection">
-							<Pagination showQuickJumper onChange={onPaginationChange} current={currentPage} total={comment_count_without_reply} />
-						</div>
-						: '' }
-					{ (comment_count_without_reply == 0) ? <div className="noCommentTitle">暂时还没有评论，快来show出你的idea吧！</div>
-						: '' }
-				</div>
-				
-			</div>
-		)
-	}
-}
-
+import React, { Component } from 'react';
+
+import Dialog, {
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+} from 'material-ui/Dialog';
+import Button from 'material-ui/Button';
+import Tooltip from 'material-ui/Tooltip';
+
+import Pagination from 'rc-pagination';
+import 'rc-pagination/assets/index.css';
+
+import { getImageUrl, toPath } from 'educoder';
+
+import Input, { InputLabel } from 'material-ui/Input';
+
+import { FormControl, FormHelperText } from 'material-ui/Form';
+
+import CommentItemKEEditor from './CommentItemKEEditor';
+import CommentItemMDEditor from './CommentItemMDEditor';
+
+import './Comment.css'
+import Modals from '../modals/Modals'
+
+/*
+	-------------------------- 样式相关
+	class 改成 className
+	style 需要传入json对象				style="margin:0px">  ->   style={{ margin:"0px" }}>
+	margin-top -> marginTop
+	onclick -> onClick         驼峰
+	
+	-------------------------- 模板语法相关
+	页面都在前端组装、渲染
+		rails模板的 if等逻辑改成js实现
+		客户端需要能判断 User.current.manager_of_shixun?(comment.dis_id)
+	
+	-------------------------- 现有ui控件的使用方式
+	方案1: 换成对应的react组件，然后再调用(控件简单时推荐)
+	方案2: 在react环境中使用若干jquery插件(控件复杂，又无react环境下的替代方案时考虑使用)
+	
+	-------------------------- 
+	需要服务端提供对应的rest api
+	
+
+*/
+
+const _origin = window.location.origin;
+
+
+/*
+	用到的props: 
+		user   user_url image_url
+		
+		loadingComments--
+		comment_count_without_reply	
+		currentPage
+		comments
+		
+		接口
+		deleteComment			删除
+		onPaginationChange    翻页变化
+		commentPraise			点赞
+		hiddenComment			隐藏
+		rewardCode				奖励
+
+*/
+class Comments extends Component {
+	constructor(props) {
+		super(props)
+
+		this.handleDialogClose = this.handleDialogClose.bind(this)
+		this.handleGoldRewardDialogClose = this.handleGoldRewardDialogClose.bind(this)
+
+		this.state = {
+			dialogOpen: false,
+			goldRewardDialogOpen: false,
+			goldRewardInput: '',
+
+			showReplyEditorFlag: false,	// false->true or true->false时切换editor显示或隐藏
+			currentReplyComment: null
+		}
+	}
+	componentWillUnmount() {
+		const $ = window.$;
+		$(document).off("onReply");
+	}
+	componentDidMount() {
+		setTimeout(()=>{
+			const $ = window.$;
+			// 绑定后会自动off？ 加timeout试试
+			$(document).on("onReply", (e, args)=>{
+				const { commentContent, id, editor } = args;
+
+				this.props.replyComment(commentContent, id, editor)
+			});
+		}, 1000)
+		
+	}
+	initReply(comment) {
+		this.props.initReply && this.props.initReply(comment)
+		// 如果配置的使用kindEditor
+		if (window.__useKindEditor === true) {
+			const { user } = this.props;
+			console.log('initReply ', comment)
+
+			const $ = window.$;
+			var id = comment.id
+			var reply_message_el = `#reply_message_${id}`
+			var reply_iconup_el = `#reply_iconup_${id}`
+			if($(reply_message_el).html() == "") {
+			    $(".reply_to_message").html("");
+			    $(reply_message_el).html(`<div className=\"orig_reply_box borderBottomNone reply_to_message\" id=\"reply_to_message_${id}\">\n      <div class=\"homepagePostReplyPortrait mr15 imageFuzzy fl\" id=\"reply_image_${id}\"><a href=\"${user.user_url}\" target=\"_blank\" alt=\"用户头像\"><img alt=\"0?1442652658\" height=\"33\" src=\"${_origin}/images/${user.image_url}\" width=\"33\" /><\/a><\/div>\n      <div class=\"orig_textarea fl\" style=\"margin-bottom: 0px\">\n        <div nhname=\'new_message_${id}\'>\n              <form accept-charset=\"UTF-8\" action=\"/discusses?challenge_id=118&amp;dis_id=61&amp;dis_type=Shixun\" data-remote=\"true\" id=\"new_comment_form\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input name=\"authenticity_token\" type=\"hidden\" value=\"HJTbMpfI8LKUpwghfkvgB2SaMmcIVyVdAezyKmzJ7FU=\" /><\/div>\n                  <input type=\"hidden\" id=\"dis_reply_id\" name=\"reply_id\" value=\"${id}\">\n                  <div nhname=\'toolbar_container_${id}\'><\/div>\n                  <textarea placeholder=\"有问题或有建议，请直接给我留言吧！\" id=\"comment_news_${id}\" style=\"display: none\" nhname=\'new_message_textarea_${id}\' name=\"content\"><\/textarea>\n                  <a id=\"new_message_submit_btn_${id}\" href=\"javascript:void(0)\" onclick=\"this.style.display=\'none\'\" class=\"mt10 task-btn task-btn-orange fr\">${this.props.buttonText || '发送'}<\/a>\n                  <div class=\"cl\"><\/div>\n                  <p nhname=\'contentmsg_${id}\'><\/p>\n<\/form>        <\/div>\n        <div class=\"cl\"><\/div>\n      <\/div>\n  <div class=\"cl\"><\/div>\n<\/div>\n`);	//" ide语法识别
+			    $(reply_iconup_el).show();
+			    $(function(){
+			        window.sd_create_editor_from_data(id ,null,"100%", "Discuss");
+			    });
+				
+			}else {
+				if ($(reply_message_el).is(':visible')) {
+					$(reply_message_el).hide();
+				} else {
+					$(reply_message_el).show();
+				}
+			    // $(reply_message_el).html("");
+			    
+			    // $(reply_iconup_el).hide();
+			}
+		} else {			// MD
+			this.setState({
+				currentReplyComment: comment,
+				showReplyEditorFlag: !this.state.showReplyEditorFlag
+			})		
+		}
+	}
+	// enableReplyTo
+	// onClick={() => this.replyTo(item.user_id)}
+	replyTo = (toUserId) => {
+
+	}
+	renderChildenComments(comment) {
+		if (!comment.children || comment.children.length === 0) {
+			return ''
+		}
+		const { user } = this.props;
+		let childCommentsElement = comment.children.map((item, index) =>{
+			let _content = this.parseCommentContent(item.content);
+
+			return (
+				<div key={index} className="childComment" >
+				<div className="J_Comment_Info clearfix mt3">
+					<div className="t_info fl">
+						<a href={`${_origin}/users/${item.user_login}`} className="content-username hide fl">
+							{item.username}
+						</a>
+						<span className="t_area fl">{item.time}</span>
+						{/* { item.position ? <span className="fl color-light-green font-14 ml15">[第{item.position}关]</span> : ""} */}
+						{	
+							item.reward ?
+							<Tooltip title={ `已奖励金币${item.reward}` } disableFocusListener={true}>
+								<a href="javascript:void(0);" style={{ marginLeft: '20px', cursor: 'default'}}
+									className={`rewarded color-grey-8 font-12 fl ${ item.admin === true ? '': 'normalUser'}`}
+								>
+									<i className="iconfont icon-gift mr5 color-orange fl" style={{display: 'inline'}}></i><span className="fl">{item.reward}</span>
+								</a>
+							</Tooltip> : ''
+						}
+					</div>
+
+					<p className="fr  orig_reply lineh-20">
+							<span id="hidden_discuss_btn_952">
+							</span>
+
+							{this.props.showRewardButton != false && comment.admin === true ? 
+								<a href="javascript:void(0);" className="color-grey-8" onClick={() => this.showGoldRewardDialog(comment, item) }>
+									<Tooltip title={ "给TA奖励金币" } disableFocusListener={true}>
+										<i className="iconfont icon-jiangli fl"></i>
+									</Tooltip>
+								</a>
+							:""}
+
+							{/*子回复还没hidden字段*/}
+							{false && comment.admin === true ? 
+									<Tooltip title={ item.hidden ? "取消隐藏" : "隐藏评论" }>
+									<a href="javascript:void(0);" className="color-grey-8" onClick={() => this.onCommentBtnClick(comment, item, item.hidden ? 'hiddenCancel' : 'hidden') }>
+										<i className={`fa ${item.hidden ? 'fa-eye' : 'fa-eye-slash'} mr5`}></i>
+									</a>
+									</Tooltip>
+							:""}
+
+							{/* 新版user_id不准，获取方式不对 */}
+							{ comment.admin === true || item.can_delete || item.user_id === user.user_id || item.user_login == user.login ? 
+								<a href="javascript:void(0);" className="color-grey-8" id="delete_reply_118_952" onClick={() => this.onCommentBtnClick(comment, item, 'delete') }>
+									<Tooltip title={ "删除" } disableFocusListener={true}>
+										<i className="iconfont icon-shanchu mr5"></i>
+									</Tooltip>
+								</a>
+              : ''}
+
+                    {/*
+                        <span className="ml5 mr5 color-grey-8">|</span>
+
+                    	<span className="reply_praise_count_952">
+                            <a href="/praise_tread/praise_plus?obj_id=952&amp;obj_type=Discuss&amp;type=reply&amp;user_activity_id=952" data-remote="true" className="fr mr5 color-grey-8" data-tip-down="点赞">
+      							<i className="fa fa-thumbs-up mr5"></i>赞
+    							
+      							<span className="ml5 fr"></span>
+								</a>
+
+                    	</span>*/}
+                  	</p>
+
+					{/* currentUser.id == item.creator_user.id && (
+						<p className="fr mr10 orig_repll">
+							<span id={`hidden_discuss_btn_${item.id}`}>
+								<a href="javascript:void(0);" className="color-grey-8" onClick={ this.onCommentBtnClick(comment, item, 'delete') } >
+									<i className="far fa-trash-alt mr5"></i>删除
+								</a>
+                    			<span className="ml5 mr5 color-grey-8">|</span>
+							</span>
+						</p>
+					)*/}
+				</div>
+
+					<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
+						<div className="color-grey-3" id={`reply_content_${item.id}`}>
+							<div className={"break_word_comments markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
+							<div className="cl"></div>
+						</div>
+					</div>
+				</div>
+
+				)
+		})
+		return childCommentsElement
+	}
+	parseCommentContent = (oldContent) => {
+		if (oldContent && oldContent.startsWith('<') && oldContent.endsWith('>')) {
+		} else if (window.$('#md_div').length) {	// 有这个临时处理md内容的dom
+			window.$('#md_div').html('')
+			// markdown to html
+			try {	
+				var markdwonParser = window.editormd.markdownToHTML("md_div", {
+						markdown: oldContent,
+						emoji: true,
+										htmlDecode: "style,script,iframe",  // you can filter tags decode
+										taskList: true,
+										tex: true,  // 默认不解析
+										flowChart: true,  // 默认不解析
+										sequenceDiagram: true // 默认不解析
+						});
+				oldContent = window.$('#md_div').html()
+			} catch (e) {
+				// TODO 可能公式parse时报错了
+				console.error(e)
+			}
+		}
+		return oldContent;
+	}
+	renderComments() {
+		let { comments, currentUser, deleteComment, commentPraise, hiddenComment, user } = this.props;
+		const { showReplyEditorFlag, currentReplyComment } = this.state;
+		if (!comments || comments.length === 0) {
+			return;
+		}
+		// "https://www.educoder.net/users/m02945638"
+		let commentsElement = comments.map((item, index) => {
+			let _content
+		
+			_content = this.parseCommentContent(item.content);
+			
+			return (
+				<div className="comment_item_cont df clearfix" key={index}>
+					<div className="J_Comment_Face fl">
+						<a href={`${_origin}/users/${item.user_login}`} target="_blank">
+							<img alt="用户头像" height="50" src={getImageUrl(`images/${item.image_url}`)} width="50"/>
+						</a>
+					</div>
+
+					<div className="t_content fl">
+						<div className="J_Comment_Reply">
+							<div className="comment_orig_content" style={{ margin:"0px" }}>
+								
+
+								<div className="J_Comment_Info clearfix mt3">
+									<div className="t_info fl">
+										<a href={`${_origin}/users/${item.user_login}`} className="content-username hide fl">
+											{item.username}
+										</a>
+										<span className="t_area fl">{item.time}</span>
+										{ item.position && <span className="fl color-light-green font-14 ml15">[第{item.position}关]</span> }
+										{ item.game_url ? 
+											<Tooltip title={ `点击查看TA的代码页面` } disableFocusListener={true}>
+												<a href={item.game_url} target="_blank" className="fl font-14 ml15"
+														style={{ color: "#4CACFF", cursor: "pointer" }}
+												>查看</a>
+											</Tooltip> : ""}
+
+										{	
+											item.reward ?
+											<Tooltip title={ `已奖励金币${item.reward}` } disableFocusListener={true}>
+												<a href="javascript:void(0);" style={{ marginLeft: '20px', cursor: 'default'}}
+														className={`rewarded color-grey-8 font-12 fl ${ item.admin === true ? '': 'normalUser'}`}
+												>
+													<i className="iconfont icon-gift mr5 color-orange fl"></i><span className="fl">{item.reward}</span>
+												</a>
+											</Tooltip> : ''
+										}
+									</div>
+
+									{/* currentUser.id == item.creator_user.id && (
+										<p className="fr mr10 orig_repll">
+											<span id={`hidden_discuss_btn_${item.id}`}>
+												<a href="javascript:void(0);" className="color-grey-8" onClick={ deleteComment.bind(this, item, index) } >
+													<i className="far fa-trash-alt mr5"></i>删除
+												</a>
+	                                			<span className="ml5 mr5 color-grey-8">|</span>
+											</span>
+										</p>
+									)*/}
+								</div>
+
+								<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
+									<div className="color-grey-3" id={`reply_content_${item.id}`}>
+										{/* 改成后端返回了的，都是要显示的，不管hidden的值是true还是false */}
+
+										{/* { item.hidden && ((this.props.onlySuperAdminCouldHide && !item.isSuperAdmin) 
+												|| !this.props.onlySuperAdminCouldHide && item.admin === false && (item.manager === false || item.manager == undefined))
+											? <p className="color-orange font-16">违规评论已被屏蔽！</p>
+											:  */}
+											<div  className={"break_word_comments  markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
+										{/* } */}
+										<div className="cl"></div>
+									</div>
+								</div>
+								<div className="childrenCommentsView">
+									{(item && item.children && item.children.length) ? <div className="trangle"></div>: ''}
+									{this.renderChildenComments(item)}
+									{ item.isAllChildrenLoaded != true && item.children && this.props.isChildCommentPagination == true && item.child_message_count > 5? 
+										<Tooltip title={ "点击查看更多回复" } disableFocusListener={true}>
+											<div className="loadMoreChildComments" onClick={() => {this.props.loadMoreChildComments && this.props.loadMoreChildComments(item)}}>
+												<i className="iconfont icon-xiajiantou"></i>
+											</div>
+										</Tooltip>
+									: ''}
+								</div>
+								{/*mr10 */}
+								<p className="fr orig_reply">
+										<span id="hidden_discuss_btn_952">
+										</span>
+
+										{/* && !item.reward  */}
+										{this.props.showRewardButton != false && item.admin === true ? 
+											<a href="javascript:void(0);" className="color-grey-8 fl mt2" onClick={() => this.showGoldRewardDialog(item) }>
+												<Tooltip title={ "给TA奖励金币" } disableFocusListener={true}>
+													<i className="iconfont icon-jiangli mr5 fl"></i>
+												</Tooltip>
+											</a>
+										:""}
+
+										{ (this.props.onlySuperAdminCouldHide && item.isSuperAdmin || !this.props.onlySuperAdminCouldHide && item.admin === true) ? 
+										<Tooltip title={ item.hidden ? "取消隐藏" : "隐藏评论" } disableFocusListener={true}>
+										<a href="javascript:void(0);" className="color-grey-8 fl mt1" onClick={() => this.onCommentBtnClick(item, '', item.hidden ? 'hiddenCancel' : 'hidden') }>
+											<i className={` ${item.hidden ? 'iconfont icon-yincangbiyan' : 'fa fa-eye'} mr5`}></i>
+										</a>
+										</Tooltip>
+										:""}
+
+	                                
+	                                
+										{ item.admin && ( !item.children || item.children.length === 0 )? 
+	                    	<a href="javascript:void(0);" className="color-grey-8" onClick={() => this.onCommentBtnClick(item, '', 'delete') }>
+													<Tooltip title={ "删除" } disableFocusListener={true}>
+														<i className="iconfont icon-shanchu mr5"></i>
+													</Tooltip>
+												</a>	: '' }
+
+	                                {/* <span className="ml5 mr5 color-grey-8">|</span>*/}
+	                                
+										<a href={`javascript:void(0)`} className="color-grey-8"
+												onClick={() => this.initReply(item) } >
+											<Tooltip title={ "回复" }>
+												<i className="iconfont icon-huifu1 mr5"></i>
+											</Tooltip>
+										</a>
+	                              	
+
+										{/* <span className="ml5 mr5 color-grey-8">|</span>*/}
+										<span className="reply_praise_count_952">
+											<Tooltip title={ item.user_praise ? "取消点赞" : "点赞" }>
+												<a href={`javascript:void(0)`} className={`fr mr5  ${item.user_praise ? 'color-orange03' : 'color-grey-8'}`} onClick={()=>commentPraise(item.id)}>
+														<i className={ item.user_praise ? "iconfont icon-dianzan mr3" : "iconfont icon-dianzan-xian mr3" }></i>
+													
+														<span className="fr font-14" style={{ marginTop: '1px'}}>{item.praise_count?item.praise_count:''}</span>
+												</a>
+												</Tooltip>
+										</span>
+	              </p>
+								{ window.__useKindEditor ? <CommentItemKEEditor showReplyEditorFlag={showReplyEditorFlag} 
+		                          	currentReplyComment={currentReplyComment}
+		                          	item={item}
+		                          	user={user}
+		                          >
+		                          </CommentItemKEEditor>
+		                          :
+		                          <CommentItemMDEditor showReplyEditorFlag={showReplyEditorFlag} 
+		                          	currentReplyComment={currentReplyComment}
+		                          	item={item}
+		                          	user={user}
+									buttonText={this.props.buttonText}
+		                          >
+		                          </CommentItemMDEditor>
+		                      }
+		                          {/* <div id={`reply_message_${item.id}`} className="reply_to_message"></div> */}
+		                        
+							</div>
+						</div>
+					</div>
+				</div>
+			)
+		})
+		/*
+			/users/reply_to?reply_id=${item.id}&amp;type=Challenge&amp;user_activity_id=118
+		*/
+		/*	
+			onclick="delete_confirm_box_2('<%= discuss_path(comment, :challenge_id => @game_challenge) %>', '确定要删除该条回复吗？')"
+			delete按钮
+			id=`delete_reply_<%=@game_challenge.id %>_<%=comment.id %>`
+
+		*/
+		return commentsElement;
+	}
+
+	onCommentBtnClick(comment, childComment, dialogType) {
+		this.comment = comment;
+		this.childComment = childComment;
+		this.setState({dialogOpen: true, dialogType: dialogType})
+	}
+	handleDialogClose() {
+		this.setState({
+			dialogOpen: false
+		})
+	}
+	onDialogOkBtnClick = () => {
+
+		const { deleteComment, hiddenComment } = this.props;
+		const { dialogType } = this.state;
+		if (dialogType === 'delete') {
+			deleteComment(this.comment, this.childComment ? this.childComment.id : '')
+		} else if (dialogType === 'hidden' || dialogType === 'hiddenCancel' ) {
+			hiddenComment(this.comment, this.childComment ? this.childComment.id : '')
+		}
+
+		this.setState({dialogOpen: false})
+	}
+
+	showGoldRewardDialog(comment, childComment) {
+		if (comment.admin === true) {
+			this.comment = comment;
+			this.childComment = childComment;
+			this.setState({goldRewardDialogOpen: true})
+		}
+	}
+	handleGoldRewardDialogClose() {
+		this.setState({
+			goldRewardDialogOpen: false
+		})
+	}
+	onGoldRewardDialogOkBtnClick() {
+		console.log('onGoldRewardDialogOkBtnClick')
+		const { goldRewardInput } = this.state;
+		if (!goldRewardInput || goldRewardInput === '0' || goldRewardInput.indexOf('-') !== -1) {
+			this.setState({ goldRewardInputError: true})
+			return;
+		} else {
+			this.setState({goldRewardDialogOpen: false})
+			this.props.rewardCode(this.comment, this.childComment, goldRewardInput)
+		}
+	}
+	onGoldRewardInputChange(event) {
+		 this.setState({ goldRewardInput: event.target.value, goldRewardInputError: false });
+	}
+	render() {
+		const { deleteComment, onPaginationChange, comment_count_without_reply, currentPage, comments, usingAntdModal } = this.props;
+		const { dialogOpen, goldRewardDialogOpen, dialogType, goldRewardInputError } = this.state;
+
+		const goldRewardInputErrorObj = goldRewardInputError ? {'error': 'error'} : {}
+
+		return (
+			<div className="fit -scroll" style={{ 'overflow-x': 'hidden'}}>
+				
+						
+						{ usingAntdModal ? <Modals
+                modalsType={dialogOpen}
+                modalsTopval={
+									dialogType === 'delete' ? '确定要删除该条回复吗？'
+										: dialogType === 'hidden' ? '确定要隐藏该条回复吗？' 
+										: dialogType === 'hiddenCancel' ? '确定要取消隐藏该条回复吗？' : ''
+								}
+                modalsBottomval={""}
+                modalCancel={this.handleDialogClose}
+                modalSave={this.onDialogOkBtnClick}
+						>
+						</Modals> : 
+						<Dialog
+		          	open={dialogOpen}
+		          	onClose={this.handleDialogClose}
+		        >	
+			       	<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
+		          	<DialogContent>
+			            <DialogContentText id="alert-dialog-description" style={{textAlign: 'center'}}>
+			            	{
+			            		dialogType === 'delete' ? '确定要删除该条回复吗？'
+			            			: dialogType === 'hidden' ? '确定要隐藏该条回复吗？' 
+			            				: dialogType === 'hiddenCancel' ? '确定要取消隐藏该条回复吗？' : ''
+			            	}
+			            </DialogContentText>
+		          	</DialogContent>
+		          	<DialogActions>
+			            <Button onClick={this.handleDialogClose} color="primary">
+			              取消
+			            </Button>
+			            <Button variant="raised" 	
+			            	onClick={() => this.onDialogOkBtnClick() } color="primary" autoFocus>
+			              确定
+			            </Button>
+		          	</DialogActions>
+							</Dialog> 
+						}
+
+		        <Dialog
+		          	open={goldRewardDialogOpen}
+		          	onClose={this.handleGoldRewardDialogClose}
+		        >	
+			       	<DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle>
+		          	<DialogContent>
+			            
+			            	<FormControl { ...goldRewardInputErrorObj } aria-describedby="name-error-text">
+					          	<InputLabel htmlFor="goldReward">请输入奖励的金币数量</InputLabel>
+					          	<Input id="goldReward"  type="number" value={this.state.goldRewardInput} onChange={(e) => this.onGoldRewardInputChange(e)} />
+					          	{ goldRewardInputError ? <FormHelperText id="name-error-text">奖励金币不能为空或负数</FormHelperText> : ''}
+					        </FormControl>
+
+				        {/*<DialogContentText id="alert-dialog-description" style={{textAlign: 'center'}}>    </DialogContentText>*/}
+		          	</DialogContent>
+		          	<DialogActions>
+			            <Button onClick={this.handleGoldRewardDialogClose} color="primary">
+			              取消
+			            </Button>
+			            <Button variant="raised" 	
+			            	onClick={() => this.onGoldRewardDialogOkBtnClick() } color="primary" autoFocus>
+			              确定
+			            </Button>
+		          	</DialogActions>
+		        </Dialog>
+
+
+				<div className="-layout-v -fit">
+					<div className="panel-comment_item" >
+
+						{this.renderComments()}	
+
+					</div>
+					{ (comment_count_without_reply > 10 ) ? 
+						<div className="paginationSection">
+							<Pagination showQuickJumper onChange={onPaginationChange} current={currentPage} total={comment_count_without_reply} />
+						</div>
+						: '' }
+					{ (comment_count_without_reply == 0) ? <div>
+
+							<div className="edu-tab-con-box clearfix edu-txt-center">
+								<img className="edu-nodata-img mb20"
+										 src={getImageUrl("images/educoder/nodata.png")} />
+								<p className="edu-nodata-p mb20">暂时还没有评论~</p>
+							</div>
+					</div>
+						: '' }
+				</div>
+				
+			</div>
+		)
+	}
+}
+
 export default Comments;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js
index a9eddaa87..2d43439c4 100644
--- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js
@@ -211,15 +211,15 @@ class ShixunModal extends Component{
                     <a onClick={()=>this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a>
                   </li>
 
-                  {/*{*/}
-                    {/*shixunmodallist && shixunmodallist.tags.map((item,key)=>{*/}
-                      {/*return(*/}
-                        {/*<li className="fl mr5 mt5" key={key}>*/}
-                          {/*<a onClick={()=>this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name}</a>*/}
-                        {/*</li>*/}
-                      {/*)*/}
-                    {/*})*/}
-                  {/*}*/}
+                  {
+                    shixunmodallist && shixunmodallist.tags.map((item,key)=>{
+                      return(
+                        <li className="fl mr5 mt5" key={key}>
+                          <a onClick={()=>this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name}</a>
+                        </li>
+                      )
+                    })
+                  }
 
                 </div>
                 <div className="clearfix mb10" id="shixun_search_form_div" style={{height:"30px"}}>
@@ -251,10 +251,10 @@ class ShixunModal extends Component{
                 }
                 <ul className="clearfix greybackHead edu-txt-center">
                   <li className="fl with40 paddingleft22" >实训名称</li>
-                  <li className="fl with30 edu-txt-left">院校</li>
-                  <li className="fl with10">学习人数</li>
-                  <li className="fl with10">难度</li>
-                  <li className="fl with10"></li>
+                  <li className="fl with25 edu-txt-left">院校</li>
+                  <li className="fl with11">学习人数</li>
+                  <li className="fl with11">难度</li>
+                  <li className="fl with11"></li>
                 </ul>
 
 
@@ -266,12 +266,16 @@ class ShixunModal extends Component{
                     {
                       `
                       .next-loading{
-                            width: 100%;
-                            height: 230px;
+													width: 100%;
+													height: 230px;
                         }
                         .newtaskhide{
-                           margin-top:0px !important;
-                               height: 40px;
+                          margin-top:0px !important;
+                          height: 40px;
+                        }
+                        .with11{
+													width: 11%;
+													box-sizing: border-box;
                         }
                       `
                     }
@@ -292,11 +296,11 @@ class ShixunModal extends Component{
                                   <span style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name">{item.shixun_name}</span>
                                 </Checkbox>
                               </li>
-                              <li className="fl with30 edu-txt-left task-hide paddingl5">{item.school}</li>
-                              <li className="fl with10 paddingl10">{item.myshixuns_count}</li>
-                              <li className="fl with10 color-orange-tip paddingl10">{item.level}</li>
+                              <li className="fl with25 edu-txt-left task-hide paddingl5">{item.school}</li>
+                              <li className="fl with11 paddingl10">{item.myshixuns_count}</li>
+                              <li className="fl with11 color-orange-tip paddingl10">{item.level}</li>
                               <Tooltip title="新窗口查看详情">
-                              <li className="fl with10"><a className="color-blue" href={"/shixuns/"+item.identifier+"/challenges"} target="_blank">详情</a></li>
+                              <li className="fl with11"><a className="color-blue" href={"/shixuns/"+item.identifier+"/challenges"} target="_blank">详情</a></li>
                               </Tooltip>
                             </div>
                           )
diff --git a/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js b/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
index 43194acb1..a50f00dd4 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
@@ -572,6 +572,7 @@ export default class TPMchallengesnew extends Component {
 										<div className="edu-back-white padding40-20 mb20">
 											<p className="color-grey-6 font-16 mb30">服务配置</p>
 											<div className="clearfix mb5">
+												<span className="mr30 color-orange pt10">*</span>
 												<label className="panel-form-label fl">评测时限(S)：</label>
 												<div className="pr fl with80 status_con">
 													<input  value={this.state.exec_time} className="panel-box-sizing task-form-100 task-height-40" placeholder="请输入类别名称" onInput={this.setexec_time}/>
diff --git a/public/react/src/modules/tpm/component/TPMRightSection.js b/public/react/src/modules/tpm/component/TPMRightSection.js
index 28c49333a..8479acd76 100644
--- a/public/react/src/modules/tpm/component/TPMRightSection.js
+++ b/public/react/src/modules/tpm/component/TPMRightSection.js
@@ -130,7 +130,7 @@ class TPMRightSection extends Component {
                                       return(
                                         <div className="recomments clearfix df" key={key}>
                                             <a href={"/shixuns/"+item.identifier+"/challenges"} target="_blank">
-                                              <img alt="69?1526971094" height="96" src={item.pic} width="128"/>
+                                              <img alt="69?1526971094" height="96" src={"/"+item.pic} width="128"/>
                                             </a>
                                             <div className="ml10 flex1">
                                               <Tooltip placement="bottom" title={item.name}>
@@ -161,7 +161,7 @@ class TPMRightSection extends Component {
                                             <div  className="recomments clearfix df" key={k}>
 
                                               <a href={"/paths/"+i.id} height="96" width="128" target="_blank">
-                                                <img alt="实训" height="96" src={i.image_url} width="128" />
+                                                <img alt="实训" height="96" src={"/"+i.image_url} width="128" />
                                               </a>
 
                                               <div className="ml10 flex1">
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index b98e9a8ab..1935f2053 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -314,7 +314,7 @@ class Challenges extends Component {
               */}
             </div>
 
-            <p className="clearfix mb10">
+            <p className="clearfix mb10 mt20">
               <span className="font-16 fl">全部任务</span>
               {this.props.identity < 5 && ChallengesDataList&&ChallengesDataList.shixun_status=== 0 ?
                 <Link to={"/shixuns/" + id + "/challenges/new"}