Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank

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

@@ -181,15 +181,16 @@ class BoardsNew extends Component{
   }
   // 附件相关 START
   handleChange = (info) => {
-    let fileList = info.fileList;
-    this.setState({ fileList: appendFileSizeToUploadFileAll(fileList)
-    });
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+      let fileList = info.fileList;
+      this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });
+    }
   }
   onAttachmentRemove = (file) => {
 		if(!file.percent || file.percent == 100){
-			confirm({
+			this.props.confirm({
 				// title: '确定要删除这个附件吗?',
-				title: '是否确认删除?',
+				content: '是否确认删除?',
 
 				okText: '确定',
 				cancelText: '取消',

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

@@ -291,7 +291,7 @@ class CommonWorkPost extends Component{
   }
   // 附件相关 START
   handleChange = (info) => {
-    if (info.file.status === 'uploading' || info.file.status === 'done') {
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
       let fileList = info.fileList;
 
       this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });

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

@@ -235,12 +235,16 @@ class NewWork extends Component{
   }
 
   handleContentUploadChange = (info) => {
-    let contentFileList = info.fileList;
-    this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList) });
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+      let contentFileList = info.fileList;
+      this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList) });
+    }
   }
   handleAnswerUploadChange = (info) => {
-    let answerFileList = info.fileList;
-    this.setState({ answerFileList: appendFileSizeToUploadFileAll(answerFileList) });
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+      let answerFileList = info.fileList;
+      this.setState({ answerFileList: appendFileSizeToUploadFileAll(answerFileList) });
+    }
   }
   
   onAttachmentRemove = (file, stateName) => {

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js

@@ -116,7 +116,7 @@ class GraduationTasksSubmitedit extends Component{
 			this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });
 		}
 
-		if (info.file.status === 'done') {
+		if (info.file.status === 'done' || info.file.status === 'removed') {
 			let fileList = info.fileList;
 			this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });
 		}

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js

@@ -125,7 +125,7 @@ class GraduationTasksSubmitnew extends Component{
 			this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });
 		}
 
-		if (info.file.status === 'done') {
+		if (info.file.status === 'done' || info.file.status === 'removed') {
 			let fileList = info.fileList;
 			this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });
 		}

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

@@ -553,7 +553,7 @@ class MemoNew extends Component {
       return attachments;
     }
     handleChange = (info) => {
-      if (info.file.status === 'uploading' || info.file.status === 'done') {
+      if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
         let fileList = info.fileList;
         this.setState({ 
           fileList: appendFileSizeToUploadFileAll(fileList)

public/react/src/modules/moop_cases/CaseNew.js

@@ -92,7 +92,7 @@ class CaseNew extends Component{
   }
   // 上传附件-change
   handleContentUploadChange = (info) => {
-    if (info.file.status === 'done' || info.file.status === 'uploading') {
+    if (info.file.status === 'done' || info.file.status === 'uploading' || info.file.status === 'removed') {
       let contentFileList = info.fileList;
       this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList)});
       let list = appendFileSizeToUploadFileAll(contentFileList);