diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index 433a9c250..7f5553e6c 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -2,7 +2,7 @@ import React,{Component} from "React"; import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Spin,Tooltip} from "antd"; import {Link} from 'react-router-dom'; import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor'; -import { WordsBtn,getUrl ,bytesToSize,getImageUrl} from 'educoder'; +import { WordsBtn,getUrl ,bytesToSize,getImageUrl,appendFileSizeToUploadFileAll} from 'educoder'; import axios from 'axios'; import Modals from '../../../modals/Modals'; const Search = Input.Search; @@ -116,12 +116,12 @@ class GraduationTasksSubmitedit extends Component{ } // 附件相关 START handleChange = (info) => { - let fileList = info.fileList; - // for(var list of fileList ){ - // console.log(list) - // } - this.setState({ fileList }); + if (info.file.status === 'uploading') { + + let fileList = info.fileList; + this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) }); + } } //onAttachmentRemove = (file) => { @@ -479,6 +479,18 @@ class GraduationTasksSubmitedit extends Component{ onChange: this.handleChange, onRemove: this.onAttachmentRemove, beforeUpload: (file) => { + // TODO 文件存在则提示并退出 + let gotSameFile = false; + this.state.fileList && this.state.fileList.some((item) => { + if (item.name && item.name.startsWith(file.name)) { + gotSameFile = true; + return true + } + }) + if (gotSameFile) { + this.props.showNotification("该附件已被上传!") + return false + } console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) { diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index bbe72a740..cfbd50453 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -2,7 +2,7 @@ import React,{Component} from "React"; import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Tooltip,Spin} from "antd"; import {Link} from 'react-router-dom'; import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor'; -import { WordsBtn,getUrl,getImageUrl,bytesToSize} from 'educoder'; +import { WordsBtn,getUrl,getImageUrl,bytesToSize,appendFileSizeToUploadFileAll} from 'educoder'; import axios from 'axios'; import Modals from '../../../modals/Modals'; const Search = Input.Search; @@ -123,12 +123,10 @@ class GraduationTasksSubmitnew extends Component{ } // 附件相关 START handleChange = (info) => { - let fileList = info.fileList; - - // for(var list of fileList ){ - // console.log(list) - // } - this.setState({ fileList }); + if (info.file.status === 'uploading') { + let fileList = info.fileList; + this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) }); + } } onAttachmentRemove = (file) => { @@ -478,6 +476,18 @@ render(){ onChange: this.handleChange, onRemove: this.onAttachmentRemove, beforeUpload: (file) => { + // TODO 文件存在则提示并退出 + let gotSameFile = false; + this.state.fileList && this.state.fileList.some((item) => { + if (item.name && item.name.startsWith(file.name)) { + gotSameFile = true; + return true + } + }) + if (gotSameFile) { + this.props.showNotification("该附件已被上传!") + return false + } console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) {