Shellmiao 4 лет назад
Родитель
Сommit
ce07b8aa6e

+ 17 - 10
src/components/Page/UploadFile.js

@@ -15,7 +15,8 @@ class UploadFile extends Component {
     state = {
         fileList: [],
         files: '',
-        file_name: ''
+        file_name: '',
+        isEn: false
     }
 
     constructor(props) {
@@ -26,9 +27,19 @@ class UploadFile extends Component {
     }
 
     clickButton = () => {
-        let e = document.createEvent('MouseEvents');
-        e.initEvent('click', true, true)
-        document.getElementById('upload-file-form-button').dispatchEvent(e)
+        if (!this.state.isEn) {
+            let e = document.createEvent('MouseEvents');
+            e.initEvent('click', true, true)
+            document.getElementById('upload-file-form-button').dispatchEvent(e)
+        } else {
+
+        }
+    }
+
+    setIsEn = () => {
+        this.setState({
+            isEn: !this.state.isEn
+        })
     }
 
     handleUploadFile = () => {
@@ -36,16 +47,11 @@ class UploadFile extends Component {
         var formData = new FormData();
         fileList.forEach(file => {
             formData.append('file', file);
+            console.log('大小为:' + file.size)
         })
         formData.append('username', getCookie('username'))
         formData.append('token', getCookie('token'))
         formData.append('father_folder_id', this.props.fatherFolderId)
-        // let data = {
-        //     username: getCookie('username'),
-        //     token: getCookie('token'),
-        //     father_folder_id: this.props.fatherFolderId,
-        //     fileList: fileList,
-        // }
         apiUploadFile(formData).then(res => {
             if (res.data.code === 200) {
                 message.success('添加成功');
@@ -101,6 +107,7 @@ class UploadFile extends Component {
                     animated={true}
                     centered={true}
                     tabBarGutter={50}
+                    onChange={this.setIsEn}
                 >
                     <TabPane
                         tab='Not Encrypted'

+ 2 - 2
src/components/Page/UploadFileModal.js

@@ -45,7 +45,7 @@ class UploadFileModal extends Component {
     render() {
         return (
             <div className={'upload-file-modal'}>
-                <Button type="primary" onClick={this.showModal} icon={<UploadOutlined />}>
+                <Button type="primary" onClick={this.showModal} icon={<UploadOutlined/>}>
                     UPLOAD
                 </Button>
                 <Modal
@@ -57,7 +57,7 @@ class UploadFileModal extends Component {
                 >
                     <div>
                         <UploadFile onRef={c => this.Child = c} cdFolder={this.props.cdFolder}
-                                    fatherFolderId={this.props.fatherFolderId}/>
+                                    fatherFolderId={this.props.fatherFolderId} setVisible={this.setVisible.bind(this)}/>
                     </div>
                 </Modal>
             </div>

+ 1 - 1
src/utils/Axios/Axios.js

@@ -5,7 +5,7 @@ import '../encrypt/aes'
 
 let fetch = axios.create({
     baseURL: "http://api.ignatz.xyz/", // 这里是本地express启动的服务地址
-    timeout: 5000 // request timeout
+    // timeout: 5000 // request timeout
 })
 // fetch.defaults.withCredentials = true
 fetch.interceptors.request.use(config => {

+ 1 - 1
src/utils/Axios/UploadFile.js

@@ -4,7 +4,7 @@ import qs from 'qs'
 // 实例对象
 let instance = axios.create({
     baseURL: "http://api.ignatz.xyz/", // 这里是本地express启动的服务地址
-    timeout: 5000, // request timeout
+    // timeout: 5000, // request timeout
     headers: {
         // 'Content-Type': 'application/x-www-form-urlencoded'multipart/form-data
         'Content-Type': 'multipart/form-data;charset=UTF-8'

+ 1 - 1
src/utils/encrypt/encrypt.js

@@ -16,7 +16,7 @@ class EncryptObj {
 
     fetch = axios.create({
         baseURL: "http://api.ignatz.xyz/", // 这里是本地express启动的服务地址
-        timeout: 5000 // request timeout
+        // timeout: 5000 // request timeout
     })
 
     encrypt = content => {