Merge branch 'dev_hjm_a' into dev_aliyun

public/react/src/AppConfig.js

@@ -212,7 +212,7 @@ function initOnlineOfflineListener() {
     $(window).bind("online", () => {
         notification.destroy()
         notification.success({
-            duration: null,
+            duration: 2,
             message: '网络恢复正常',
             description:
             '网络恢复正常，感谢使用。',

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

@@ -33,6 +33,7 @@ class commonWork extends Component{
       modalsBottomval:"",
       modalCancel:"",
       mainList:undefined,
+      selectedKeys: 'all',
       order:"",
       page:1,
       search:"",
@@ -77,7 +78,9 @@ class commonWork extends Component{
   componentDidUpdate(prevProps, prevState) {
     if (prevProps.match.path != this.props.match.path) {
       this.clearSelection()
+      this.setState({ selectedKeys: 'all', order: '' }, () => {
         this._getList()
+      })
     }
   }
   
@@ -143,6 +146,7 @@ class commonWork extends Component{
     this.clearSelection()
     this.setState({
       order:e.key==="all"?"":e.key,
+      selectedKeys: e.key,
       page:1,
       isSpin:true,
       checkBoxValues:[],
@@ -403,7 +407,7 @@ class commonWork extends Component{
             }
             secondRowBotton={
               <div className="fl mt6 task_menu_ul">
-                <Menu mode="horizontal" defaultSelectedKeys="all" onClick={this.selectedStatus}>
+                <Menu mode="horizontal" selectedKeys={this.state.selectedKeys} onClick={this.selectedStatus}>
                   <Menu.Item key="all">全部</Menu.Item>
                   {isAdmin && <Menu.Item key="0">未发布</Menu.Item>}
                   <Menu.Item key="1">提交中</Menu.Item>

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

@@ -302,7 +302,8 @@ class studentsList extends Component{
   }
   componentDidUpdate(prevProps) {
     if (prevProps.match.params.course_group_id != this.props.match.params.course_group_id) {
-      this.setState({checkBoxValues: []})
+      this.setState({checkBoxValues: [], checkAllValue: false })
+
       this.fetchAll(1)
     } 
     // 加载了2次