Merge branches 'dev_jupyter' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

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

@@ -156,8 +156,10 @@ class TPMDataset extends Component {
 						selectedRowKeysdata:[],
 						selectedRowKeys: [],
 						checked:false,
+						page:1,
 					});
 
+
 				}
 
 			}
@@ -209,6 +211,7 @@ class TPMDataset extends Component {
 						selectedRowKeysdata:[],
 						selectedRowKeys: [],
 						checked:false,
+						page:page,
 					});
 				}
 
@@ -298,10 +301,19 @@ class TPMDataset extends Component {
 			this.setState({
 				fileList: appendFileSizeToUploadFileAll(fileList),
 			});
+
 			if(info.file.status === 'done'){
 				//done 成功就会调用这个方法
-				this.getdatas();
+				if(info.file.response){
+					if(info.file.response.status===-1||info.file.response.status==="-1"){
+
+					}else{
+						this.getdatas();
+
+					}
+				}
 			}
+
        if(info.file.response){
 				 if(info.file.response.status===-1||info.file.response.status==="-1"){
 					 // console.log("准备显示弹框了");
@@ -318,6 +330,8 @@ class TPMDataset extends Component {
 						 tittest:info.file.response.message,
 						 itemtypebool:itemtype>-1?true:itemtype<=-1?false:false,
 					 })
+				 }else{
+
 				 }
 			 }