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

public/react/src/modules/courses/members/studentsList.js

@@ -8,7 +8,7 @@ import CourseLayoutcomponent from '../common/CourseLayoutComponent'
 import Titlesearchsection from '../common/titleSearch/TitleSearchSection'
 import ColorCountText from '../common/titleSearch/ColorCountText'
 
-import { WordsBtn, trigger, on, off } from 'educoder'
+import { WordsBtn, trigger, on, off ,downloadFile} from 'educoder'
 import Modals from "../../modals/Modals";
 import axios from 'axios'
 import _ from 'lodash'
@@ -152,7 +152,16 @@ class studentsList extends Component{
         }
       }else {
         this.props.showNotification(`正在下载中`);
-        window.open("/api"+url, '_blank');
+        // window.open("/api"+url, '_blank');
+        downloadFile({
+          url: url,
+          successCallback: (url) => {
+            console.log('successCallback')
+          },
+          failCallback: (responseHtml, url) => {
+            console.log('failCallback')
+          }
+        })
       }
     }).catch((error) => {
       console.log(error)
@@ -512,7 +521,10 @@ class studentsList extends Component{
 
     const params = {}
     if (checkBoxValues) {
-      params.group_id = course_group_id
+      if(course_group_id){
+        params.group_id = course_group_id
+      }
+
     }
     if (searchValue) {
       searchValue = searchValue.trim()

public/stylesheets/educoder/edu-all.css

@@ -3680,11 +3680,11 @@ a.singlepublishtwo{
 
 .topsj{
     position: absolute;
-    top: -6px;
+    top: -5px;
 }
 .bottomsj{
     position: absolute;
-    bottom: -6px;
+    bottom: -5px;
 }
 .touchSelect .ant-spin-dot-spin{
     margin-top: 30% !important;