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

public/react/config/webpack.config.dev.js

@@ -114,21 +114,21 @@ module.exports = {
       // First, run the linter.
       // It's important to do this before Babel processes the JS.
         // 上线然后要注释回来
-      // {
-      //   test: /\.(js|jsx|mjs)$/,
-      //   enforce: 'pre',
-      //   use: [
-      //     {
-      //       options: {
-      //         formatter: eslintFormatter,
-      //         eslintPath: require.resolve('eslint'),
-			//
-      //       },
-      //       loader: require.resolve('eslint-loader'),
-      //     },
-      //   ],
-      //   include: paths.appSrc,
-      // },
+      {
+        test: /\.(js|jsx|mjs)$/,
+        enforce: 'pre',
+        use: [
+          {
+            options: {
+              formatter: eslintFormatter,
+              eslintPath: require.resolve('eslint'),
+
+            },
+            loader: require.resolve('eslint-loader'),
+          },
+        ],
+        include: paths.appSrc,
+      },
       {
         // "oneOf" will traverse all following loaders until one will
         // match the requirements. When no loader matches it will fall

public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js

@@ -209,7 +209,9 @@ class CommonWorkAppraiseReply extends Component{
       isAdmin || 评阅入口：超级管理员、老师和助教显示；  -》 改成admin也不显示
       匿评人：匿评期间显示
      */
-    const needNiPingEditor = (allow_score  && isNiPing);
+
+    //  && isNiPing
+    const needNiPingEditor = (allow_score );
     if (!needNiPingEditor && comment_scores.length == 0) {
       return ''
     }
@@ -257,7 +259,7 @@ class CommonWorkAppraiseReply extends Component{
             <span className="labal">全部评阅</span>
             <span className="count">（{comment_scores.length}）</span> 
            </div>)} */}
-          <div className="padding10-20 bor-bottom-greyE">
+          <div className={`padding10-20 ${comment_scores.length ? 'bor-bottom-greyE' : ''}`}>
             {!!comment_scores.length && <div className={"color-grey-6 font-16"}>
               全部评阅<span className="count">{comment_scores.length===0?"":`(${comment_scores.length})`}</span>
 

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js

@@ -2,7 +2,7 @@ import React,{Component} from "React";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Spin,Tooltip} from "antd";
 import {Link} from 'react-router-dom';
 import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-import { WordsBtn,getUrl ,bytesToSize} from 'educoder';
+import { WordsBtn,getUrl ,bytesToSize,getImageUrl} from 'educoder';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
 const Search = Input.Search;

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

@@ -7,7 +7,8 @@ import Titlesearchsection from '../common/titleSearch/TitleSearchSection'
 import ColorCountText from '../common/titleSearch/ColorCountText'
 import update from 'immutability-helper'
 
-import { WordsBtn, ConditionToolTip, on, off } from 'educoder'
+import { WordsBtn, ConditionToolTip, on, off ,trigger} from 'educoder'
+
 import axios from 'axios'
 
 import _ from 'lodash'

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

@@ -349,7 +349,7 @@ class ShixunhomeWorkItem extends Component{
 
             {this.props.isAdmin?<div className="homepagePostSetting" style={{"right":"4px","top":"44px","display":"block","width":"192px"}}>
               <a className="btn colorblue font-16" href={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</a>
-								{this.props.isClassManagement()?<a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
+								{this.props.isClassManagement?<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/courses/shixunHomework/Workquestionandanswer.js

@@ -23,6 +23,7 @@ import {
     notification
 } from "antd";
 import {Link, Switch, Route, Redirect} from 'react-router-dom';
+import moment from 'moment'
 import axios from 'axios';
 import '../css/members.css'
 import "../common/formCommon.css"