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

public/react/src/modules/courses/Resource/index.js

@@ -822,9 +822,7 @@ class Fileslists extends Component{
                     max-height:350px;
                     overflow-y: auto;
                    }
-                  .drop_down_menu li {
-									 overflow: visible;
-									 }
+              
 									 .courseSecond{
 								    margin-left: 10px;
     								padding: 10px;

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

@@ -186,6 +186,7 @@ class BoardsNew extends Component{
     });
   }
   onAttachmentRemove = (file) => {
+		if(file.response!=undefined){
 			confirm({
 				// title: '确定要删除这个附件吗?',
 				title: '是否确认删除?',
@@ -204,6 +205,8 @@ class BoardsNew extends Component{
 
 			return false;
 		}
+
+  }
   deleteAttachment = (file) => {
     // 初次上传不能直接取uid
     const url = `/attachments/${file.response ? file.response.id : file.uid}.json`

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

@@ -320,10 +320,13 @@ class CommonWorkPost extends Component{
     //   ModalSave: ()=>this.deleteAttachment(file),
     //   ModalCancel:this.cancelAttachment
     // })
+		if(file.response!=undefined){
 			this.deleteAttachment(file)
 			return false;
 		}
 
+  }
+
   cancelAttachment=()=>{
     this.setState({
       Modalstype:false,

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

@@ -243,6 +243,7 @@ class NewWork extends Component{
   }
   
   onAttachmentRemove = (file, stateName) => {
+		if(file.response!=undefined){
 			this.props.confirm({
 				content: '是否确认删除?',
 
@@ -257,6 +258,8 @@ class NewWork extends Component{
 
 			return false;
 		}
+
+  }
   deleteAttachment = (file, stateName) => {
     // 初次上传不能直接取uid
     const url = `/attachments/${file.response ? file.response.id : file.uid}.json`

public/react/src/modules/courses/coursesPublic/AccessoryModal.js

@@ -73,9 +73,10 @@ class AccessoryModal extends Component{
     //   ModalCancel:this.cancelAttachment
     // })
     // return false;
-
+		if(file.response!=undefined){
 			this.deleteAttachment(file);
 		}
+  }
 
 
 

public/react/src/modules/courses/coursesPublic/AccessoryModal2.js

@@ -64,10 +64,12 @@ class AccessoryModal2 extends Component{
     //   ModalCancel:this.cancelAttachment
     // })
     // return false;
-
+		if(file.response!=undefined){
 			this.deleteAttachment(file);
 		}
 
+  }
+
 
 
 

public/react/src/modules/courses/coursesPublic/SelectSetting.js

@@ -296,8 +296,7 @@ class Selectsetting extends Component{
 
 
 	onAttachmentRemove = (file) => {
-
-		// const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+		if(file.response!=undefined){
 			const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
 			axios.delete(url, {
 				})
@@ -327,6 +326,14 @@ class Selectsetting extends Component{
 			this.setState({
 				fileListtype:false,
 			})
+		}else{
+			this.setState({
+				fileListtype:false,
+				fileList:[]
+			})
+		}
+		// const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+
 	}
 
 	onChangeTimepublishs= (date, dateString,key) => {

public/react/src/modules/courses/coursesPublic/sendResource.js

@@ -132,7 +132,7 @@ class Sendresource extends Component{
 
 
 	onAttachmentRemove = (file) => {
-debugger
+	 if(file.response!=undefined){
 		 const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
 		 axios.delete(url, {
 			 })
@@ -154,6 +154,12 @@ debugger
 		 this.setState({
 			 fileListtype:false,
 		 })
+	 }else{
+		 this.setState({
+			 fileListtype:false,
+			 fileList:[]
+		 })
+	 }
 	}
 
 	ModalCancelModalCancel=()=>{

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

@@ -157,6 +157,7 @@ class GraduationTasksSubmitedit extends Component{
   }
 
 	onAttachmentRemove = (file) => {
+		if(file.response!=undefined){
 			let {attachments,fileList}=this.state;
 			const url = `/attachments/${file}.json`
 			axios.delete(url, {
@@ -202,6 +203,8 @@ class GraduationTasksSubmitedit extends Component{
 				});
 		}
 
+  }
+
   inputSearchValue=(e)=>{
 
     if(e.target.value===""){

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

@@ -146,7 +146,7 @@ class GraduationTasksSubmitnew extends Component{
     //   },
     // });
     // return false;
-
+		if(file.response!=undefined){
 			this.setState({
 				Modalstype:true,
 				Modalstopval:'确定要删除这个附件吗?',
@@ -156,6 +156,8 @@ class GraduationTasksSubmitnew extends Component{
 			return false;
 		}
 
+  }
+
   cancelAttachment=()=>{
     this.setState({
       Modalstype:false,

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

@@ -88,6 +88,7 @@ class GraduationTasksappraiseMainEditor extends Component{
     this.setState({ fileList });
   }
   onAttachmentRemove = (file, stateName) => {
+		if(file.response!=undefined){
 			this.props.confirm({
 				content: '确定要删除这个附件吗?',
 				okText: '确定',
@@ -104,6 +105,8 @@ class GraduationTasksappraiseMainEditor extends Component{
 
 			return false;
 		}
+
+  }
   deleteAttachment = (file, stateName) => {
     // 初次上传不能直接取uid
     const url = `/attachments/${file.response ? file.response.id : file.uid}.json`

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

@@ -148,6 +148,7 @@ class GraduationTasksedit extends Component{
   }
 
 	onAttachmentRemove = (file) => {
+		if(file.response!=undefined){
 			// debugger
 			this.cancelAttachment();
 			const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
@@ -183,6 +184,8 @@ class GraduationTasksedit extends Component{
 				});
 		}
 
+  }
+
   Commoninterface=(fileList)=>{
     let listid=[]
     let graduation_id=this.state.data.graduation_id;

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

@@ -173,6 +173,7 @@ class GraduationTasksnew extends Component {
 	}
 
 	onAttachmentRemove = (file) => {
+		if(file.response!=undefined){
 			const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
 			// const url = `/attachments/${file}.json`
 			axios.delete(url, {})
@@ -199,6 +200,8 @@ class GraduationTasksnew extends Component {
 				});
 		}
 
+	}
+
 	//滚动
 	ifHasAnchorJustScorll() {
 		// let anchor = this.getURLStuff("anchor");

public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js

@@ -215,6 +215,8 @@ class GraduateTopicNew extends Component{
     this.setState({ fileList });
   }
   onAttachmentRemove = (file) => {
+
+		if(file.response!=undefined){
 			confirm({
 				title: '确定要删除这个附件吗?',
 				okText: '确定',
@@ -229,6 +231,8 @@ class GraduateTopicNew extends Component{
 			});
 			return false;
 		}
+
+  }
   deleteAttachment = (file) => {
     console.log(file);
     let id=file.response ==undefined ? file.id : file.response.id

public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js

@@ -163,6 +163,7 @@ class GraduateTopicPostWorksNew extends Component{
     this.setState({ fileList });
   }
   onAttachmentRemove = (file) => {
+		if(file.response!=undefined){
 			confirm({
 				title: '确定要删除这个附件吗?',
 				okText: '确定',
@@ -179,6 +180,9 @@ class GraduateTopicPostWorksNew extends Component{
 
 			return false;
 		}
+
+
+  }
   deleteAttachment = (file) => {
     const url = `/attachments/${file.id}.json`
     axios.delete(url, {

public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js

@@ -73,6 +73,7 @@ class CreateGroupByImportModal extends Component{
   }
 
   onAttachmentRemove = (file) => {
+		if(file.response!=undefined){
 			this.props.confirm({
 				content: '是否确认删除?',
 
@@ -86,6 +87,8 @@ class CreateGroupByImportModal extends Component{
 
 			return false;
 		}
+
+  }
   deleteAttachment = (file) => {
     const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
     axios.delete(url, {

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

@@ -561,6 +561,7 @@ class MemoNew extends Component {
       }
     }
     onAttachmentRemove = (file) => {
+			if(file.response!=undefined){
 				this.props.confirm({
 					// title: '确定要删除这个附件吗?',
 					content: '是否确认删除?',
@@ -577,6 +578,8 @@ class MemoNew extends Component {
 				});
 				return false;
 			}
+
+    }
     deleteAttachment = (file) => {
       // 初次上传不能直接取uid
       const url = `/attachments/${file.response ? file.response.id : file.uid}.json`

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

@@ -47,6 +47,7 @@ class CaseNew extends Component{
 
   // 上传附件-删除确认框
   onAttachmentRemove = (file, stateName) => {
+		if(file.response!=undefined){
 			this.props.confirm({
 				content: '是否确认删除?',
 				onOk: () => {
@@ -59,6 +60,8 @@ class CaseNew extends Component{
 			return false;
 		}
 
+  }
+
   // 上传附件-确认删除
   deleteAttachment = (file, stateName) => {
     // 初次上传不能直接取uid

public/react/src/modules/tpm/TPMsettings/TPMsettings.js

@@ -1384,6 +1384,7 @@ export default class TPMsettings extends Component {
 	}
 
 	onAttachmentRemove = (file) => {
+		if(file.response!=undefined){
 			confirm({
 				title: '确定要删除这个附件吗?',
 				okText: '确定',
@@ -1400,6 +1401,8 @@ export default class TPMsettings extends Component {
 			return false;
 		}
 
+	}
+
 	deleteAttachment = (file) => {
 		console.log(file);
 		let id=file.response ==undefined ? file.id : file.response.id

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -772,6 +772,7 @@ class Newshixuns extends Component {
 
     }
     onAttachmentRemove = (file) => {
+			if(file.response!=undefined){
 				confirm({
 					title: '确定要删除这个附件吗?',
 					okText: '确定',
@@ -787,6 +788,8 @@ class Newshixuns extends Component {
 				});
 				return false;
 			}
+
+    }
     deleteAttachment = (file) => {
          console.log(file);
         let id=file.response ==undefined ? file.id : file.response.id