From 31057a0c8ef3282ab2aff028e35d7abafd8fe156 Mon Sep 17 00:00:00 2001
From: dinglink <837816638@qq.com>
Date: Wed, 18 Mar 2020 01:27:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/Resource/Fileslistitem.js |  2 +-
 .../src/modules/courses/Resource/index.js     | 19 +++++++++++--------
 .../courses/coursesDetail/CoursesLeftNav.js   |  8 +++++---
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index 2effffa78..29067d20a 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -429,7 +429,7 @@ class Fileslistitem extends Component {
                       </span>
 						{discussMessage && discussMessage.category_name === undefined||discussMessage && discussMessage.category_name === null ? "" : 
 							<div className="color-grey9 task-hide fr mr30" title={discussMessage && discussMessage.category_name}
-									 style={{display:'flex',"max-width": "300px"}}>所属目录：<div style={{display:discussMessage && discussMessage.parent_category_name === null ? "none":'block',"max-width": "168px",overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{discussMessage && discussMessage. parent_category_name}</div><div style={{display:discussMessage && discussMessage.parent_category_name === null ? "none":'block'}}>/</div><div style={{"max-width": "60px",overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{discussMessage && discussMessage.category_name}</div>
+									 style={{display:'flex',"max-width": "300px"}}>所属目录：<div style={{display:discussMessage && discussMessage.parent_category_name === null ? "none":'block',"max-width": "150px",overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{discussMessage && discussMessage. parent_category_name}</div><div style={{display:discussMessage && discussMessage.parent_category_name === null ? "none":'block'}}>/</div><div style={{"max-width": "150px",overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{discussMessage && discussMessage.category_name}</div>
 							</div>}
 					</p>
 
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index e55ca7662..1719a3eb2 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -1024,7 +1024,7 @@ class Fileslists extends Component{
                   
                   `}
                     </style>
-                    <ul className="drop_down_menu" style={{"right":"0px","left":"unset","min-width":'180px'}}>
+                    <ul className="drop_down_menu" style={{"right":"0px","left":"unset","min-width":'200px'}}>
                       {/* <p style={{marginLeft:15,color:"#000000",fontSize:20}}>资源</p>  */}
 											{this.state.course_second_categories&&this.state.course_second_categories.length>10? <p className="drop_down_search">
                         <Input placeholder="搜索" value={this.state.dirSearchValue} onChange={(e) => {this.setState({dirSearchValue: e.target.value})}}/>
@@ -1032,7 +1032,9 @@ class Fileslists extends Component{
 
                       {course_modules&&course_modules.course_modules.map((item,key)=>{
                         return(
-													filesId&&filesId===item.value?"":<li key={key} id={item.value} onClick={() => this.moveTos(0)} title={item.title}>{item.title}</li>
+                    
+													<li key={key} id={item.value} onClick={() => this.moveTos(0)} title={item.title}>{item.title}</li>
+                          
                         )
                       })}
 
@@ -1043,8 +1045,10 @@ class Fileslists extends Component{
                         }).map((itm,k)=>{
                           return(
                             <div >
-                              <div style={{display:'flex',marginTop:10,height:20}}>
-                                <div onClick={() => this.moveTos(itm.value )} style={{marginLeft:15,width:itm.title.length>13?200:undefined,color:'#000000',overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{itm.title}</div>
+                              <div style={{display:'inline-block',marginTop:10,height:20}}>
+													      <li style={{width:200}} key={key} id={itm.value} onClick={() => this.moveTos(0)} title={itm.title}>{itm.title}</li>
+
+                                {/* <div onClick={() => this.moveTos(itm.value )} style={{marginLeft:15,width:itm.title.length>13?200:undefined,color:'#000000',overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{itm.title}</div> */}
                                  {itm.children.length===0?'':<i  style={{marginLeft:15,marginRight:15}} onClick={() => this.istowshow(itm,filesId)} className="iconfont icon-xiajiantou font-12 ml2"></i>}
                                 </div>
                                    
@@ -1054,10 +1058,9 @@ class Fileslists extends Component{
                                           filesId&&filesId===itm.id?"":
                                           <div style={{marginTop:10,height:20}}>
                                             <div style={{display:itm.children.length===1?'none':ti===0?'block':'none',marginLeft:15,width:250,height:1,background:'#c4c4c4'}}></div>
-                                            <Tooltip placement="right"title={tt.title.length>13?tt.title:''} >
-                                            <div className="indexdiv" style={{marginTop:5,marginBottom:5,marginLeft:30,width:tt.title.length>13?200:undefined,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}} key={ti} id={tt.value} onClick={() => this.moveTos(tt.value )} title={tt.name}>{tt.title}</div> 
-                                          </Tooltip>
-                                          <div style={{display:itm.children.length===1?'none':ti===itm.children.length-1?'block':'none',marginLeft:15,width:250,height:1,background:'#c4c4c4'}}></div>
+                      
+                                            <li style={{marginTop:5,marginBottom:5,paddingLeft:30,width:tt.title.length>13?200:undefined,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}} key={ti} id={tt.value} onClick={() => this.moveTos(tt.value )} title={tt.title}>{tt.title}</li> 
+                                          
                                           </div>
                                           
                                         )
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
index e743eb1b9..309f536c7 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
@@ -79,7 +79,8 @@ class Coursesleftnav extends Component{
       treeDataid:'',
       //默认值
       treedefaultValue:'',
-      dropdownStyleshow:''
+      dropdownStyleshow:'',
+      treeDataname:''
     }
   }
   
@@ -323,7 +324,8 @@ class Coursesleftnav extends Component{
             })
             tr.map((iem,index)=>{
               this.setState({
-                treeDataid:iem.value
+                treeDataid:iem.value,
+                treeDataname:iem.title
               })
             })
           }
@@ -1207,7 +1209,7 @@ class Coursesleftnav extends Component{
                dropdownClassName={{display:this.state.dropdownStyleshow}}
               // dropdownMenuStyle={{display:this.state.dropdownStyleshow}}
               treeData={this.state.treeData}
-              placeholder="资源(根目录)"
+              placeholder={this.state.treeDataname}
               disabled={this.state.showPreson}
               defaultValue={this.state.treedefaultValue}
               treeDefaultExpandAll