@@ -1223,3 +1221,14 @@ class ShixunHomework extends Component{
}
}
export default ShixunHomework;
+// {/*
*/}
\ No newline at end of file
diff --git a/public/react/src/modules/page/MainContentContainer.js b/public/react/src/modules/page/MainContentContainer.js
index 3214fe5d5..f50ec9d21 100644
--- a/public/react/src/modules/page/MainContentContainer.js
+++ b/public/react/src/modules/page/MainContentContainer.js
@@ -224,12 +224,15 @@ class MainContentContainer extends Component {
}
componentDidUpdate(prevProps, prevState, snapshot) {
- const { game } = this.props
+ const { game, challenge } = this.props
if (game && prevProps.game
&& prevProps.game.identifier !== game.identifier) {
// 切换关卡时，停止轮训
this.oldGameIdentifier = prevProps.game.identifier;
+ this.doFileUpdateRequestOnCodeMirrorBlur(prevProps)
+ } else if (challenge && (challenge.pathIndex || prevProps.challenge.pathIndex) && challenge.pathIndex != prevProps.challenge.pathIndex) {
+ this.doFileUpdateRequestOnCodeMirrorBlur(prevProps)
}
}
@@ -386,8 +389,8 @@ class MainContentContainer extends Component {
}
- doFileUpdateRequestOnCodeMirrorBlur = () => {
- var fileUpdatePromise = this.doFileUpdateRequest(true)
+ doFileUpdateRequestOnCodeMirrorBlur = (props) => {
+ var fileUpdatePromise = this.doFileUpdateRequest(true, undefined, props)
if (fileUpdatePromise) {
fileUpdatePromise.then((resData) => {
if (resData.status === -1) { // 保存文件出现异常
@@ -496,7 +499,8 @@ class MainContentContainer extends Component {
}
// forTest true 是评测时触发的file_update
- doFileUpdateRequest(checkIfCodeChanged, forTest) {
+ doFileUpdateRequest(checkIfCodeChanged, forTest, props) {
+ const _props = props || this.props;
const { codeStatus } = this.state;
if (!forTest && codeStatus !== UPDATED) { // 已修改状态才能保存
return;
@@ -521,7 +525,7 @@ class MainContentContainer extends Component {
})
return null;
}
- const { challenge, output_sets, onRunCodeTestFinish, myshixun } = this.props
+ const { challenge, output_sets, onRunCodeTestFinish, myshixun } = _props
// var url = `${locationPath}/file_update?path=${encodeURIComponent(challenge.path)}`
var url = `/myshixuns/${myshixun.identifier}/update_file.json`
diff --git a/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js b/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js
index 50072c627..d19aa03ec 100644
--- a/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js
+++ b/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js
@@ -37,6 +37,8 @@ export function ImageLayerOfCommentHOC(options = {}) {
}
// jQuery._data( $('.newMain')[0], "events" )
componentDidMount() {
+ this.props.wrappedComponentRef && this.props.wrappedComponentRef(this.refs['wrappedComponentRef'])
+
// commentsDelegateParent #game_left_contents #tab_con_4
setTimeout(() => {
$(options.parentSelector || ".commentsDelegateParent")
@@ -60,7 +62,7 @@ export function ImageLayerOfCommentHOC(options = {}) {
)
diff --git a/public/react/src/modules/paths/PathDetail/addCollaborators.js b/public/react/src/modules/paths/PathDetail/addCollaborators.js
index 0b99fd467..056e69b31 100644
--- a/public/react/src/modules/paths/PathDetail/addCollaborators.js
+++ b/public/react/src/modules/paths/PathDetail/addCollaborators.js
@@ -14,7 +14,8 @@ class addCollaborators extends Component{
search:'',
partnerListid:[],
checkAll: false,
- optionss:[]
+ optionss:[],
+ useristrue:false
}
}
addBox=()=>{
@@ -70,6 +71,13 @@ class addCollaborators extends Component{
let {partnerListid} =this.state;
let id=this.props.match.params.pathId;
let url="/paths/"+id+"/add_subject_members.json"
+
+ if(partnerListid.length===0){
+ this.setState({
+ useristrue:true
+ })
+ return
+ }
axios.post(url,{
user_ids:partnerListid
}).then((response) => {
@@ -87,9 +95,17 @@ class addCollaborators extends Component{
}
addCollaboratorsid=(id)=>{
- this.setState({
- partnerListid:id
- })
+ if(id.length===0){
+ this.setState({
+ partnerListid:id,
+ })
+ }else{
+ this.setState({
+ partnerListid:id,
+ useristrue:false
+ })
+ }
+
}
onCheckAllChange = (e) => {
@@ -145,7 +161,7 @@ class addCollaborators extends Component{
}
render(){
- let {addPartner,search,partnerList,optionss,checkAll,partnerListid} = this.state;
+ let {addPartner,search,partnerList,optionss,checkAll,partnerListid,useristrue} = this.state;
return(
this.props.detailInfoList===undefined?"":this.props.detailInfoList.allow_add_member===true?
@@ -199,6 +215,7 @@ class addCollaborators extends Component{
}
+ {useristrue===true?
this.CollaboratorsshowModal("cooperation")}>取消
diff --git a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
index f3c4a30da..4470aaec1 100644
--- a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
+++ b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
@@ -1,45 +1,45 @@
-.ml350 {
- margin-left: 40%;
-}
-
-.ml32 {
- margin-left: 32%;
-}
-
-.square-Item{
- /*min-height: 324px;*/
-}
-.square-img{
- min-height: 210px;
-}
-.task-hide{
- margin-bottom: 0em;
-}
-.backFAFAFA{
- background:#FAFAFA;
-}
-
-.demo {
- width: 500px;
- background-color: #0dcecb;
- text-align: center;
- padding:50px;
-}
-.next-loading {
- margin-bottom: 5px;
- width:100%;
-}
-
-.next-rating-overlay .next-icon{
- color: #FFA800!important;
-}
-
-.custom-pagination {
- display: inline-block;
- margin-left: 10px;
-}
-
-.ml425{
- margin-left:42.5%;
- margin-top:20px;
+.ml350 {
+ margin-left: 40%;
+}
+
+.ml32 {
+ margin-left: 32%;
+}
+
+.square-Item{
+ /*min-height: 324px;*/
+}
+.square-img{
+ min-height: 210px;
+}
+.task-hide{
+ margin-bottom: 0em;
+}
+.backFAFAFA{
+ background:#FAFAFA;
+}
+
+.demo {
+ width: 500px;
+ background-color: #0dcecb;
+ text-align: center;
+ padding:50px;
+}
+.next-loading {
+ margin-bottom: 5px;
+ width:100%;
+}
+
+.next-rating-overlay .next-icon{
+ color: #FFA800!important;
+}
+
+.custom-pagination {
+ display: inline-block;
+ margin-left: 10px;
+}
+
+.ml425{
+ margin-left:42.5%;
+ margin-top:20px;
}
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/InfosBank.js b/public/react/src/modules/user/usersInfo/InfosBank.js
index 8adc7ba50..2abc15220 100644
--- a/public/react/src/modules/user/usersInfo/InfosBank.js
+++ b/public/react/src/modules/user/usersInfo/InfosBank.js
@@ -1,249 +1,249 @@
-import React, { Component } from 'react';
-import {Pagination,Spin,Checkbox,Modal} from 'antd';
-import moment from 'moment';
-import axios from 'axios';
-import NoneData from '../../courses/coursesPublic/NoneData'
-import {getImageUrl} from 'educoder';
-import "./usersInfo.css"
-import Modals from '../../modals/Modals'
-
-const dateFormat ="YYYY-MM-DD HH:mm"
-class InfosBank extends Component{
- constructor(props){
- super(props);
- this.state={
- category:"common",
- type:"publicly",
- page:1,
- per_page:16,
- sort_by:"updated_at",
- CoursesId:undefined,
-
- totalCount:undefined,
- data:undefined,
- isSpin:false,
-
- dialogOpen:false,
- modalsTopval:undefined,
- modalsBottomval:undefined,
- modalSave:undefined
- }
- }
-
- componentDidMount=()=>{
- this.setState({
- isSpin:true
- })
- let{category,type,page,sort_by,CoursesId}=this.state;
- this.getCourses(category,type,page,sort_by,CoursesId);
- }
-
- getCourses=(category,type,page,sort_by,CoursesId)=>{
- let url=`/users/${this.props.match.params.username}/question_banks.json`;
- axios.get((url),{params:{
- category,
- type,
- page,
- sort_by,
- per_page:category && page ==1?17:16,
- course_list_id:CoursesId
- }}).then((result)=>{
- if(result){
- this.setState({
- totalCount:result.data.count,
- data:result.data,
- isSpin:false
- })
- }
- }).catch((error)=>{
- console.log(error);
- })
- }
-
- //切换种类
- changeCategory=(cate)=>{
- this.setState({
- category:cate,
- page:1,
- isSpin:true
- })
- let{type,sort_by,CoursesId}=this.state;
- this.getCourses(cate,type,1,sort_by,CoursesId);
- }
- //切换状态
- changeType=(type)=>{
- this.setState({
- type:type,
- page:1,
- isSpin:true
- })
- let{category,sort_by,CoursesId}=this.state;
- this.getCourses(category,type,1,sort_by,CoursesId);
- }
- //切换页数
- changePage=(page)=>{
- this.setState({
- page,
- isSpin:true
- })
- let{category,type,sort_by,CoursesId}=this.state;
- this.getCourses(category,type,page,sort_by,CoursesId);
- }
-
- // 进入课堂
- turnToCourses=(url)=>{
- this.props.history.push(url);
- }
-
- // 切换排序方式
- changeOrder= (sort)=>{
- this.setState({
- sort_by:sort,
- isSpin:true
- })
- let{category,type,page,CoursesId}=this.state;
- this.getCourses(category,type,page,sort,CoursesId);
- }
-
- changeCourseListId =(CoursesId)=>{
- this.setState({
- CoursesId,
- isSpin:true
- })
- let{category,type,sort,page}=this.state;
- this.getCourses(category,type,page,sort,CoursesId);
- }
-
- //设为公开/删除
- setPublic=(index)=>{
- this.setState({
- dialogOpen:true,
- modalsTopval:index==1?"您确定要公开吗？":"确定要删除该题吗？",
- modalsBottomval:index==1?"公开后不能重设为私有":"",
- modalSave:()=>this.sureOperation(index)
- })
- }
- // 确定--设为公开/删除
- sureOperation=()=>{
-
- }
-
- //弹框隐藏
- handleDialogClose=()=>{
- this.setState({
- dialogOpen:false
- })
- }
-
- render(){
- let{
- category,
- type,
- page,
- data,
- totalCount,
- sort_by,
- isSpin,
- CoursesId,
- dialogOpen,
- modalsTopval,
- modalsBottomval,modalSave
- } = this.state;
- let isStudent = this.props.isStudent();
- let is_current=this.props.is_current;
- return(
-
-
-
-
-
-
-
-
- this.changeCourseListId()}>
- 全部
-
- {
- data && data.course_list && data.course_list.map((item,key)=>{
- return(
- this.changeCourseListId(`${item.id}`)}>
- {item.name}
-
- )
- })
- }
-
-
-
- 共参与{totalCount}个题库
-
-
- {sort_by=="updated_at"?"时间最新":sort_by=="name"?"作业名称":"贡献者"}
- this.changeOrder("updated_at")}>时间最新
- this.changeOrder("name")}>作业名称
- this.changeOrder("contributor")}>贡献者
-
-
-
- {
- !data || data.question_banks.length==0 &&
- }
- {
- data && data.question_banks && data.question_banks.map((item,key)=>{
- return(
-
- )
- })
- }
-
-
- )
- }
-}
+import React, { Component } from 'react';
+import {Pagination,Spin,Checkbox,Modal} from 'antd';
+import moment from 'moment';
+import axios from 'axios';
+import NoneData from '../../courses/coursesPublic/NoneData'
+import {getImageUrl} from 'educoder';
+import "./usersInfo.css"
+import Modals from '../../modals/Modals'
+
+const dateFormat ="YYYY-MM-DD HH:mm"
+class InfosBank extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ category:"common",
+ type:"publicly",
+ page:1,
+ per_page:16,
+ sort_by:"updated_at",
+ CoursesId:undefined,
+
+ totalCount:undefined,
+ data:undefined,
+ isSpin:false,
+
+ dialogOpen:false,
+ modalsTopval:undefined,
+ modalsBottomval:undefined,
+ modalSave:undefined
+ }
+ }
+
+ componentDidMount=()=>{
+ this.setState({
+ isSpin:true
+ })
+ let{category,type,page,sort_by,CoursesId}=this.state;
+ this.getCourses(category,type,page,sort_by,CoursesId);
+ }
+
+ getCourses=(category,type,page,sort_by,CoursesId)=>{
+ let url=`/users/${this.props.match.params.username}/question_banks.json`;
+ axios.get((url),{params:{
+ category,
+ type,
+ page,
+ sort_by,
+ per_page:category && page ==1?17:16,
+ course_list_id:CoursesId
+ }}).then((result)=>{
+ if(result){
+ this.setState({
+ totalCount:result.data.count,
+ data:result.data,
+ isSpin:false
+ })
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+
+ //切换种类
+ changeCategory=(cate)=>{
+ this.setState({
+ category:cate,
+ page:1,
+ isSpin:true
+ })
+ let{type,sort_by,CoursesId}=this.state;
+ this.getCourses(cate,type,1,sort_by,CoursesId);
+ }
+ //切换状态
+ changeType=(type)=>{
+ this.setState({
+ type:type,
+ page:1,
+ isSpin:true
+ })
+ let{category,sort_by,CoursesId}=this.state;
+ this.getCourses(category,type,1,sort_by,CoursesId);
+ }
+ //切换页数
+ changePage=(page)=>{
+ this.setState({
+ page,
+ isSpin:true
+ })
+ let{category,type,sort_by,CoursesId}=this.state;
+ this.getCourses(category,type,page,sort_by,CoursesId);
+ }
+
+ // 进入课堂
+ turnToCourses=(url)=>{
+ this.props.history.push(url);
+ }
+
+ // 切换排序方式
+ changeOrder= (sort)=>{
+ this.setState({
+ sort_by:sort,
+ isSpin:true
+ })
+ let{category,type,page,CoursesId}=this.state;
+ this.getCourses(category,type,page,sort,CoursesId);
+ }
+
+ changeCourseListId =(CoursesId)=>{
+ this.setState({
+ CoursesId,
+ isSpin:true
+ })
+ let{category,type,sort,page}=this.state;
+ this.getCourses(category,type,page,sort,CoursesId);
+ }
+
+ //设为公开/删除
+ setPublic=(index)=>{
+ this.setState({
+ dialogOpen:true,
+ modalsTopval:index==1?"您确定要公开吗？":"确定要删除该题吗？",
+ modalsBottomval:index==1?"公开后不能重设为私有":"",
+ modalSave:()=>this.sureOperation(index)
+ })
+ }
+ // 确定--设为公开/删除
+ sureOperation=()=>{
+
+ }
+
+ //弹框隐藏
+ handleDialogClose=()=>{
+ this.setState({
+ dialogOpen:false
+ })
+ }
+
+ render(){
+ let{
+ category,
+ type,
+ page,
+ data,
+ totalCount,
+ sort_by,
+ isSpin,
+ CoursesId,
+ dialogOpen,
+ modalsTopval,
+ modalsBottomval,modalSave
+ } = this.state;
+ let isStudent = this.props.isStudent();
+ let is_current=this.props.is_current;
+ return(
+
+
+
+
+
+
+
+
+ this.changeCourseListId()}>
+ 全部
+
+ {
+ data && data.course_list && data.course_list.map((item,key)=>{
+ return(
+ this.changeCourseListId(`${item.id}`)}>
+ {item.name}
+
+ )
+ })
+ }
+
+
+
+ 共参与{totalCount}个题库
+
+
+ {sort_by=="updated_at"?"时间最新":sort_by=="name"?"作业名称":"贡献者"}
+ this.changeOrder("updated_at")}>时间最新
+ this.changeOrder("name")}>作业名称
+ this.changeOrder("contributor")}>贡献者
+
+
+
+ {
+ !data || data.question_banks.length==0 &&
+ }
+ {
+ data && data.question_banks && data.question_banks.map((item,key)=>{
+ return(
+
+ )
+ })
+ }
+
+
+ )
+ }
+}
export default InfosBank;
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index 92dd4f1d2..08bea57ed 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -1,115 +1,122 @@
-import React, { Component } from 'react';
-
-import {Link} from 'react-router-dom';
-import {Tooltip,Menu} from 'antd';
-import {getImageUrl} from 'educoder';
-
-import "./usersInfo.css"
-import "../../courses/css/members.css"
-import "../../courses/css/Courses.css"
-
-import banner from '../../../images/account/infobanner.png'
-
-class InfosBanner extends Component{
- constructor(props){
- super(props);
- }
- render(){
- let {
- data ,
- id,
- login,
- moduleName,
- current_user,
- }=this.props;
- let is_current=this.props.is_current;
- let {username}= this.props.match.params;
- let {pathname}=this.props.location;
- moduleName=pathname.split("/")[3];
- return(
-
-
-
-
-
-
- {data && data.name}
- {
- data && is_current == false && data.identity =="学生" ? "" :
- {data && data.identity}
-
-
-
-
-
-
-
-
-
-
- {
- is_current ?
-
- {
- data && data.attendance_signed ?
- 已签到
- :
- 签到
- }
-
- :
-
- 私信
-
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
- {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
- &&
- }
-
-
-
- )
- }
-}
+import React, { Component } from 'react';
+
+import {Link} from 'react-router-dom';
+import {Tooltip,Menu} from 'antd';
+import {getImageUrl} from 'educoder';
+
+import "./usersInfo.css"
+import "../../courses/css/members.css"
+import "../../courses/css/Courses.css"
+
+import { LinkAfterLogin } from 'educoder'
+
+class InfosBanner extends Component{
+ constructor(props){
+ super(props);
+ }
+ render(){
+ let {
+ data ,
+ id,
+ login,
+ moduleName,
+ current_user,
+ }=this.props;
+ let is_current=this.props.is_current;
+ let {username}= this.props.match.params;
+ let {pathname}=this.props.location;
+ moduleName=pathname.split("/")[3];
+ return(
+
+
+
+
+
+
+ {data && data.name}
+ {
+ data && is_current == false && data.identity =="学生" ? "" :
+ {data && data.identity}
+
+
+
+
+
+
+
+
+
+
+ {
+ is_current ?
+
+ {
+ data && data.attendance_signed ?
+ 已签到
+ :
+ 签到
+ }
+
+ :
+
+
+ 私信
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+ &&
+ }
+
+
+
+ )
+ }
+}
export default InfosBanner;
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js
index c4c1c77e0..bc401d4d7 100644
--- a/public/react/src/modules/user/usersInfo/InfosCourse.js
+++ b/public/react/src/modules/user/usersInfo/InfosCourse.js
@@ -130,7 +130,7 @@ class InfosCourse extends Component{
this.props.current_user && this.props.current_user.user_identity != "学生" ?
: ""
}
{
- (!data || data.courses.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
+ (!data || (data && data.courses.length==0)) && category &&
}
{
data && data.courses && data.courses.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosPath.js b/public/react/src/modules/user/usersInfo/InfosPath.js
index cb02ed604..554d8380f 100644
--- a/public/react/src/modules/user/usersInfo/InfosPath.js
+++ b/public/react/src/modules/user/usersInfo/InfosPath.js
@@ -152,7 +152,7 @@ class InfosPath extends Component{
this.props.current_user && this.props.current_user.user_identity != "学生" ?
:""
}
{
- (!data || data.subjects.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
+ (!data || (data && data.subjects.length==0)) && category &&
}
{
data && data.subjects && data.subjects.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js
index 2018f7b73..5aea5117b 100644
--- a/public/react/src/modules/user/usersInfo/InfosProject.js
+++ b/public/react/src/modules/user/usersInfo/InfosProject.js
@@ -125,7 +125,7 @@ class InfosProject extends Component{
:""
}
{
- (!data || data.projects.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
+ (!data || (data && data.projects.length==0)) && category &&
}
{
data && data.projects && data.projects.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosShixun.js b/public/react/src/modules/user/usersInfo/InfosShixun.js
index 94ef3c29b..4799626a9 100644
--- a/public/react/src/modules/user/usersInfo/InfosShixun.js
+++ b/public/react/src/modules/user/usersInfo/InfosShixun.js
@@ -1,14 +1,11 @@
import React, { Component } from 'react';
-import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import {Tooltip,Menu,Pagination,Spin} from 'antd';
-import Loadable from 'react-loadable';
-import Loading from '../../../Loading';
+
+import { Pagination , Spin } from 'antd';
+
import NoneData from '../../courses/coursesPublic/NoneData'
import axios from 'axios';
-import {getImageUrl,setImagesUrl} from 'educoder';
-import { TPMIndexHOC } from '../../tpm/TPMIndexHOC';
-import { CNotificationHOC } from '../../courses/common/CNotificationHOC'
+import { setImagesUrl } from 'educoder';
+
import "./usersInfo.css"
import Create from './publicCreatNew'
@@ -115,7 +112,7 @@ class InfosShixun extends Component{
totalCount,
isSpin
} = this.state;
- let isStudent = this.props.isStudent();
+
let is_current=this.props.is_current;
return(
@@ -157,20 +154,18 @@ class InfosShixun extends Component{
{
- page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ?
+ page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ?
:""
}
{
- (!data || data.shixuns.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
+ (!data || (data && data.shixuns.length==0)) && category &&
}
{
data && data.shixuns && data.shixuns.map((item,key)=>{
return(
 %>){kind=avatar}
+ <% end %>
+ 
- 
+ ![]({getImageUrl("images/educoder/nodata.png")}/)
+
+ ![]({getUrl("/images/educoder/nodata.png")}/)
![]({getImageUrl("images/edu_user/EWM.jpg")})
+ ![]({getImageUrl("images/educoder/EWM.jpg")})
![]({setImagesUrl("images/educoder/tag2.png")}/)
*/}
-