diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js index 0b9a9dc86..919292188 100644 --- a/public/react/src/modules/courses/members/studentsList.js +++ b/public/react/src/modules/courses/members/studentsList.js @@ -1,5 +1,5 @@ import React,{ Component } from "react"; -import { Input,Checkbox,Table, Pagination, Modal,Menu ,Spin, Tooltip} from "antd"; +import { Input,Checkbox,Table, Pagination, Modal,Menu ,Spin, Tooltip , Divider } from "antd"; import ClipboardJS from 'clipboard' import '../css/Courses.css' import '../css/members.css' @@ -612,7 +612,12 @@ class studentsList extends Component{ padding-top: 10px; padding-bottom: 8px; } - + .drop_down_menu .drop_down_btn{ + border-top:none; + } + .dividerStyle.ant-divider-horizontal{ + margin: 0px; + } `} { isAdmin &&
  • @@ -656,8 +661,10 @@ class studentsList extends Component{

    ): '' } - {course_group_id != 0 &&
  • this.moveToGroup({id: 0})}>未分班
  • } - + { + course_group_id != 0 && course_groups && course_groups.length > 0 && +
  • this.moveToGroup({id: 0})}>未分班
  • + } { course_groups.filter((item)=> { return item.id != course_group_id && (!this.state.groupSearchValue || item.name.indexOf(this.state.groupSearchValue) != -1) }).map( item => { @@ -665,6 +672,7 @@ class studentsList extends Component{
  • this.moveToGroup(item)} title={item.name}>{item.name}
  • ) }) } + { course_groups && course_groups.length > 0 && } { isAdmin &&

    diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js index ed6ae0995..cd1cd3572 100644 --- a/public/react/src/modules/courses/members/teacherList.js +++ b/public/react/src/modules/courses/members/teacherList.js @@ -677,6 +677,12 @@ class studentsList extends Component{ float: none; text-align: center; } + .drop_down_menu .drop_down_btn{ + border-top:none; + } + .dividerStyle.ant-divider-horizontal{ + margin: 0px; + } `}

    @@ -705,12 +711,13 @@ class studentsList extends Component{ { groupList && groupList.graduation_group_list && groupList.graduation_group_list.filter((item)=> { return (!this.state.graduationGroupSearchValue || item.name.indexOf(this.state.graduationGroupSearchValue) != -1) - }).map((item,key)=>{ + }).map((item,key)=>{ return(
  • this.joinGraduationGroup(item.id)}>{item.name}
  • ) }) } + { groupList && groupList.graduation_groups_count > 0 && }

    this.refs['addGraduationGroupModal'].setVisible(true)} diff --git a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js index 973fb30f7..077ca9bc9 100644 --- a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js +++ b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js @@ -41,7 +41,7 @@ class Repository extends Component { } render() { - let { match, author, git_url, lastest_commit, trees, commits,repositoryLoading, pathArray } = this.props; + let { match, author, git_url, lastest_commit, trees, commits,repositoryLoading, pathArray , TPMRightSectionData } = this.props; if (!author) { author = {} } @@ -49,7 +49,6 @@ class Repository extends Component { if(this.props.author!=undefined){ userauthority=this.props.author.login===""||this.props.author.user_id===""||this.props.author.login===null||this.props.author.user_id===null; } - return ( {/* jfinalshop/WebRoot */} @@ -85,7 +84,7 @@ class Repository extends Component { Git使用指南 { - this.props.current_user && this.props.current_user.admin ==true ? + this.props.current_user && (this.props.current_user.admin ==true || (TPMRightSectionData&& TPMRightSectionData.creator && TPMRightSectionData.creator.login == this.props.current_user.login)) ? +添加文件:"" }