Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/public/index.html

@@ -67,7 +67,9 @@
 
       <!-- <link rel="stylesheet" type="text/css" href="https://www.educoder.net/stylesheets/css/font-awesome.css?1510652321"> -->
 
-      <link rel="stylesheet" type="text/css" href="http://47.96.87.25:48080/stylesheets/educoder/iconfont/iconfont.css">
+      <!--<link rel="stylesheet" type="text/css" href="http://47.96.87.25:48080/stylesheets/educoder/iconfont/iconfont.css">-->
+
+      <!--需要去build js配置-->
       <link rel="stylesheet" type="text/css" href="/css/iconfont.css">
     <style>
         /*<!--去除浏览器点击操作后有蓝色的底块-->*/

public/react/scripts/build.js

@@ -199,6 +199,7 @@ function generateNewIndexJsp() {
         .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
 
         .replace('/css/css_min_all.css', `${cdnHost}/react/build/css/css_min_all.css?v=${newVersion}`)
+			  .replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`)
         .replace('/js/create_kindeditor.js', `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)
 
         // .replace('/react/build/./static/css/main', `${cdnHost}/react/build/./static/css/main`)

public/react/src/common/components/Cropper.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 
-import { getUrl2 } from 'educoder'
+import { getUrl2, isDev } from 'educoder'
 const $ = window.$
 
 let _url_origin = getUrl2()
@@ -81,18 +81,19 @@ class Cropper extends Component {
         $.ajaxSetup({
             cache: true
         });
-
+        const isDev = isDev()
+        let _path = isDev ? 'public' : 'build'
 
         $('head').append($('<link rel="stylesheet" type="text/css" />')
-            .attr('href', `${_url_origin}/react/public/js/cropper/cropper.min.css`));
+            .attr('href', `${_url_origin}/react/${_path}/js/cropper/cropper.min.css`));
 
         $.getScript(
-          `${_url_origin}/react/public/js/cropper/cropper.js`,
+          `${_url_origin}/react/${_path}/js/cropper/cropper.js`,
           (data, textStatus, jqxhr) => {
           
         });
         $.getScript(
-          `${_url_origin}/react/public/js/cropper/html2canvas.min.js`,
+          `${_url_origin}/react/${_path}/js/cropper/html2canvas.min.js`,
           (data, textStatus, jqxhr) => {
           
         });

public/react/src/modules/courses/members/teacherList.js

@@ -37,7 +37,8 @@ function buildColumns(that) {
     dataIndex: 'name',
     key: 'index',
     render: (content, item, index) => {
-      return <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1}　</a>
+      return item.isApply == true ? '' : <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1 
+          - (that.application_list ? that.application_list.length : 0)}　</a>
     }
   }
   // ,{
@@ -546,6 +547,7 @@ class studentsList extends Component{
     const combineArray = teachers.slice(0)
     if (page == 1) {
       this.state.application_list && this.state.application_list.slice(0).reverse().forEach(item => {
+        item.isApply = true
         combineArray.unshift(item)
       })
     }

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -356,9 +356,9 @@ class ShixunhomeWorkItem extends Component{
 								`
 							}
 						</style>
-            {this.props.isAdmin?<div className={this.props.isAdminOrTeacher()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
+            {this.props.isAdmin?<div className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
               <a className="btn colorblue font-16" href={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</a>
-								{this.props.isAdminOrTeacher()?<a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
+								{this.props.isAdminOrCreator()?<a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
               <WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings`}  > 设置</WordsBtn>
             </div>:""}
 

public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js

@@ -6,6 +6,8 @@ import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
 
 // import "antd/dist/antd.css";
 
+import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
+
 import axios from 'axios';
 
 import './css/TPMchallengesnew.css';
@@ -28,129 +30,10 @@ const Option = Select.Option;
 
 const RadioGroup = Radio.Group;
 
-// 恢复数据
-function md_rec_data(k,mdu,id, editor){
-    if(window.sessionStorage.getItem(k+mdu) !== null){
-        editor.setValue(window.sessionStorage.getItem(k+mdu));
-        md_clear_data(k,mdu,id);
-    }
-}
-
-// 保存数据
-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("");
-    }
-}
-
-function md_elocalStorage(editor,mdu,id){
-    if (window.sessionStorage){
-        var oc = window.sessionStorage.getItem('content'+mdu);
-        if(oc !== null ){
-
-            $("#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;
-
-                $(id1).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存   ");
-                $(id2).html("");
-            }
-        },10000);
-
-    }else{
-        $("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
-    }
-}
-
-
-function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
-    var editorName = window.editormd(id, {
-        width: width,
-        height: high,
-        path: path,   // "/editormd/lib/"
-
-        syncScrolling: "single",
-        tex: true,
-        tocm: true,
-        emoji: true,
-        taskList: true,
-        codeFold: true,
-        searchReplace: true,
-        htmlDecode: "style,script,iframe",
-        sequenceDiagram: true,
-        autoFocus: false,
-        toolbarIcons: function () {
-            // Or return editormd.toolbarModes[name]; // full, simple, mini
-            // Using "||" set icons align right.
-            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
-        },
-        toolbarCustomIcons: {
-            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></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
-        onload: function () {
-            // this.previewing();
-            $("#" + 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", "多行公式");
-
-            md_elocalStorage(editorName, `exercise__${id}`, "Memochallengesnew");
-
-            callback && callback()
-        }
-    });
-    return editorName;
-}
-
-
 export default class TPMchallengesnew extends Component {
     constructor(props) {
         super(props)
+			  this.exercisememoMDRef=React.createRef();
         this.state = {
             choice_url: undefined,
             practice_url: undefined,
@@ -180,52 +63,6 @@ export default class TPMchallengesnew extends Component {
     }
 
 
-    exerciseMD(initValue, id) {
-
-        this.contentChanged = false;
-        const placeholder = "";
-        // amp;
-        // 编辑时要传memoId
-        const imageUrl = `/api/attachments.json`;
-        // 创建editorMd
-
-        const exercise_editormd = create_editorMD(id, '100%', 400, placeholder, imageUrl, () => {
-            setTimeout(() => {
-                exercise_editormd.resize()
-                exercise_editormd.cm && exercise_editormd.cm.refresh()
-            }, 500)
-
-            if (initValue != undefined) {
-                exercise_editormd.setValue(initValue)
-            }
-            exercise_editormd.cm.on("change", (_cm, changeObj) => {
-                console.log('....contentChanged')
-                this.contentChanged = true;
-            })
-        });
-        this.exercise_editormd = exercise_editormd;
-        window.exercise_editormd = exercise_editormd;
-
-    }
-
-    formatSearch = (url) => {
-        if (typeof url !== "undefined") {
-            url = url.substr(1);  //从起始索引号提取字符串中指定数目的字符
-            var arr = url.split("&"),  //把字符串分割为字符串数组
-                obj = {},
-                newarr = [];
-            arr.forEach(function (v, i) { //数组遍历
-                // console.log(v);
-                // console.log(i);
-                newarr = v.split("=");
-                if (typeof obj[newarr[0]] === "undefined") {
-                    obj[newarr[0]] = newarr[1];
-                }
-            });
-            return obj;
-        }
-        ;
-    }
     componentDidMount() {
         let id = this.props.match.params.shixunId;
         let checkpointId=this.props.match.params.checkpointId;
@@ -244,9 +81,11 @@ export default class TPMchallengesnew extends Component {
                     position: response.data.position,
                     task_pass_default: response.data.task_pass_default,
                     submit_url: response.data.submit_url,
-                    checkpointId:checkpointId
+                    checkpointId:checkpointId,
+									exercisememoMDRefval:response.data.task_pass_default
                 })
-                this.exerciseMD(response.data.task_pass_default, "exercisememoMD");
+
+							this.exercisememoMDRef.current.setValue(response.data.task_pass_default||'')
             }).catch((error) => {
                 console.log(error)
             });
@@ -296,11 +135,13 @@ export default class TPMchallengesnew extends Component {
 									  exec_time:response.data.exec_time,
                     tab2url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=2",
                     tab3url: "/shixuns/" + id + "/challenges/"+checkpointId+"/tab=3",
+									exercisememoMDRefval:response.data.task_pass
                 })
                 if(response.data.power===false){
                     this.props.showSnackbar("你没有权限修改");
                 }
-                this.exerciseMD(response.data.task_pass, "exercisememoMD");
+
+							this.exercisememoMDRef.current.setValue(response.data.task_pass||'')
             }).catch((error) => {
                 console.log(error)
             });
@@ -372,8 +213,7 @@ export default class TPMchallengesnew extends Component {
             return
         }
 
-        const exercise_editormdvalue = this.exercise_editormd.getValue();
+        const exercise_editormdvalue = this.exercisememoMDRef.current.getValue().trim();
-
         let id = this.props.match.params.shixunId;
 
         let url = "/shixuns/" + id + "/challenges.json";
@@ -457,7 +297,7 @@ export default class TPMchallengesnew extends Component {
 
         let {shixunCreatePractice, shixunCreatePracticeGroup, onshixunsmarkvalue, shixunsskillvaluelist,checkpointId,exec_time} = this.state;
 
-        const exercise_editormdvalue = this.exercise_editormd.getValue();
+			const exercise_editormdvalue = this.exercisememoMDRef.current.getValue().trim();
 
         let id = this.props.match.params.shixunId;
 
@@ -631,11 +471,9 @@ export default class TPMchallengesnew extends Component {
 
                         <p className="color-grey-6 font-16 mb30">过关任务</p>
 
-                        <div className="padding10-20 edu-back-greyf5 radius4" id="exercisememoMD">
+											<TPMMDEditor ref={this.exercisememoMDRef} placeholder="请输入选择题的题干内容" mdID={'exercisememoMD'} refreshTimeout={1500}
-                            <textarea style={{display: 'none'}}  onInput={this.Executiveorder} id="exercisememoMD_show" name="content"> </textarea>
+																	 watch={true}  className="courseMessageMD" initValue={this.state.exercisememoMDRefval}></TPMMDEditor>
-                            <div className="CodeMirror cm-s-defualt">
+
-                            </div>
-                        </div>
                         <p id="e_tip_Memochallengesnew" className="edu-txt-right color-grey-cd font-12"></p>
                         <p id="e_tips_Memochallengesnew" className="edu-txt-right color-grey-cd font-12"></p>
                     </div>

public/react/src/modules/tpm/shixuns/ShixunsIndex.js

@@ -41,7 +41,7 @@ class ShixunsIndex extends Component {
             parsedid:undefined,
             newtag_level:undefined,
             newpalce:undefined,
-            sort:undefined
+            sort:"desc"
         }
     }
     componentDidMount(){
@@ -100,6 +100,8 @@ class ShixunsIndex extends Component {
     }
 
     allUpdatashixunlist=()=>{
+			let{sort}=this.state;
+
         this.setState({
             order_by: 'publish_time',
             tag_level: 1,
@@ -109,8 +111,8 @@ class ShixunsIndex extends Component {
             keyword:'',
             status: 0,
             diff: 0,
-
         })
+
         let params={
             order_by: 'publish_time',
             tag_level: 1,
@@ -120,6 +122,7 @@ class ShixunsIndex extends Component {
             keyword:'',
             status: 0,
             diff: 0,
+				  	sort:sort
         }
         this.shixunresultend(params)
     }
@@ -135,7 +138,7 @@ class ShixunsIndex extends Component {
             typepvisible:true
         })
 
-        let {order_by, page, limit, keyword, status, diff} = this.state;
+        let {order_by, sort, limit, keyword, status, diff} = this.state;
 
         let params={
             order_by:order_by,
@@ -146,6 +149,7 @@ class ShixunsIndex extends Component {
             keyword:keyword,
             status:status,
             diff:diff,
+					  sort:sort
         }
 
         this.shixunresultend(params)
@@ -192,7 +196,7 @@ class ShixunsIndex extends Component {
             typepvisible:true,
             pages:1
         })
-        let {order_by, tag_level, tag_id, page, limit, status, diff} = this.state;
+        let {order_by, tag_level, tag_id, sort, limit, status, diff} = this.state;
         let params= {
             order_by:order_by,
             tag_level:tag_level,
@@ -202,6 +206,7 @@ class ShixunsIndex extends Component {
             keyword:value,
             status:status,
             diff:diff,
+					  sort:sort
         }
           this.shixunresultend(params)
         }else{
@@ -247,7 +252,7 @@ class ShixunsIndex extends Component {
             typepvisible:true,
             pages:value
         })
-        let {order_by, tag_level, tag_id, limit, keyword, status, diff} = this.state;
+        let {order_by, tag_level, tag_id, limit, keyword, status, diff,sort} = this.state;
         let params= {
             order_by:order_by,
             tag_level:tag_level,
@@ -257,6 +262,7 @@ class ShixunsIndex extends Component {
             keyword:keyword,
             status:status,
             diff:diff,
+			  		sort:sort
         }
 
         let Url=`/shixuns.json`;