调整课堂模块列表筛选

public/react/src/modules/courses/Resource/index.js

@@ -567,7 +567,7 @@ class Fileslists extends Component{
 
     let {search,order,selectpage,checkAllValue,checkBoxValues}=this.state;
     let selectpagetype=selectpage===page&&checkBoxValues.length===15?true:false
-    console.log(selectpagetype)
+
 
     this.setState({
       page:page,

public/react/src/modules/courses/boards/index.js

@@ -282,9 +282,18 @@ class Boards extends Component{
     console.log('checked = ', checkedValues);
   }
   onPageChange = (pageNumber) => {
-  	this.setState({
-			checkBoxValues:[]
-		})
+    let {checkAllValue}=this.state;
+    if(checkAllValue===true){
+      this.setState({
+        checkBoxValues:[],
+        checkAllValue:false
+      })
+    }else{
+      this.setState({
+        checkBoxValues:[]
+      })
+    }
+
     this.fetchAll(null, pageNumber)
   }
 

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

@@ -73,6 +73,9 @@ class commonWork extends Component{
   componentDidUpdate(prevProps, prevState) {
 
     if (prevProps.coursesidtype != this.props.coursesidtype||prevProps.match.params.category_id!=this.props.match.params.category_id) {
+      this.setState({
+        page:1
+      })
       if (this.props.match.path === "/classrooms/:coursesId/common_homeworks/:category_id" || this.props.match.path === "/classrooms/:coursesId/common_homework/:category_id"||
         this.props.match.path === "/classrooms/:coursesId/group_homeworks/:category_id" || this.props.match.path === "/classrooms/:coursesId/group_homework/:category_id"
       ) {
@@ -220,11 +223,21 @@ class commonWork extends Component{
   }
 
   onPageChange=(pageNumber)=>{
-    this.setState({
-      page:pageNumber,
-			checkBoxValues:[]
-    })
-    let {search,order,category_id}=this.state;
+    let {search,order,category_id,checkAll}=this.state;
+
+    if(checkAll===true){
+      this.setState({
+        page:pageNumber,
+        checkBoxValues:[],
+        checkAll:false
+      })
+    }else{
+      this.setState({
+        page:pageNumber,
+        checkBoxValues:[]
+      })
+    }
+
     this.getList(pageNumber,search,order,category_id);
   }
 

public/react/src/modules/courses/coursesHome/CoursesHome.js

@@ -121,7 +121,7 @@ class CoursesHome extends Component {
 
     const { order, page, coursesHomelist } = this.state;
     const { user, tojoinclass } = this.props
-    console.log(tojoinclass, '--------------s')
+
     return (
       <div>
         {this.state.updata === undefined ? "" : <UpgradeModals

public/react/src/modules/courses/graduation/topics/index.js

@@ -170,7 +170,7 @@ class Boards extends Component{
     })
     let {status,searchValue}=this.state;
     this.fetchAll(searchValue,pageNum,status);
-    console.log(this.state.checkBoxValues);
+
   }
 
   // 筛选

public/react/src/modules/courses/poll/Poll.js

@@ -150,12 +150,21 @@ class Poll extends Component{
 	}
   //切换分页
   changePage=(pageNumber)=>{
+    let{type,StudentList_value,checkAllValue}=this.state;
+
+    if(checkAllValue===true){
+      this.setState({
+        page:pageNumber,
+        checkBoxValues:[],
+        checkAllValue:false
+      })
+    }else{
+      this.setState({
+        page:pageNumber,
+        checkBoxValues:[]
+      })
+    }
 
-    this.setState({
-      page:pageNumber,
-			checkBoxValues:[]
-    })
-    let{type,StudentList_value}=this.state
     this.InitList(type,StudentList_value,pageNumber);
   }
   // 搜索

public/react/src/modules/courses/shixunHomework/shixunHomework.js

@@ -637,12 +637,19 @@ class ShixunHomework extends Component{
   // }
 
   PaginationCourse=(pageNumber)=>{
-    let {Coursename,order}=this.state;
-
-    this.setState({
-      page:pageNumber,
-			checkBoxValues:[]
-    })
+    let {Coursename,order,checkedtype}=this.state;
+     if(checkedtype===true){
+       this.setState({
+         page:pageNumber,
+         checkBoxValues:[],
+         checkedtype:false
+       })
+     }else{
+       this.setState({
+         page:pageNumber,
+         checkBoxValues:[],
+       })
+     }
 
     this.homeworkupdatalist(Coursename,pageNumber,order);
 

public/react/src/modules/tpm/shixunchild/Challenges/Showmarkdown.js

@@ -11,15 +11,15 @@ class Showmarkdown extends Component {
   componentDidMount() {
 
     if (this.props.descriptions) {
-      setTimeout(()=>{
-        var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
+
+      window.editormd.markdownToHTML("memo_content_editorMd", {
           htmlDecode: "style,script,iframe",  // you can filter tags decode
           taskList: true,
           tex: true,  // 默认不解析
           flowChart: true,  // 默认不解析
           sequenceDiagram: true // 默认不解析
         });
-      }, 200)
+
     }
   }