From cba575146d3c0ed774a5d4df74bb6046c452b448 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 21 Aug 2019 14:50:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E9=80=89=E9=A2=98=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=9A=84=E9=99=84=E4=BB=B6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/attachment/AttachmentList.js    | 11 ++++++++---
 .../graduation/topics/GraduateTopicDetailInfo.js      |  8 +++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/public/react/src/common/components/attachment/AttachmentList.js b/public/react/src/common/components/attachment/AttachmentList.js
index 8ece1c39d..afc55fe1f 100644
--- a/public/react/src/common/components/attachment/AttachmentList.js
+++ b/public/react/src/common/components/attachment/AttachmentList.js
@@ -1,4 +1,5 @@
 import React,{ Component } from "react";
+import { ConditionToolTip } from 'educoder'
 
 class AttachmentsList extends Component{
   constructor(props){
@@ -12,14 +13,18 @@ class AttachmentsList extends Component{
           attachments.map((item,key)=>{
             return(
               <p key={key}>
-                <a className="color-grey">
+                <a className="color-grey fl">
                   <i className="font-14 color-green iconfont icon-fujian mr8"></i>
                 </a>
                 {
                   item.is_pdf && item.is_pdf == true ?
-                  <a href={item.url} className="mr12" length="58" target="_blank">{item.title}</a>
+                  <ConditionToolTip title={item.title} condition={item.title && item.title.length > 30 }>
+                    <a href={item.url} className="mr12 fl task-hide" length="58" target="_blank"  style={{"maxWidth":"432px"}}>{item.title}</a>
+                  </ConditionToolTip>
                   :
-                  <a href={item.url} className="mr12" length="58">{item.title}</a>
+                  <ConditionToolTip title={item.title} condition={item.title && item.title.length > 30 }>
+                    <a href={item.url} className="mr12 fl task-hide" length="58"  style={{"maxWidth":"432px"}}>{item.title}</a>
+                  </ConditionToolTip>
                 }
                 <span className="color-grey mt2 color-grey-6 font-12">{item.filesize}</span>
               </p>
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
index 0c76cd9de..9ba334421 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
@@ -6,7 +6,7 @@ import '../style.css'
 import axios from "axios";
 import GraduateTopicReply from './GraduateTopicReply'
 
-import { ConditionToolTip,MarkdownToHtml } from 'educoder'
+import { ConditionToolTip , MarkdownToHtml , AttachmentList } from 'educoder'
 
 const $=window.$;
 const type={1: "设计",2: "论文", 3: "创作"}
@@ -60,9 +60,10 @@ class GraduateTopicDetailTable extends Component{
             {
               topicInfo && topicInfo.attachment_list.length>0 &&
               <p className="mt30">
-                {
+                {/* {
                   topicInfo.attachment_list.map((item,key)=>{
                     return(
+                      
                       <li className="clearfix mb8" key={key}>
                         <i className="iconfont icon-fujian color-green font-16 mr8 fl"></i>
                         <ConditionToolTip title={item.title} condition={item.title && item.title.length > 30 }>
@@ -72,7 +73,8 @@ class GraduateTopicDetailTable extends Component{
                       </li>
                     )
                   })
-                }
+                } */}
+                <AttachmentList {...this.props} {...this.state} attachments = {topicInfo.attachment_list}></AttachmentList>
               </p>
             }
           </div>