m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
dev_forum
杨树林 6 years ago
parent 413b29ed1a 38539ad498
commit e246a0c90d
13 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
public/react/config/webpack.config.dev.js
Unescape View File

@ -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: "eval", // 开启调试
// 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.

2
public/react/src/modules/courses/Resource/index.js
Unescape View File

@ -905,7 +905,7 @@ class Fileslists extends Component{
isAdmin={this.props.isAdmin()}
isStudent={this.props.isStudent()}
isNotMember={this.props.isNotMember()}
checkBox={this.props.isAdmin()?<Checkbox value={item.id}></Checkbox>:""}
checkBox={this.props.isAdmin()?<Checkbox value={item.id} key={item.id}></Checkbox>:""}
Settingtypes={(id)=>this.Settingtypes(id)}
coursesId={this.props.match.params.coursesId}
updatafiledfun={()=>this.updatafiled()}

2
public/react/src/modules/courses/boards/index.js
Unescape View File

@ -428,7 +428,7 @@ class Boards extends Component{
<BoardsListItem
{...this.props}
discussMessage={item}
checkBox={ isAdmin ? <Checkbox value={item.id}></Checkbox> : ''}
checkBox={ isAdmin ? <Checkbox value={item.id} key={item.id}></Checkbox> : ''}
onItemClick={this.onItemClick}
onSticky={this.onSticky}
></BoardsListItem>

7
public/react/src/modules/courses/busyWork/CommonWorkItem.js
Unescape View File

@ -135,14 +135,13 @@ class CommonWorkItem extends Component{
<div className="workList_Item">
{
mainList && isAdmin &&
<span className="fl mr12"><Checkbox value={item.homework_id}></Checkbox></span>
<span className="fl mr12"><Checkbox value={item.homework_id} key={item.homework_id}></Checkbox></span>
}
<div className="flex1" onClick={() => this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>
<p className="clearfix mb20">
{/* 放开点击进入，进入后弹框，canNotLink ? () => {} : */}
<a title={item.name}
className="fl font-16 font-bd mt2 comnonwidth580" style={{cursor: canNotLink ? 'normal' : 'poninter'}}
onClick={() => this.onItemClick(item)}
className="fl font-16 font-bd mt2 comnonwidth580" style={{cursor: canNotLink ? 'default' : 'poninter'}}
onClick={ canNotLink ? () => {} : () => this.onItemClick(item)}
>{item.name}</a>
{/* 只有非课堂成员且作业是私有的情况下才会为true */}

2
public/react/src/modules/courses/exercise/Exercise.js
Unescape View File

@ -560,7 +560,7 @@ class Exercise extends Component{
{...this.state}
item={item}
key={key}
checkBox={<Checkbox value={item.id}
checkBox={<Checkbox value={item.id} key={item.id}
// onClick={() => this.onItemClick(item)}
></Checkbox>}
></ExerciseListItem>

2
public/react/src/modules/courses/graduation/tasks/index.js
Unescape View File

@ -730,7 +730,7 @@ debugger
isAdmin={this.props.isAdmin()}
isStudent={this.props.isStudent()}
isNotMember={this.props.isNotMember()}
checkBox={this.props.isAdmin()?<Checkbox value={item.task_id}></Checkbox>:""}
checkBox={this.props.isAdmin()?<Checkbox value={item.task_id} key={item.task_id}></Checkbox>:""}
// onItemClick={this.onItemClick}
// onSticky={this.onSticky}
funlist={()=>this.fetchAll(search,page,order)}

2
public/react/src/modules/courses/graduation/topics/index.js
Unescape View File

@ -411,7 +411,7 @@ onBoardsNew=()=>{
{...this.props}
discussMessage={item}
data={data}
checkBox={<Checkbox value={item.id} onClick={() => this.onItemClick(item)} className="mr15"></Checkbox>}
checkBox={<Checkbox value={item.id} key={item.id} onClick={() => this.onItemClick(item)} className="mr15"></Checkbox>}
onItemClick={this.onItemClick}
index={index}
chooseTopic={this.chooseTopic}

16
public/react/src/modules/courses/members/studentsList.js
Unescape View File

@ -17,19 +17,6 @@ import DownloadMessageysl from "../../modals/DownloadMessageysl";
import CreateGroupByImportModal from './modal/CreateGroupByImportModal'
const Search =Input.Search;
const dataSource = [{
check:<Checkbox></Checkbox>,
id: <span className="color-grey-6">1</span>,
name: <a href="javascript:void(0)"className="color-grey-3">胡莎莎</a>,
StuNo: <span className="color-grey-9">32</span>,
classes: <span className="color-grey-3 task-hide classesName">西湖区湖底公园1号</span>
}, {
check:<Checkbox></Checkbox>,
id: <span className="color-grey-6">2</span>,
name: <a href="javascript:void(0)"className="color-grey-3">胡莎莎</a>,
StuNo: <span className="color-grey-9">32</span>,
classes: <span className="color-grey-3 task-hide classesName">西湖区湖底公园2号</span>
}];
const buildColumns = (that) => {
const { course_groups } = that.state
@ -100,7 +87,7 @@ const buildColumns = (that) => {
dataIndex: 'check',
key: 'check',
render: (text, item) => {
return <Checkbox value={item.course_member_id}></Checkbox>
return <Checkbox value={item.course_member_id} key={item.course_member_id} ></Checkbox>
},
width:"5%"
})
@ -280,6 +267,7 @@ class studentsList extends Component{
}
componentDidUpdate(prevProps) {
if (prevProps.match.params.course_group_id != this.props.match.params.course_group_id) {
this.setState({checkBoxValues: []})
this.fetchAll(1)
}
// 加载了2次

2
public/react/src/modules/courses/members/teacherList.js
Unescape View File

@ -667,7 +667,7 @@ class studentsList extends Component{
`}</style>
<div className="mt20 edu-back-white padding20 teacherList">
{ course_groups && course_groups.length && <CourseGroupChooserModal
{ course_groups && !!course_groups.length && <CourseGroupChooserModal
props={{match: this.props.match, showNotification: this.props.showNotification}}
record={this.state.clickRecord}
fetchAll={this.fetchAll}

6
public/react/src/modules/courses/poll/PollListItem.js
Unescape View File

@ -22,8 +22,10 @@ class PollListItem extends Component{
const IsAdmin =this.props.isAdmin();
const isStudent = this.props.isStudent();
const isNotMember = this.props.isNotMember();
const isAdminOrStudent = this.props.isAdminOrStudent();
let t= item.end_time ? moment(item.end_time) - moment() : 0;
let canNotLink = !isAdminOrStudent && item.lock_status == 0
return(
<div className="workList_Item polllisthover" style={{padding:"30px"}}>
@ -35,7 +37,9 @@ class PollListItem extends Component{
}
<div className="flex1 pr">
<p className="clearfix mb30">
<Link to={`/courses/${coursesId}/polls/${item.id}/detail`} className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}} title={item.polls_name}>{item.polls_name}</Link>
{ canNotLink ? <a className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px", "cursor": "default"}} title={item.polls_name}>{item.polls_name}</a> :
<Link to={`/courses/${coursesId}/polls/${item.id}/detail`} className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}} title={item.polls_name}>{item.polls_name}</Link>
}
{
item.lock_status === 0 ?
<Tooltip title={`${courseType.user_permission == 0 ? "私有属性,非课堂成员不能访问" : "私有属性"}`}>

2
public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
Unescape View File

@ -27,7 +27,7 @@ import '../css/members.css'
import "../common/formCommon.css"
import '../css/Courses.css'
import './style.css'
import ShixunModal from "../coursesPublic/ShixunModal";
class TraineetraininginformationModal extends Component {
constructor(props) {

16
public/react/src/modules/page/main/CodeEvaluateView.css
Unescape View File

@ -112,4 +112,18 @@
}
#evaluating_contents .-text-danger{
padding-bottom: 6px;
}
}
.-task-ces-top .description {
color: #616B77;
padding: 0 8px;
font-size: 12px;
}
.-task-ces-top .split {
border-right: 1px solid #616B77;
width: 1px;
display: inline-block;
height: 10px;
margin: 5px 0;
}

7
public/react/src/modules/page/main/CodeEvaluateView.js
Unescape View File

@ -172,7 +172,7 @@ class CodeEvaluateView extends Component {
} else if (item.result == false) {
headIconClass = 'fa-exclamation-circle -text-danger'
}
testSetsComponentArray.push(
<div className="-task-ces-top clearfix" onClick={ this.onTestSetHeaderClick.bind(this, index) }
style={{cursor:'pointer', 'margin-top':index == 0 ? '4px' : ''}} key={index+'-0'}>
@ -180,8 +180,13 @@ class CodeEvaluateView extends Component {
<i className={`fa ${ 'fa-caret-right'} mr8 font-16`}
style={isExpanded ? {transform: 'rotate(90deg)'} : {}}></i>
<span className="font-14">测试集 {index + 1}</span>
{ headIconClass && <i className={`fa ${ headIconClass } fr mt2 ml5 font-16`}></i> }
{ _headLockIconClass && <i className={`fa ${ _headLockIconClass } fr mt2 ml5 font-16`}></i> }
{ item.ts_memo && <span className="fr description">消耗内存{item.ts_memo}MB</span> }
{ item.ts_memo && item.ts_time && <span className="split"></span> }
{ item.ts_time && <span className="fr description">代码执行时长：{item.ts_time}秒</span> }
</p>
</div>

Write Preview
Loading…
Cancel
Save