forked from Gitlink/forgeplus-react
Merge branch 'gitlink_server' of https://git.trustie.net/Gitlink/forgeplus-react into gitlink_server
# Conflicts: # src/forge/Upload/Index.js
This commit is contained in:
commit
05c6a90553
|
@ -61,12 +61,6 @@ class Index extends Component {
|
|||
handleChange = (info) => {
|
||||
const { changeIsComplete } = this.props;
|
||||
changeIsComplete && changeIsComplete(true);
|
||||
const file = info.file;
|
||||
console.log(file);
|
||||
if(file && !file.type){
|
||||
let flag = this.checkFile(file.name);
|
||||
if(!flag) return;
|
||||
}
|
||||
if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
|
||||
let fileList = info.fileList;
|
||||
this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });
|
||||
|
@ -100,7 +94,7 @@ class Index extends Component {
|
|||
let flag = this.checkFile(file.name);
|
||||
if(!flag){
|
||||
this.props.showNotification(`暂不支持此格式文件的上传!`);
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
const { size } = this.props;
|
||||
|
|
Loading…
Reference in New Issue