From 321e902baf12ed84acd2f0a23951cea5297f64a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 25 Jun 2019 16:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesPublic/SelectSetting.js    |   2 +-
 .../tasks/GraduationTasksSubmitedit.js        |   4 +-
 .../tasks/GraduationTasksSubmitnew.js         |  40 ++++++-
 .../tasks/GraduationTasksappraise.js          |   2 +-
 .../tasks/GraduationTaskssetting.js           | 113 ++++++++----------
 .../react/src/modules/forums/RightSection.css |   2 +-
 6 files changed, 90 insertions(+), 73 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
index 0bb06fccb..2b4b935ba 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
@@ -613,7 +613,7 @@ class Selectsetting extends Component{
 										{item.name}
 									</span>
 										<span className="color656565 mt2 color-grey-6 font-12 mr8">
-										{item.response===undefined?"":isNaN(this.props.bytesToSize(item.response.filesize))?"":this.props.bytesToSize(item.response.filesize)}
+										{item.response===undefined?"":isNaN(this.props.bytesToSize(item.response.filesize))?"123":this.props.bytesToSize(item.response.filesize)}
 									</span>
 										<i className="font-14 iconfont  icon-guanbi "
 											 id={item.response===undefined?"":item.response.id}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index a4202b6da..1ba465dfe 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 } from 'educoder';
+import { WordsBtn,getUrl ,bytesToSize} from 'educoder';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
 const Search = Input.Search;
@@ -577,7 +577,7 @@ class GraduationTasksSubmitedit extends Component{
 										{item.name}
 									</span>
 												<span className="color656565 mt2 color-grey-6 font-12 mr8">
-										{item.response===undefined?"":isNaN(this.props.bytesToSize(item.response.filesize))?"":this.props.bytesToSize(item.response.filesize)}
+										{item.response===undefined?"":bytesToSize(item.size)}
 									</span>
 												<i className="font-14 iconfont  icon-guanbi "
 													 id={item.response===undefined?"":item.response.id}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index 52ac6ae61..b2f28e9b3 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} from 'educoder';
+import { WordsBtn,getUrl,getImageUrl,bytesToSize} from 'educoder';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
 const Search = Input.Search;
@@ -263,7 +263,7 @@ class GraduationTasksSubmitnew extends Component{
   }
 
   deleteAttachment = (file) => {
-    const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+    const url = `/attachments/${file}.json`
     axios.delete(url, {
     })
       .then((response) => {
@@ -446,7 +446,7 @@ render(){
     multiple: true,
     // https://github.com/ant-design/ant-design/issues/15505
     // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
-    // showUploadList: false,
+		showUploadList: false,
     action: `${getUrl()}/api/attachments.json`,
     onChange: this.handleChange,
     onRemove: this.onAttachmentRemove,
@@ -545,7 +545,39 @@ render(){
             </Button>
             <span className={"color-grey-9"}>(单个文件150M以内)</span>
           </Upload>
-        </div>
+					<style>
+						{
+							`
+								.maxwidth500{
+										max-width:500px;
+										overflow: hidden;
+										text-overflow: ellipsis;
+										white-space: nowrap;
+										 color: #05101a;
+								}
+								`
+						}
+					</style>
+					{this.state.fileList.length===0?"":this.state.fileList.map((item,key)=>{
+						return(
+							<p className="color-grey mt10" key={key}  >
+								<a className="color-grey fl">
+									<i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
+								</a>
+								<span className="mr12 color9B9B maxwidth500 fl" length="58">
+										{item.name}
+									</span>
+								<span className="color656565 mt2 color-grey-6 font-12 mr8">
+										{item.response===undefined?"":bytesToSize(item.size)}
+									</span>
+								<i className="font-14 iconfont  icon-guanbi "
+									 id={item.response===undefined?"":item.response.id}
+									 aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.response===undefined?"":item.response.id&&item.response.id)}></i>
+							</p>
+						)
+					})}
+
+				</div>
 
 
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index f7f843feb..28955e268 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -258,7 +258,7 @@ class GraduationTasksappraise extends Component{
                     </div>
 
 
-										<div className="color-grey" key={key}>
+										<div className="color-grey">
                     {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.map((item,key)=>{
 
 											return(
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index 24da98576..b4aec1355 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -317,73 +317,59 @@ class GraduationTaskssettingapp extends Component{
   }
 
   funcrosscomment=(e)=>{
-    let {latetime,end_time}=this.state;
+
+    let {latetime,end_time,allowlate}=this.state;
     let newtime;
-    if(latetime!=null&&end_time!=null){
-      if(e.target.checked===true){
-        if(moment(latetime)>moment(end_time)){
-          newtime=moment(latetime)+604800000;
-          newtime=new Date(newtime)
-        }else if(moment(latetime)<moment(end_time)){
-          newtime=moment(end_time)+604800000;
-          newtime=new Date(newtime)
-        }
+		if(e.target.checked===true){
+      if(allowlate===1||allowlate===true){
+       if(latetime===null||latetime===""){
+				 let newlatetime=moment(new Date()).add(7, 'days').format("YYYY-MM-DD HH:mm");
+				 let newcommenttime=moment(new Date()).format("YYYY-MM-DD HH:mm");
+				 this.setState({
+					 latetime:newlatetime,
+					 crosscomment:e.target.checked,
+					 commenttime:newcommenttime
+				 })
+			 }else{
+				 let newlatetime=moment(latetime).add(7, 'days').format("YYYY-MM-DD HH:mm");
+				 let newcommenttime=moment(latetime).format("YYYY-MM-DD HH:mm");
+				 this.setState({
+					 latetime:newlatetime,
+					 crosscomment:e.target.checked,
+					 commenttime:newcommenttime
+				 })
+			 }
+
+
+			}else{
+				if(end_time===null||end_time===""){
+					let newend_time=moment(new Date()).add(7, 'days').format("YYYY-MM-DD HH:mm");
+					let newcommenttime=moment(new Date()).add(8, 'days').format("YYYY-MM-DD HH:mm");
+					this.setState({
+						end_time:newend_time,
+						crosscomment:e.target.checked,
+						commenttime:newcommenttime
+					})
+				}else{
+					let newend_time=moment(end_time).add(7, 'days').format("YYYY-MM-DD HH:mm");
+					let newcommenttime=moment(end_time).add(8, 'days').format("YYYY-MM-DD HH:mm");
+					this.setState({
+						end_time:newend_time,
+						crosscomment:e.target.checked,
+						commenttime:newcommenttime
+					})
+				}
 
-        this.setState({
-          crosscomment:e.target.checked,
-          commenttime:moment(moment(newtime)).format("YYYY-MM-DD HH:mm"),
-        })
+			}
 
-      }else{
-        this.setState({
-          crosscomment:e.target.checked,
-          commenttime:undefined
-        })
-      }
 
-    }else if(latetime===null&&end_time!=null){
-      if(e.target.checked===true){
-        newtime=moment(end_time)+604800000;
-        newtime=new Date(newtime)
-        this.setState({
-          crosscomment:e.target.checked,
-          commenttime:newtime
-        })
-      }else{
-        this.setState({
-          crosscomment:e.target.checked,
-          commenttime:undefined
-        })
-      }
-    }else if(latetime!=null&&end_time===null){
-      if(e.target.checked===true){
-        newtime=moment(latetime)+604800000;
-        newtime=new Date(newtime)
-        this.setState({
-          crosscomment:e.target.checked,
-          commenttime:newtime
-        })
-      }else{
-        this.setState({
-          crosscomment:e.target.checked,
-          commenttime:undefined
-        })
-      }
-    }else if(latetime===null&&end_time===null){
-      if(e.target.checked===true){
-        newtime=moment(new Date())+604800000;
-        newtime=new Date(newtime)
-        this.setState({
-          crosscomment:e.target.checked,
-          commenttime:newtime
-        })
-      }else{
-        this.setState({
-          crosscomment:e.target.checked,
-          commenttime:undefined
-        })
-      }
-    }
+		}else{
+			this.setState({
+				crosscomment:e.target.checked,
+				commenttime:undefined
+			})
+		}
+
 
   }
 
@@ -588,7 +574,6 @@ class GraduationTaskssettingapp extends Component{
           commenttimetype:false
         })
       }
-			debugger
       if(moment(this.state.commenttime)<moment(publish_time)){
         this.setState({
           commenttimetype:true,
diff --git a/public/react/src/modules/forums/RightSection.css b/public/react/src/modules/forums/RightSection.css
index bce57c68a..f151585c8 100644
--- a/public/react/src/modules/forums/RightSection.css
+++ b/public/react/src/modules/forums/RightSection.css
@@ -7,7 +7,7 @@
     width:237px!important;
 	height: 30px;
     margin-bottom: 30px;
-    margin-right: 35px;
+    /*margin-right: 35px;*/
 }
 .search-newysl {
 	width:237px!important;