Merge branch 'dev_hjm_a' into dev_aliyun

# Conflicts:
#	public/react/src/modules/forums/MemoDetailMDEditor.js

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

@@ -108,7 +108,7 @@ function buildColumns(that, student_works, studentData) {
   }]
   if (!niPingAndIsStudent && isAdminOrStudent) {
     columns.push({
-      width: 88,
+      width: isStudent ? undefined : 88,
       title: '学号',
       dataIndex: 'student_id',
       key: 'student_id',
@@ -197,7 +197,7 @@ function buildColumns(that, student_works, studentData) {
       </span>
     )},
   }, {
-    width: 106,
+    width: 106, // isStudent ? undefined : 106 ,  // 匿评中 只有这几列： 序号 姓名 提交状态 更新时间 匿评评分 操作
     title: '更新时间',
     dataIndex: 'update_time',
     key: 'update_time',

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

@@ -126,7 +126,9 @@ function buildColumns(that) {
       sortOrder: sortedInfo.columnKey === 'graduation_group' && sortedInfo.order,
 
       render: text => (
-        <span>
+        <span className="overflowHidden1" style={{ maxWidth: '160px'}}
+            title={`${text && text.length > 10 ? title : ''}`}
+        >
           {text}
         </span>
       ),

public/react/src/modules/forums/MemoDetailMDEditor.js

@@ -57,6 +57,7 @@ class MemoDetailMDEditor extends Component {
 						errorMsg: ''
 					})
 				})
+				commentMDEditor.cm.focus()
 			}, {
 				watch: false,
 				dialogLockScreen: false,
@@ -124,7 +125,7 @@ class MemoDetailMDEditor extends Component {
 			this.initMDEditor()
 		} else {
 			setTimeout(() => {
-				this.commentMDEditor && this.commentMDEditor.focus()
+				this.commentMDEditor && this.commentMDEditor.cm.focus()
 			}, 10)
 		}
 	}