From 57e2323dbf4334fe247e610775e700ea8506ee95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 11 Dec 2019 15:45:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/TPMIndex.js      |  2 +-
 .../tpm/TPMsettings/Shixuninformation.js      | 11 +--
 .../modules/tpm/TPMsettings/TPMsettings.js    | 13 ----
 .../src/modules/tpm/newshixuns/Newshixuns.js  | 73 ++++++++++++++++++-
 4 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMIndex.js b/public/react/src/modules/tpm/TPMIndex.js
index f80691d56..9c82e987d 100644
--- a/public/react/src/modules/tpm/TPMIndex.js
+++ b/public/react/src/modules/tpm/TPMIndex.js
@@ -20,7 +20,7 @@ import TPMRepositoryComponent from './TPMRepositoryComponent';
 
 import TPMRepositoryCommits from './shixunchild/Repository/TPMRepositoryCommits';
 
-import TPMsettings from './TPMsettings/oldTPMsettings';
+import TPMsettings from './TPMsettings/TPMsettings';
 
 import TPMChallengeComponent from './TPMChallengeContainer';
 import TPMPropaedeuticsComponent from './TPMPropaedeuticsComponent';
diff --git a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
index f4e18a6c1..eb7dba596 100644
--- a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
+++ b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
@@ -103,9 +103,10 @@ class Shixuninformation extends Component {
         return isLt150M;
       },
     }
+
     return (
       <div>
-        <Form onSubmit={this.handleSubmit}>
+        <Form>
           <Form.Item
             label="名称"
             style={{"borderBottom": 'none'}}
@@ -300,12 +301,12 @@ class Shixuninformation extends Component {
               </div>
             </div>
           </div>
+        </Form>
 
 
-          <Form.Item label="私密版本库：">
-            <span className="ant-form-text"><Checkbox>（若需要对学员隐藏部分版本库内容时，请选中；选中即启用私密版本库，请将需要对学员隐藏的文件存储在私密版本库）</Checkbox></span>
-          </Form.Item>
-        </Form>
+        <span className="ant-form-text mt20" >私密版本库：
+            <Checkbox>（若需要对学员隐藏部分版本库内容时，请选中；选中即启用私密版本库，请将需要对学员隐藏的文件存储在私密版本库）</Checkbox>
+        </span>
 
         {this.props.identity<3?<div className="edu-back-white padding40-20 mb20">
           <p className="color-grey-6 font-16 mb30">服务配置</p>
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index fe99c8ca7..4540b5e60 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -1,20 +1,7 @@
 import React, {Component} from 'react';
 
 import {
-  Input,
-  Select,
-  Radio,
-  Checkbox,
-  Popconfirm,
-  message,
-  Modal,
-  Icon,
-  DatePicker,
-  Breadcrumb,
-  Upload,
   Button,
-  notification,
-  Tooltip,
   Tabs
 } from 'antd';
 
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index 82512a0ae..df16b2575 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -31,6 +31,7 @@ class Newshixuns extends Component {
       runtime: undefined,
       run_method: undefined,
       postapplyvisible: undefined,
+      fileList: [],
     }
   }
 
@@ -312,6 +313,76 @@ class Newshixuns extends Component {
     }
   }
 
+
+  // 附件相关 START
+  handleChange = (info) => {
+    if(info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+      let {fileList} = this.state;
+
+      if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+        console.log("handleChange1");
+        // if(fileList.length===0){
+        let fileLists = info.fileList;
+        this.setState({
+          // fileList:appendFileSizeToUploadFileAll(fileList),
+          fileList: fileLists,
+          deleteisnot: false
+        });
+        // }
+      }
+    }
+  }
+
+  onAttachmentRemove = (file) => {
+    if(!file.percent || file.percent == 100){
+      confirm({
+        title: '确定要删除这个附件吗?',
+        okText: '确定',
+        cancelText: '取消',
+        // content: 'Some descriptions',
+        onOk: () => {
+          console.log("665")
+          this.deleteAttachment(file)
+        },
+        onCancel() {
+          console.log('Cancel');
+        },
+      });
+      return false;
+    }
+
+  }
+
+  deleteAttachment = (file) => {
+    console.log(file);
+    let id=file.response ==undefined ? file.id : file.response.id
+    const url = `/attachments/${id}.json`
+    axios.delete(url, {
+    })
+      .then((response) => {
+        if (response.data) {
+          const { status } = response.data;
+          if (status == 0) {
+            // console.log('--- success')
+
+            this.setState((state) => {
+
+              const index = state.fileList.indexOf(file);
+              const newFileList = state.fileList.slice();
+              newFileList.splice(index, 1);
+              return {
+                fileList: newFileList,
+                deleteisnot:true
+              };
+            });
+          }
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  }
+
   render() {
     const {getFieldDecorator} = this.props.form;
     const {newshixunlist, fileList, postapplytitle, postapplyvisible} = this.state;
@@ -521,7 +592,7 @@ class Newshixuns extends Component {
                                 {this.state.mainvalues === undefined && this.state.subvalues === undefined ? "" :
                                   <div className={"font-12"} style={{'max-width':'700px'}}>
                                     {`已安装软件：${this.state.mainvalues===undefined?"":this.state.mainvalues}${this.state.subvalues===undefined?"":this.state.subvalues}`}
-                                    {`说明：添加了${this.state.mainvalues===undefined?"":this.state.mainvalues}${this.state.subvalues===undefined?"":this.state.subvalues}`}
+                                    {`    说明：添加了${this.state.mainvalues===undefined?"":this.state.mainvalues}${this.state.subvalues===undefined?"":this.state.subvalues}`}
                                   </div>}
 
                               </div>