From 083c6f8b5244e65ae611a965e028a587ad6cb871 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 9 Jul 2019 16:37:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=86=E7=8F=AD=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/members/CourseGroupChooser.js | 80 +++++++++++++++++++ .../modules/courses/members/teacherList.js | 62 ++++---------- 2 files changed, 96 insertions(+), 46 deletions(-) create mode 100644 public/react/src/modules/courses/members/CourseGroupChooser.js diff --git a/public/react/src/modules/courses/members/CourseGroupChooser.js b/public/react/src/modules/courses/members/CourseGroupChooser.js new file mode 100644 index 000000000..7974b70dd --- /dev/null +++ b/public/react/src/modules/courses/members/CourseGroupChooser.js @@ -0,0 +1,80 @@ +import React, { useState, useEffect } from 'react' +import { trigger } from 'educoder' +import { Input, Checkbox } from "antd"; + +function CourseGroupChooser({ course_groups, isAdminOrCreator, item, index, arg_course_groups, checkAllValue + , coursesids, onCheckAllChange, joinCourseGroup }) { + const [state, setState] = useState({counter: 0}) + const [search, setSearch] = useState('') + // useEffect(() => { + // console.log(' cdm') + // return () => { + // console.log(' cwum') + // }; + // // , [state.counter] 加了这个后，onClick就消失了 加错位置了？ + // }, [state.counter] ) + // TODO 为什么每次onClick都会执行 cwum + + // const add1ToCounter = () => { + // const newCounterValue = state.counter + 1 + // setState({ counter: newCounterValue }) + // } + + /** + that.state.groupSearchValue + that.setState({groupSearchValue: e.target.value}) + + that.onCheckAllChange(e, item, index) - onCheckAllChange(e, item, index) + that.joinCourseGroup(checkedValues, item, index) - joinCourseGroup(checkedValues, item, index) + + that.state.checkAllArray[index] - checkAllValue + */ + + return ( + + ) +} +export default CourseGroupChooser \ No newline at end of file diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js index a3cc08437..95d5148c9 100644 --- a/public/react/src/modules/courses/members/teacherList.js +++ b/public/react/src/modules/courses/members/teacherList.js @@ -21,6 +21,7 @@ import { from } from "array-flatten"; import AddGraduationGroupModal from './modal/AddGraduationGroupModal' import AddAdminModal from './modal/AddAdminModal' import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from './common' +import CourseGroupChooser from './CourseGroupChooser' const Search = Input.Search; const ROLE_ADMIN = "管理员" @@ -95,49 +96,13 @@ function buildColumns(that) { { isAdmin && - {!noGroups && } + {!noGroups && } } ) @@ -328,7 +293,7 @@ class studentsList extends Component{ }); } joinCourseGroup = (ids, item, index) => { - console.log('join ', ids, item) + // console.log('join ', ids, item) const courseId = this.props.match.params.coursesId @@ -663,6 +628,11 @@ class studentsList extends Component{ >
-
+ {filterKey == '1' &&
{ isAdminOrTeacher && hasGraduationModule && 已选 {checkBoxValues.length} 个 } { filterKey == '1' &&
{ hasGraduationModule && isAdminOrTeacher &&
  • @@ -715,7 +685,7 @@ class studentsList extends Component{
    • */}
    } -
    +
    }
    From 0d9a38a8a44153a074243b71f8f6ff88c218510f Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 9 Jul 2019 17:52:40 +0800 Subject: [PATCH 2/3] drag --- public/react/public/js/js_min_all.js | 27 +++++++++++++++++--- public/react/src/modules/page/MainContent.js | 10 +++++++- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/public/react/public/js/js_min_all.js b/public/react/public/js/js_min_all.js index 79134fc55..0d7a8988e 100755 --- a/public/react/public/js/js_min_all.js +++ b/public/react/public/js/js_min_all.js @@ -211,20 +211,35 @@ $(function(){ var FF = !(window.mozInnerScreenX == null); var websshLineHeight = FF ? 19 : 18 - + function throttle(method, delay, duration){ + var timer = null, begin = new Date(); + return function(){ + var context = this, args = arguments, current = new Date(); + clearTimeout(timer); + if(current-begin >= duration){ + method.apply(context, args); + begin = current; + } else { + timer = setTimeout(function(){ + method.apply(context, args); + }, delay); + } + } + } doc.live('mousemove touchmove',function(e){ $(".-brother").show();// 代码行的遮罩显示 if(dragging) { clickX = e.pageX || e.originalEvent.touches[0].pageX;; if(clickX > leftOffset+0&&clickX