Merge remote-tracking branch 'origin/master'

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

@@ -313,18 +313,14 @@ class BoardsNew extends Component{
             </p>
             {/* notRequired */}
             <Form {...formItemLayout} onSubmit={this.handleSubmit}>
-              <div className="formBlock" style={{paddingBottom: '0px'}}>
+              <div className="formBlock" style={{paddingBottom: '0px', position: 'relative'}}>
-                <Form.Item
+                {  isAdmin && 
-                  label="标题"
-                  className="topicTitle "
-                >
-                  {  isAdmin && 
                     <React.Fragment>
                       {getFieldDecorator('sticky', {
                         valuePropName: 'checked',
                       })(
-                        isAdmin && <Checkbox style={{ right: '0px',
+                        isAdmin && <Checkbox style={{ right: '22px',
-                          top: '-50px',
+                          top: '28px',
                           position: 'absolute'
                         }}>置顶</Checkbox>
                       )}
@@ -332,6 +328,11 @@ class BoardsNew extends Component{
                       <span style={{ "padding-left": 0, "padding-right": 0 }}></span>
                     </React.Fragment>
                   }
+                <Form.Item
+                  label="标题"
+                  className="topicTitle "
+                >
+                  
                   {getFieldDecorator('subject', {
                     rules: [{
                       required: true, message: '请输入标题',

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

@@ -369,7 +369,7 @@ class NewWork extends Component{
           </p> */}
           <CBreadcrumb items={[
             { to: `/courses/${courseId}`, name: this.state.course_name},
-            { to: `/courses/${courseId}/${moduleEngName}/${category && category.category_id ? category.category_id : ''}`, name: category.category_name },
+            { to: `/courses/${courseId}/${moduleEngName}/${category && category.category_id ? category.category_id : ''}`, name: moduleName },
             { name: `${ this.isEdit ? '编辑' : '新建'}` }
           ]}></CBreadcrumb>
           

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

@@ -128,7 +128,7 @@ class commonWork extends Component{
   }
   //筛选条件
   selectedStatus=(e)=>{
-
+    this.clearSelection()
     this.setState({
       order:e.key==="all"?"":e.key,
       page:1,