Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/busyWork/CommonWorkList.js

@@ -404,7 +404,8 @@ class CommonWorkList extends Component{
       category: {},
 			b_order: 'desc',
       searchtypes:false,
-      loadingstate:false
+      loadingstate:false,
+			comwbool:false
     }
   }
   onTablePagination = (page) => {
@@ -476,6 +477,16 @@ class CommonWorkList extends Component{
     this.fetchList()
   }
   fetchList = () => {
+			if(this.state.comwbool===true){
+				console.log('arg_course_group2');
+				console.log(this.state.arg_course_group);
+				return
+			}
+
+	  this.setState({
+			comwbool:true,
+		})
+  	//分班
     let workId=this.props.match.params.workId;
     let courseId=this.props.match.params.coursesId;
 
@@ -493,12 +504,23 @@ class CommonWorkList extends Component{
           moduleName: '作品列表'
         }))
       }
-     }).catch((error)=>{
+			setTimeout(() => {
+				this.setState({
+					comwbool:false,
+				})
+			}, 1000)
+    }).catch((error)=>{
        console.log(error)
 			this.setState({
 				isSpin:false,
         loadingstate:false
 			})
+			setTimeout(() => {
+				this.setState({
+					comwbool:false,
+				})
+			}, 1000)
+
      })
 
 
@@ -514,6 +536,7 @@ class CommonWorkList extends Component{
     })
   }
   courseGroupOptionChange = (values, isAllChecked) => {
+
     this.setState({arg_course_group: isAllChecked ? [] : values, page: 1}, () => {
       this.fetchList()
     })
@@ -792,10 +815,10 @@ class CommonWorkList extends Component{
           <div style={{ background: '#fff'}} className="workListContent">
              { isAdmin && hasData && <ul className="clearfix" style={{padding: "20px 40px 10px", position: 'relative', paddingLeft: '24px'}}>
 
-              <CheckAllGroup options={options_teacher_comment} label={'你的评阅：'} onChange={this.teacherCommentOptionChange}></CheckAllGroup>
+              <CheckAllGroup comwbool={this.state.comwbool} options={options_teacher_comment} label={'你的评阅：'} onChange={this.teacherCommentOptionChange}></CheckAllGroup>
-              <CheckAllGroup options={options_status} label={'作品状态：'} onChange={this.statusOptionChange}></CheckAllGroup>
+              <CheckAllGroup comwbool={this.state.comwbool} options={options_status} label={'作品状态：'} onChange={this.statusOptionChange}></CheckAllGroup>
-              {isGroup && <CheckAllGroup options={options_member_work} label={'组内角色：'} onChange={this.memberWorkChange}></CheckAllGroup>}
+              {isGroup && <CheckAllGroup comwbool={this.state.comwbool} options={options_member_work} label={'组内角色：'} onChange={this.memberWorkChange}></CheckAllGroup>}
-              {options_course_group.length > 1 && <CheckAllGroup options={options_course_group} label={'分班情况：'} onChange={this.courseGroupOptionChange} checkboxGroupStyle={{width: '980px'}}></CheckAllGroup>}
+              {options_course_group.length > 1 && <CheckAllGroup comwbool={this.state.comwbool} options={options_course_group} label={'分班情况：'} onChange={this.courseGroupOptionChange} checkboxGroupStyle={{width: '980px'}}></CheckAllGroup>}
 
 
               {/*   value={search} */}

public/react/src/modules/courses/common/button/CheckAllGroup.js

@@ -1,62 +1,69 @@
-import React,{ Component } from "react";
+import React,{ Component } from "react";
-import { WordsBtn } from "educoder";
+import { WordsBtn } from "educoder";
-import { Checkbox  } from 'antd'
+import { Checkbox  } from 'antd'
-const CheckboxGroup = Checkbox.Group;
+const CheckboxGroup = Checkbox.Group;
-
+
-class CheckAllGroup extends Component{
+class CheckAllGroup extends Component{
-  constructor(props){
+  constructor(props){
-    super(props);
+    super(props);
-    this.state = {
+    this.state = {
-      checkAll: true,
+      checkAll: true,
-      checkedValues: []
+      checkedValues: []
-    }
+    }
-  }
+  }
-  
+
-  onCheckAll = () => {
+  onCheckAll = () => {
-    this.setState({
+    this.setState({
-      'checkAll': true,
+      'checkAll': true,
-      checkedValues: []
+      checkedValues: []
-    })
+    })
-    this.props.onChange && this.props.onChange([], true);
+    this.props.onChange && this.props.onChange([], true);
-  }
+  }
-  onChange = (checkedValues) => {
+  onChange = (checkedValues) => {
-    if (checkedValues.length > 0) {
+  	try {
-      this.setState({
+			if(this.props.comwbool===true){
-        'checkAll': false,
+				return
-        checkedValues
+			}
-      })
+		}catch (e) {
-      this.props.onChange && this.props.onChange(checkedValues, false)
+
-    } else {
+		}
-      this.setState({
+    if (checkedValues.length > 0) {
-        'checkAll': true,
+      this.setState({
-        checkedValues: []
+        'checkAll': false,
-      })
+        checkedValues
-      this.props.onChange && this.props.onChange(checkedValues, true);
+      })
-    }
+      this.props.onChange && this.props.onChange(checkedValues, false)
-    console.log(checkedValues, arguments)
+    } else {
-  }
+      this.setState({
-
+        'checkAll': true,
-  render() {
+        checkedValues: []
-    let { label, options, checkboxGroupStyle }=this.props;
+      })
-    const { checkAll, checkedValues } = this.state;
+      this.props.onChange && this.props.onChange(checkedValues, true);
-    return (
+    }
-      <li className="clearfix">
+    console.log(checkedValues, arguments)
-        <style>{`
+  }
-        .groupList .ant-checkbox-group-item{
+
-          margin-bottom:5px;
+  render() {
-        }
+    let { label, options, checkboxGroupStyle }=this.props;
-        `}</style>
+    const { checkAll, checkedValues } = this.state;
-        <span className="fl mr10 color-grey-8">{label}</span>
+    return (
-        <span className="fl mr25">
+      <li className="clearfix">
-          <a href="javascript:void(0);" id="comment_no_limit" className={`pl10 pr10 ${checkAll ? 'check_on' : ''}`} onClick={this.onCheckAll}>全部</a>
+        <style>{`
-        </span>
+        .groupList .ant-checkbox-group-item{
-        <div className="fl groupList" style={{maxWidth:"990px"}}>
+          margin-bottom:5px;
-          {
+        }
-            options.length > 1 && <CheckboxGroup options={options} onChange={this.onChange} value={checkedValues} style={checkboxGroupStyle}/>
+        `}</style>
-          }
+        <span className="fl mr10 color-grey-8">{label}</span>
-        </div>
+        <span className="fl mr25">
-      </li>
+          <a href="javascript:void(0);" id="comment_no_limit" className={`pl10 pr10 ${checkAll ? 'check_on' : ''}`} onClick={this.onCheckAll}>全部</a>
-    )
+        </span>
-  }
+        <div className="fl groupList" style={{maxWidth:"990px"}}>
-}
+          {
-export default CheckAllGroup;
+            options.length > 1 && <CheckboxGroup options={options} onChange={this.onChange} value={checkedValues} style={checkboxGroupStyle}/>
+          }
+        </div>
+      </li>
+    )
+  }
+}
+export default CheckAllGroup;